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

1 files changed, 41 insertions, 41 deletions

diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 29ab5980a..b04b5b60a 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -610,9 +610,9 @@ IMAP4Protocol::listDir (const KURL & _url)
   }
   if ( !selectInfo.alert().isNull() ) {
     if ( !myBox.isEmpty() ) {
-      warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) );
+      warning( i18n( "Message from %1 while processing '%2': %3" ).tqarg( myHost, myBox, selectInfo.alert() ) );
     } else {
-      warning( i18n( "Message from %1: %2" ).arg( myHost, selectInfo.alert() ) );
+      warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) );
     }
     selectInfo.setAlert( 0 );
   }
@@ -934,7 +934,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int)
     if ( ask &&
         messageBox(QuestionYesNo,
           i18n("The following folder will be created on the server: %1 "
-               "What do you want to store in this folder?").arg( aBox ),
+               "What do you want to store in this folder?").tqarg( aBox ),
           i18n("Create Folder"),
           i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No )
     {
@@ -979,7 +979,7 @@ IMAP4Protocol::copy (const KURL & src, const KURL & dest, int, bool overwrite)
     {
       KURL testDir = dest;
 
-      TQString subDir = dBox.right (dBox.length () - dBox.findRev ('/'));
+      TQString subDir = dBox.right (dBox.length () - dBox.tqfindRev ('/'));
       TQString topDir = dBox.left (sub);
       testDir.setPath ("/" + topDir);
       dType =
@@ -1272,8 +1272,8 @@ IMAP4Protocol::special (const TQByteArray & aData)
       completeQueue.removeRef (cmd);
       error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 "
                                     "failed. The server returned: %2")
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1293,8 +1293,8 @@ IMAP4Protocol::special (const TQByteArray & aData)
       completeQueue.removeRef (cmd);
       error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 "
                                     "failed. The server returned: %2")
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1361,7 +1361,7 @@ IMAP4Protocol::special (const TQByteArray & aData)
     {
       completeQueue.removeRef (cmd);
       error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
-                                      "failed.").arg(_url.prettyURL()));
+                                      "failed.").tqarg(_url.prettyURL()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1373,7 +1373,7 @@ IMAP4Protocol::special (const TQByteArray & aData)
       {
         completeQueue.removeRef (cmd);
         error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
-                                        "failed.").arg(_url.prettyURL()));
+                                        "failed.").tqarg(_url.prettyURL()));
         return;
       }
       completeQueue.removeRef (cmd);
@@ -1404,7 +1404,7 @@ IMAP4Protocol::special (const TQByteArray & aData)
     {
       completeQueue.removeRef (cmd);
       error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
-                                      "failed.").arg(_url.prettyURL()));
+                                      "failed.").tqarg(_url.prettyURL()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1451,9 +1451,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Setting the Access Control List on folder %1 "
                                       "for user %2 failed. The server returned: %3")
-            .arg(_url.prettyURL())
-            .arg(user)
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(user)
+            .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1470,9 +1470,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Deleting the Access Control List on folder %1 "
                                     "for user %2 failed. The server returned: %3")
-            .arg(_url.prettyURL())
-            .arg(user)
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(user)
+            .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1487,8 +1487,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 "
                                      "failed. The server returned: %2")
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     // Returning information to the application from a special() command isn't easy.
@@ -1514,8 +1514,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 "
                                     "failed. The server returned: %2")
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     TQStringList lst = getResults();
@@ -1548,8 +1548,8 @@ IMAP4Protocol::specialSearchCommand( TQDataStream& stream )
   {
     error(ERR_SLAVE_DEFINED, i18n("Searching of folder %1 "
           "failed. The server returned: %2")
-        .arg(aBox)
-        .arg(cmd->resultInfo()));
+        .tqarg(aBox)
+        .tqarg(cmd->resultInfo()));
     return;
   }
   completeQueue.removeRef(cmd);
