From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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
---
 kmail/kmacctlocal.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kmail/kmacctlocal.cpp')

diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 6062f3547..5c842b1d1 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -125,7 +125,7 @@ bool KMAcctLocal::preProcess()
 
   //BroadcastqStatus::instance()->reset();
   BroadcastqStatus::instance()->seStatusMsg(
-        i18n("Preparing transmission from \"%1\"...").arg(mName));
+        i18n("Preparing transmission from \"%1\"...").tqarg(mName));
 
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess()
   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
 
@@ -164,7 +164,7 @@ bool KMAcctLocal::preProcess()
     mMailFolder->close("acctlocalMail");
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
-      .arg( mMailFolder->location() );
+      .tqarg( mMailFolder->location() );
     BroadcastqStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
@@ -177,7 +177,7 @@ bool KMAcctLocal::preProcess()
 
   // prepare the static parts of the status message:
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
-    .arg(mMailFolder->location()).arg( mNumMsgs );
+    .tqarg(mMailFolder->location()).tqarg( mNumMsgs );
 
   //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
@@ -192,7 +192,7 @@ bool KMAcctLocal::fetchMsg()
   /* This causes mail eating
   if (kmkernel->mailCheckAborted()) break; */
 
-  const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
+  const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
   //BroadcastqStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
@@ -244,8 +244,8 @@ void KMAcctLocal::postProcess()
       KMessageBox::queuedMessageBox( 0, KMessageBox::Information,
                                      i18n( "<qt>Cannot remove mail from "
                                            "mailbox <b>%1</b>:<br>%2</qt>" )
-                                     .arg( mMailFolder->location() )
-                                     .arg( strerror( rc ) ) );
+                                     .tqarg( mMailFolder->location() )
+                                     .tqarg( strerror( rc ) ) );
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
@@ -253,7 +253,7 @@ void KMAcctLocal::postProcess()
       mMailCheckProgressItem->setqStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
-              mNumMsgs ).arg( mMailFolder->location() ) );
+              mNumMsgs ).tqarg( mMailFolder->location() ) );
       mMailCheckProgressItem->setComplete();
       mMailCheckProgressItem = 0;
     }
-- 
cgit v1.2.1