From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- wizards/groupwisewizard.cpp | 6 +++--- wizards/kmailchanges.cpp | 16 ++++++++-------- wizards/kolabkmailchanges.cpp | 2 +- wizards/kolabwizard.cpp | 8 ++++---- wizards/scalixkmailchanges.cpp | 2 +- wizards/scalixwizard.cpp | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'wizards') diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index bb5275302..52b6c1af2 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -314,7 +314,7 @@ GroupwiseWizard::GroupwiseWizard() : KConfigWizard( new GroupwisePropagator ) topLayout = new TQGridLayout( mEmailPage ); topLayout->setSpacing( spacingHint() ); - mEmailBox = new TQGroupBox( 1, Horizontal, + mEmailBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Create Mail Account"), mEmailPage ); mEmailBox->setCheckable( true ); topLayout->addWidget( mEmailBox, 0, 0 ); @@ -406,8 +406,8 @@ void GroupwiseWizard::slotAboutToShowPage( TQWidget *page ) if ( page == mEmailPage ) { if ( mEmailEdit->text().isEmpty() ) { TQString host = GroupwiseConfig::host(); - int pos = host.findRev( "." ); - if ( pos > 0 ) pos = host.findRev( ".", pos - 1 ); + int pos = host.tqfindRev( "." ); + if ( pos > 0 ) pos = host.tqfindRev( ".", pos - 1 ); if ( pos > 0 ) host = host.mid( pos + 1 ); TQString email = GroupwiseConfig::user() + "@" + host; mEmailEdit->setText( email ); diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 66fdd2169..86fd05b3f 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -176,7 +176,7 @@ void CreateDisconnectedImapAccount::apply() transportId = mExistingTransportId; } - c.setGroup( TQString("Account %1").arg( accountId ) ); + c.setGroup( TQString("Account %1").tqarg( accountId ) ); int uid; if ( mExistingAccountId < 0 ) { uid = kapp->random(); @@ -240,7 +240,7 @@ void CreateDisconnectedImapAccount::apply() } - c.setGroup( TQString("Folder-%1").arg( uid ) ); + c.setGroup( TQString("Folder-%1").tqarg( uid ) ); c.writeEntry( "isOpen", true ); c.setGroup( "AccountWizard" ); @@ -249,7 +249,7 @@ void CreateDisconnectedImapAccount::apply() c.setGroup( "Composer" ); c.writeEntry( "default-transport", mAccountName ); - c.setGroup( TQString("Transport %1").arg( transportId ) ); + c.setGroup( TQString("Transport %1").tqarg( transportId ) ); c.writeEntry( "name", mAccountName ); c.writeEntry( "host", mServer ); c.writeEntry( "type", "smtp" ); @@ -318,7 +318,7 @@ void CreateOnlineImapAccount::apply() uint accCnt = c.readNumEntry( "accounts", 0 ); c.writeEntry( "accounts", accCnt+1 ); - c.setGroup( TQString("Account %1").arg(accCnt+1) ); + c.setGroup( TQString("Account %1").tqarg(accCnt+1) ); int uid = kapp->random(); c.writeEntry( "Folder", uid ); c.writeEntry( "Id", uid ); @@ -354,12 +354,12 @@ void CreateOnlineImapAccount::apply() // locally unsubscribe the default folders c.writeEntry( "locally-subscribed-folders", true ); TQString groupwareFolders = TQString("/INBOX/%1/,/INBOX/%2/,/INBOX/%3/,/INBOX/%4/,/INBOX/%5/") - .arg( i18n(s_folderContentsType[0]) ).arg( i18n(s_folderContentsType[1]) ) - .arg( i18n(s_folderContentsType[2]) ).arg( i18n(s_folderContentsType[3]) ) - .arg( i18n(s_folderContentsType[4]) ); + .tqarg( i18n(s_folderContentsType[0]) ).tqarg( i18n(s_folderContentsType[1]) ) + .tqarg( i18n(s_folderContentsType[2]) ).tqarg( i18n(s_folderContentsType[3]) ) + .tqarg( i18n(s_folderContentsType[4]) ); c.writeEntry( "locallyUnsubscribedFolders", groupwareFolders ); - c.setGroup( TQString("Folder-%1").arg( uid ) ); + c.setGroup( TQString("Folder-%1").tqarg( uid ) ); c.writeEntry( "isOpen", true ); diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 68ff847a8..a38c7fd7b 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -34,7 +34,7 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); } void writeIds( int, int ) {} }; diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 9deaa373c..6aad529e5 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -81,13 +81,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); } } diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 9b4512ddc..38c3ecfb3 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -34,7 +34,7 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); c.writeEntry( "HideGroupwareFolders", false ); } void writeIds( int, int ) {} diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index 0291a22e0..100370508 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -74,13 +74,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); } } -- cgit v1.2.1