Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc
index 2b1b0f19a..0ab27f63b 100644
--- a/kioslave/pop3/pop3.cc
+++ b/kioslave/pop3/pop3.cc
@@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
              QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
     }
 
-    TQString command = TQString::tqfromLatin1(cmd);
-    TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace();
+    TQString command = TQString::fromLatin1(cmd);
+    TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace();
 
     if (command.left(4) == "PASS") {
       command = i18n("PASS <your password>");
@@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai )
 {
   char buf[512];
 
-  TQString apop_string = TQString::tqfromLatin1("APOP ");
+  TQString apop_string = TQString::fromLatin1("APOP ");
   if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
     // Prompt for usernames
     if (!openPassDlg(ai)) {
@@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
 {
 #ifdef HAVE_LIBSASL2
   char buf[512];
-  TQString sasl_buffer = TQString::tqfromLatin1("AUTH");
+  TQString sasl_buffer = TQString::fromLatin1("AUTH");
 
   int result;
   sasl_conn_t *conn = NULL;
@@ -525,13 +525,13 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
 
     TQByteArray challenge, tmp;
 
-    TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing );
+    TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing );
     challenge.setRawData( out, outlen );
     KCodecs::base64Encode( challenge, tmp );
     challenge.resetRawData( out, outlen );
     if ( !tmp.isEmpty() ) {
       firstCommand += " ";
-      firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() );
+      firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() );
     }
 
     challenge.resize( 2049 );
@@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
   m_sOldUser = m_sUser;
   m_sOldPass = m_sPass;
 
-  TQString one_string = TQString::tqfromLatin1("USER ");
+  TQString one_string = TQString::fromLatin1("USER ");
   one_string.append( m_sUser );
 
   if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
     return false;
   }
 
-  one_string = TQString::tqfromLatin1("PASS ");
+  one_string = TQString::fromLatin1("PASS ");
   one_string.append(m_sPass);
 
   if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -821,7 +821,7 @@ void POP3Protocol::special(const TQByteArray & aData)
       if (qstrcmp(buf, ".\r\n") == 0)
         break;
       result += " " + TQString(buf).left(strlen(buf) - 2)
-          .tqreplace(" ", "-");
+          .replace(" ", "-");
     }
   }
   if (supports_apop)
@@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &)
     uds_url.setUser(m_sUser);
     uds_url.setPass(m_sPass);
     uds_url.setHost(m_sServer);
-    uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1));
+    uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1));
     atom.m_str = uds_url.url();
     atom.m_long = 0;
     entry.append(atom);