@@ -1582,9 +1582,9 @@ IMAP4Protocol::specialCustomCommand( TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 "
             "failed. The server returned: %3")
-          .arg(command)
-          .arg(arguments)
-          .arg(cmd->resultInfo()));
+          .tqarg(command)
+          .tqarg(arguments)
+          .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef(cmd);
@@ -1665,9 +1665,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Setting the annotation %1 on folder %2 "
                                     " failed. The server returned: %3")
-            .arg(entry)
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(entry)
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     completeQueue.removeRef (cmd);
@@ -1689,9 +1689,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream )
     {
       error(ERR_SLAVE_DEFINED, i18n("Retrieving the annotation %1 on folder %2 "
                                      "failed. The server returned: %3")
-            .arg(entry)
-            .arg(_url.prettyURL())
-            .arg(cmd->resultInfo()));
+            .tqarg(entry)
+            .tqarg(_url.prettyURL())
+            .tqarg(cmd->resultInfo()));
       return;
     }
     // Returning information to the application from a special() command isn't easy.
@@ -1726,8 +1726,8 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream )
         {
           error(ERR_SLAVE_DEFINED, i18n("Retrieving the quota root information on folder %1 "
                 "failed. The server returned: %2")
-              .arg(_url.prettyURL())
-              .arg(cmd->resultInfo()));
+              .tqarg(_url.prettyURL())
+              .tqarg(cmd->resultInfo()));
           return;
         }
         infoMessage(getResults().join( "\r" ));
@@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status ()
 {
   bool connected = (getState() != ISTATE_NO) && isConnectionValid();
   kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-  slavetqStatus ( connected ? myHost : TQString(), connected );
+  slaveStatus ( connected ? myHost : TQString(), connected );
 }
 
 void
@@ -2051,7 +2051,7 @@ bool IMAP4Protocol::makeLogin ()
     {
       error(ERR_COULD_NOT_LOGIN, i18n("The server %1 supports neither "
         "IMAP4 nor IMAP4rev1.\nIt identified itself with: %2")
-        .arg(myHost).arg(greeting));
+        .tqarg(myHost).tqarg(greeting));
       closeConnection();
       return false;
     }
@@ -2102,7 +2102,7 @@ bool IMAP4Protocol::makeLogin ()
     else {
       if (!hasCapability (TQString ("AUTH=") + myAuth)) {
         error (ERR_COULD_NOT_LOGIN, i18n("The authentication method %1 is not "
-          "supported by the server.").arg(myAuth));
+          "supported by the server.").tqarg(myAuth));
         closeConnection();
         return false;
       }
@@ -2144,14 +2144,14 @@ bool IMAP4Protocol::makeLogin ()
       }
       if (!clientLogin (myUser, myPass, resultInfo))
         error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
-        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
+        "password is wrong.\nThe server %1 replied:\n%2").tqarg(myHost).tqarg(resultInfo));
     }
     else
     {
 #ifdef HAVE_LIBSASL2
       if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
         error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
-	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
+	"The server %2 replied:\n%3").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo));
       else {
         myUser = authInfo.username;
         myPass = authInfo.password;
@@ -2574,7 +2574,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
     // we try to reconstruct it from the URL
     if (!_box.isEmpty())
     {
-      int start = _url.path().findRev(_box);
+      int start = _url.path().tqfindRev(_box);
       if (start != -1)
         _hierarchyDelimiter = _url.path().mid(start-1, start);
       kdDebug(7116) << "IMAP4::parseURL - reconstructed delimiter:" << _hierarchyDelimiter
@@ -2701,7 +2701,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
           // not allowed to enter this folder
           error(ERR_ACCESS_DENIED, cmdInfo);
         } else {
-          error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
+          error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").tqarg(aBox).tqarg(cmdInfo));
         }
       } else {
         error(KIO::ERR_DOES_NOT_EXIST, aBox);