Rename a number of old tq methods that are no longer tq specific

9 files changed, 71 insertions, 71 deletions

diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 6671981eb..8e15274f2 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" ).tqarg( myHost, myBox, selectInfo.alert() ) );
+      warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) );
     } else {
-      warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) );
+      warning( i18n( "Message from %1: %2" ).arg( 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?").tqarg( aBox ),
+               "What do you want to store in this folder?").arg( aBox ),
           i18n("Create Folder"),
           i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No )
     {
@@ -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")
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(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")
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(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.").tqarg(_url.prettyURL()));
+                                      "failed.").arg(_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.").tqarg(_url.prettyURL()));
+                                        "failed.").arg(_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.").tqarg(_url.prettyURL()));
+                                      "failed.").arg(_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")
-            .tqarg(_url.prettyURL())
-            .tqarg(user)
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(user)
+            .arg(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")
-            .tqarg(_url.prettyURL())
-            .tqarg(user)
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(user)
+            .arg(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")
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(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")
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(_url.prettyURL())
+            .arg(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")
-        .tqarg(aBox)
-        .tqarg(cmd->resultInfo()));
+        .arg(aBox)
+        .arg(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")
-          .tqarg(command)
-          .tqarg(arguments)
-          .tqarg(cmd->resultInfo()));
+          .arg(command)
+          .arg(arguments)
+          .arg(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")
-            .tqarg(entry)
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(entry)
+            .arg(_url.prettyURL())
+            .arg(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")
-            .tqarg(entry)
-            .tqarg(_url.prettyURL())
-            .tqarg(cmd->resultInfo()));
+            .arg(entry)
+            .arg(_url.prettyURL())
+            .arg(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")
-              .tqarg(_url.prettyURL())
-              .tqarg(cmd->resultInfo()));
+              .arg(_url.prettyURL())
+              .arg(cmd->resultInfo()));
           return;
         }
         infoMessage(getResults().join( "\r" ));
@@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url)
       ok = true;
     else
     {
-      imapCommand *cmd = doCommand(imapCommand::clientqStatus(aBox, aSection));
+      imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection));
       ok = cmd->result() == "OK";
       cmdInfo = cmd->resultInfo();
       completeQueue.removeRef(cmd);
@@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url)
         error(KIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
-    if ((aSection == "UIDNEXT" && getqStatus().uidNextAvailable())
-      || (aSection == "UNSEEN" && getqStatus().unseenAvailable()))
+    if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
+      || (aSection == "UNSEEN" && geStatus().unseenAvailable()))
     {
       atom.m_uds = UDS_SIZE;
       atom.m_str = TQString();
-      atom.m_long = (aSection == "UIDNEXT") ? getqStatus().uidNext()
-        : getqStatus().unseen();
+      atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext()
+        : geStatus().unseen();
       entry.append(atom);
     }
   } else
@@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url)
       // only do this if the box is not selected
       // the server might change the validity for new select/examine
       imapCommand *cmd =
-        doCommand (imapCommand::clientqStatus (aBox, "UIDVALIDITY"));
+        doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY"));
       completeQueue.removeRef (cmd);
-      validity = getqStatus ().uidValidity ();
+      validity = geStatus ().uidValidity ();
     }
     validity = 0;               // temporary
 
@@ -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")
-        .tqarg(myHost).tqarg(greeting));
+        .arg(myHost).arg(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.").tqarg(myAuth));
+          "supported by the server.").arg(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").tqarg(myHost).tqarg(resultInfo));
+        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(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").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo));
+	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
       else {
         myUser = authInfo.username;
         myPass = authInfo.password;
@@ -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").tqarg(aBox).tqarg(cmdInfo));
+          error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
         }
       } else {
         error(KIO::ERR_DOES_NOT_EXIST, aBox);
@@ -2715,10 +2715,10 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
     // Doing this means a server roundtrip and since assureBox is called
     // after every mail, we do it with a timeout.
     kdDebug(7116) << "IMAP4Protocol::assureBox - reusing box" << endl;
-    if ( mTimeOfLastNoop.secsTo( TQDateTime::tqcurrentDateTime() ) > 10 ) {
+    if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) {
       cmd = doCommand (imapCommand::clientNoop ());
       completeQueue.removeRef (cmd);
-      mTimeOfLastNoop = TQDateTime::tqcurrentDateTime();
+      mTimeOfLastNoop = TQDateTime::currentDateTime();
       kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl;
     }
   }
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index 65a9227d0..4b9faadf4 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags,
 }
 
 imapCommand *
