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/kmacctmaildir.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/kmacctmaildir.cpp')
-rw-r--r-- | kmail/kmacctmaildir.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 7b83dcf89..07391a582 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -107,14 +107,14 @@ void KMAcctMaildir::processNewMail(bool) } BroadcastqStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").arg(mName)); + i18n("Preparing transmission from \"%1\"...").tqarg(mName)); Q_ASSERT( !mMailCheckProgressItem ); TQString escapedName = TQStyleSheet::escape( mName ); mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").arg( escapedName ), + i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -130,7 +130,7 @@ void KMAcctMaildir::processNewMail(bool) rc = mailFolder.open("acctmaildirMail"); if (rc) { - TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() ); + TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() ); KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); @@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool) // prepare the static parts of the status message: TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.") - .arg(mailFolder.location()).arg(num); + .tqarg(mailFolder.location()).tqarg(num); mMailCheckProgressItem->setTotalItems( num ); @@ -162,7 +162,7 @@ void KMAcctMaildir::processNewMail(bool) } if (!addedOk) break; - TQString statusMsg = statusMsgStub.arg(i); + TQString statusMsg = statusMsgStub.tqarg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); mMailCheckProgressItem->setqStatus( statusMsg ); @@ -192,7 +192,7 @@ void KMAcctMaildir::processNewMail(bool) mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", - num ).arg(mailFolder.location() ) ); + num ).tqarg(mailFolder.location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; |