diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/kmacctimap.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
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
Diffstat (limited to 'kmail/kmacctimap.cpp')
-rw-r--r-- | kmail/kmacctimap.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 6942bab53..b16dc0b34 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").arg(KAccount::id()) ); + TQString("%1").tqarg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums = config.readListEntry( "unfiltered" ); mFilterSerNumsToSave.setAutoDelete( false ); @@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap() killAllJobs( true ); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").arg(KAccount::id()) ); + TQString("%1").tqarg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums; TQDictIterator<int> it( mFilterSerNumsToSave ); @@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem = ProgressManager::createProgressItem( "MailCheckAccount" + name(), - i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ), + i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ), TQString(), // status true, // can be canceled useSSL() || useTLS() ); @@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) // It's possible that the message has been deleted or moved into a // different folder, or that the serNum is stale if ( !folder ) { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!imapFolder || !imapFolder->folder()->isSystemFolder() || !(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg = folder->getMsg( idx ); if (!msg) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) TQT_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); if (slotFilterMsg(msg) == 2) break; } } @@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) //----------------------------------------------------------------------------- void KMAcctImap::slotFiltered(TQ_UINT32 serNum) { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); } //----------------------------------------------------------------------------- @@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum) if ( findIt != mFilterSerNums.end() ) return; mFilterSerNums.append( serNum ); - mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 ); + mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 ); } int KMAcctImap::slotFilterMsg( KMMessage *msg ) @@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) msg->setTransferInProgress(false); TQ_UINT32 serNum = msg->getMsgSerNum(); if ( serNum ) - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); int filterResult = kmkernel->filterMgr()->process(msg, KMFilterMgr::Inbound, |