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/popaccount.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'kmail/popaccount.cpp')

diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index b2f55528f..99befb43b 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive)
     }
 
     TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
-                                       mHost + ":" + TQString("%1").arg(mPort) );
+                                       mHost + ":" + TQString("%1").tqarg(mPort) );
     KConfig config( seenUidList );
     TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
     TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
@@ -370,7 +370,7 @@ void PopAccount::startJob()
   if (!runPrecommand(precommand()))
     {
       KMessageBox::sorry(0,
-                         i18n("Could not execute precommand: %1").arg(precommand()),
+                         i18n("Could not execute precommand: %1").tqarg(precommand()),
                          i18n("KMail Error Message"));
       checkDone( false, CheckError );
       return;
@@ -401,7 +401,7 @@ void PopAccount::startJob()
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + mName,
     escapedName,
-    i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
+    i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
     true, // can be canceled
     useSSL() || useTLS() );
   connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() {
       "the UIDL command: this command is required to determine, in a reliable way, "
       "which of the mails on the server KMail has already seen before;\n"
       "the feature to leave the mails on the server will therefore not "
-      "work properly.").arg(NetworkAccount::name()) );
+      "work properly.").tqarg(NetworkAccount::name()) );
       // An attempt to work around buggy pop servers, these seem to be popular.
       mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict;
     }
@@ -751,7 +751,7 @@ void PopAccount::slotJobFinished() {
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
-          .arg( mHost ) );
+          .tqarg( mHost ) );
       url.setPath("/remove/" + idsOfMsgsToDelete.join(","));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     } else {
@@ -761,7 +761,7 @@ void PopAccount::slotJobFinished() {
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
-          .arg( mHost ) );
+          .tqarg( mHost ) );
       url.setPath(TQString("/commit"));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     }
@@ -781,7 +781,7 @@ void PopAccount::slotJobFinished() {
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
-        .arg( mHost ) );
+        .tqarg( mHost ) );
     KURL url = getUrl();
     url.setPath(TQString("/commit"));
     job = KIO::get( url, false, false );
@@ -841,7 +841,7 @@ void PopAccount::saveUidList()
     seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] );
   }
   TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
-                                      mHost + ":" + TQString("%1").arg(mPort) );
+                                      mHost + ":" + TQString("%1").tqarg(mPort) );
   KConfig config( seenUidList );
   config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
   config.writeEntry( "seenUidTimeList", seenUidTimeList );
@@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg()
     curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly );
     curMsgLen = nextLen;
     ++indexOfCurrentMsg;
-    kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl;
+    kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl;
     mMsgsPendingDownload.remove( next.key() );
   }
 }
@@ -904,14 +904,14 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
       {
         msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 "
                    "(%7 KB remain on the server).")
-          .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
-          .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024);
+          .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
+          .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024);
       }
       else
       {
         msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.")
-          .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
-          .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
+          .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
+          .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost);
       }
       mMailCheckProgressItem->setqStatus( msg );
       mMailCheckProgressItem->setProgress(
-- 
cgit v1.2.1