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/kmfolderimap.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/kmfolderimap.cpp')
| -rw-r--r-- | kmail/kmfolderimap.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 28ba493c..38e025bc 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -245,7 +245,7 @@ void KMFolderImap::remove() jd.progressItem = ProgressManager::createProgressItem( "ImapFolderRemove" + ProgressManager::getUniqueID(), i18n("Removing folder"), - i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); @@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), i18n("Uploading message data"), - i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); @@ -544,8 +544,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList) TQPtrList<KMMessage> KMFolderImap::splitMessageList(const TQString& set, TQPtrList<KMMessage>& msgList) { - int lastcomma = set.findRev(","); - int lastdub = set.findRev(":"); + int lastcomma = set.tqfindRev(","); + int lastdub = set.tqfindRev(":"); int last = 0; if (lastdub > lastcomma) last = lastdub; else last = lastcomma; @@ -946,7 +946,7 @@ void KMFolderImap::checkFolders( const TQStringList& subfolderNames, KMFolderNode *node = folder()->child()->first(); while ( node ) { - if ( !node->isDir() && subfolderNames.findIndex(node->name()) == -1 ) + if ( !node->isDir() && subfolderNames.tqfindIndex(node->name()) == -1 ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderImap* imapFld = static_cast<KMFolderImap*>( fld->storage() ); @@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) if (job->error()) { account()->handleJobError( job, - i18n("Error while listing the contents of the folder %1.").arg( label() ) ); + i18n("Error while listing the contents of the folder %1.").tqarg( label() ) ); account()->removeJob(it); finishMailCheck( "listfolder", imapNoInformation ); return; |