-imapCommand::clientqStatus (const TQString & path, const TQString & parameters)
+imapCommand::clienStatus (const TQString & path, const TQString & parameters)
 {
   return new imapCommand ("STATUS",
                           TQString ("\"") + rfcDecoder::toIMAP (path) +
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index 9ddb3f252..9e2834424 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -212,7 +212,7 @@ public:
    * @param parameters
    * @return a STATUS imapCommand
    */
-  static imapCommand *clientqStatus (const TQString & path,
+  static imapCommand *clienStatus (const TQString & path,
                                     const TQString & parameters);
   /**
    * @brief Create a COPY command
diff --git a/kioslaves/imap4/imaplist.cc b/kioslaves/imap4/imaplist.cc
index 13309089e..92918d8c1 100644
--- a/kioslaves/imap4/imaplist.cc
+++ b/kioslaves/imap4/imaplist.cc
@@ -124,9 +124,9 @@ void imapList::parseAttributes( parseString & str )
       marked_ = true;
     else if (-1 != attribute.find ("\\unmarked"))
       unmarked_ = true;
-    else if (-1 != attribute.find ("\\hastqchildren"))
+    else if (-1 != attribute.find ("\\haschildren"))
       hasChildren_ = true;
-    else if (-1 != attribute.find ("\\hasnotqchildren"))
+    else if (-1 != attribute.find ("\\hasnochildren"))
       hasNoChildren_ = true;
     else
       kdDebug(7116) << "imapList::imapList: bogus attribute " << attribute << endl;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index 4b8086ffc..328c0e566 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -273,7 +273,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
   TQString firstCommand = aAuth;
   if ( !challenge.isEmpty() ) {
     firstCommand += " ";
-    firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
+    firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
   }
   cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
 
@@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result)
     }
     else if (tqstrncmp(what, "STATUS", what.size()) == 0)
     {
-      parsetqStatus (result);
+      parseStatus (result);
     }
     break;
 
@@ -845,9 +845,9 @@ void imapParser::parseSearch (parseString & result)
   }
 }
 
-void imapParser::parsetqStatus (parseString & inWords)
+void imapParser::parseStatus (parseString & inWords)
 {
-  lastqStatus = imapInfo ();
+  lasStatus = imapInfo ();
 
   parseLiteralC(inWords);       // swallow the box
   if (inWords.isEmpty() || inWords[0] != '(')
@@ -864,15 +864,15 @@ void imapParser::parsetqStatus (parseString & inWords)
     if (parseOneNumber (inWords, value))
     {
       if (label == "MESSAGES")
-        lastqStatus.setCount (value);
+        lasStatus.setCount (value);
       else if (label == "RECENT")
-        lastqStatus.setRecent (value);
+        lasStatus.setRecent (value);
       else if (label == "UIDVALIDITY")
-        lastqStatus.setUidValidity (value);
+        lasStatus.setUidValidity (value);
       else if (label == "UNSEEN")
-        lastqStatus.setUnseen (value);
+        lasStatus.setUnseen (value);
       else if (label == "UIDNEXT")
-        lastqStatus.setUidNext (value);
+        lasStatus.setUidNext (value);
     }
   }
 
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 9902534c3..01eabd5ec 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -279,7 +279,7 @@ public:
   /** @brief parse a SEARCH line */
   void parseSearch (parseString & result);
   /** @brief parse a STATUS line */
-  void parsetqStatus (parseString & result);
+  void parseStatus (parseString & result);
   /** @brief parse a EXISTS line */
   void parseExists (ulong value, parseString & result);
   /** @brief parse a EXPUNGE line */
@@ -404,9 +404,9 @@ public:
   };
 
   /** @brief return the last status code */
-  const imapInfo & getqStatus ()
+  const imapInfo & geStatus ()
   {
-    return lastqStatus;
+    return lasStatus;
   };
   /** return the select info */
   const imapInfo & getSelected ()
@@ -450,7 +450,7 @@ protected:
   imapInfo selectInfo;
 
   /** @brief the results from the last status command */
-  imapInfo lastqStatus;
+  imapInfo lasStatus;
 
   /** @brief the results from the capabilities, split at ' ' */
   TQStringList imapCapabilities;
diff --git a/kioslaves/imap4/mailheader.h b/kioslaves/imap4/mailheader.h
index 72ac6e48d..633d61b78 100644
--- a/kioslaves/imap4/mailheader.h
+++ b/kioslaves/imap4/mailheader.h
@@ -94,7 +94,7 @@ public:
   }
 
   /**
-   * set a tqunicode subject
+   * set a unicode subject
    */
   void setSubject (const TQString & _str)
   {
@@ -109,7 +109,7 @@ public:
   }
 
   /** 
-   * get the tqunicode subject
+   * get the unicode subject
    */
   const TQString getSubject ()
   {
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 048eba7a5..39af2c397 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -650,7 +650,7 @@ mimeHeader::bodyDecoded ()
   TQByteArray temp;
 
   temp = bodyDecodedBinary ();
-  return TQString::tqfromLatin1 (temp.data (), temp.count ());
+  return TQString::fromLatin1 (temp.data (), temp.count ());
 }
 
 TQByteArray
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index 4eeb207d5..88cbe2abd 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqbuffer.h>
 #include <tqregexp.h>
 #include <kmdcodec.h>
@@ -653,13 +653,13 @@ rfcDecoder::decodeRFC2231String (const TQString & _str)
   {
     if (st.at (p) == 37)
     {
-      ch = st.tqat (p + 1).latin1 () - 48;
+      ch = st.at (p + 1).latin1 () - 48;
       if (ch > 16)
         ch -= 7;
-      ch2 = st.tqat (p + 2).latin1 () - 48;
+      ch2 = st.at (p + 2).latin1 () - 48;
       if (ch2 > 16)
         ch2 -= 7;
-      st.tqat (p) = ch * 16 + ch2;
+      st.at (p) = ch * 16 + ch2;
       st.remove (p + 1, 2);
     }
     p++;