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

9 files changed, 30 insertions, 30 deletions

diff --git a/kioslave/smtp/capabilities.cc b/kioslave/smtp/capabilities.cc
index a99dbeb0b..5b2856837 100644
--- a/kioslave/smtp/capabilities.cc
+++ b/kioslave/smtp/capabilities.cc
@@ -56,16 +56,16 @@ namespace KioSMTP {
     return c;
   }
 
-  void Capabilities::add( const TQString & cap, bool tqreplace ) {
+  void Capabilities::add( const TQString & cap, bool replace ) {
     TQStringList tokens = TQStringList::split( ' ', cap.upper() );
     if ( tokens.empty() )
       return;
     TQString name = tokens.front(); tokens.pop_front();
-    add( name, tokens, tqreplace );
+    add( name, tokens, replace );
   }
 
-  void Capabilities::add( const TQString & name, const TQStringList & args, bool tqreplace ) {
-    if ( tqreplace )
+  void Capabilities::add( const TQString & name, const TQStringList & args, bool replace ) {
+    if ( replace )
       mCapabilities[name] = args;
     else
       mCapabilities[name] += args;
@@ -126,7 +126,7 @@ namespace KioSMTP {
       if ( it.key() == "AUTH" )
 	result += it.data();
       else if ( it.key().startsWith( "AUTH=" ) ) {
-	result.push_back( it.key().mid( tqstrlen("AUTH=") ) );
+	result.push_back( it.key().mid( qstrlen("AUTH=") ) );
 	result += it.data();
       }
     }
diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h
index c1976ced0..9f9464104 100644
--- a/kioslave/smtp/capabilities.h
+++ b/kioslave/smtp/capabilities.h
@@ -49,15 +49,15 @@ namespace KioSMTP {
 
     static Capabilities fromResponse( const Response & response );
 
-    void add( const TQString & cap, bool tqreplace=false );
-    void add( const TQString & name, const TQStringList & args, bool tqreplace=false );
+    void add( const TQString & cap, bool replace=false );
+    void add( const TQString & name, const TQStringList & args, bool replace=false );
     void clear() { mCapabilities.clear(); }
 
     bool have( const TQString & cap ) const {
       return mCapabilities.find( cap.upper() ) != mCapabilities.end();
     }
     bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); }
-    bool have( const char * cap ) const { return have( TQString::tqfromLatin1( cap ) ); }
+    bool have( const char * cap ) const { return have( TQString::fromLatin1( cap ) ); }
 
     TQString asMetaDataString() const;
 
diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc
index 41c9cf78a..2771baf82 100644
--- a/kioslave/smtp/command.cc
+++ b/kioslave/smtp/command.cc
@@ -321,14 +321,14 @@ static sasl_callback_t callbacks[] = {
       cmd = mUngetSASLResponse;
       mUngetSASLResponse = 0;
     } else if ( mFirstTime ) {
-      TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mMechusing );
+      TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing );
 
       tmp.setRawData( mOut, mOutlen );
       KCodecs::base64Encode( tmp, challenge );
       tmp.resetRawData( mOut, mOutlen );
       if ( !challenge.isEmpty() ) {
         firstCommand += " ";
-        firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
+        firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
       }
       cmd = firstCommand.latin1();
 
diff --git a/kioslave/smtp/compliance.txt b/kioslave/smtp/compliance.txt
index 36ce37542..b6b9874c8 100644
--- a/kioslave/smtp/compliance.txt
+++ b/kioslave/smtp/compliance.txt
@@ -3,29 +3,29 @@ The SMTP kioslave currently conforms to the following SMTP-related RFCs:
 Base Spec:
 2821 Simple Mail Transfer Protocol. J. Klensin, Ed.. April 2001.
      (Format: TXT=192504 bytes) (Obsoletes RFC0821, RFC0974, RFC1869)
-     (tqStatus: PROPOSED STANDARD)
+     (Status: PROPOSED STANDARD)
 
 Encryption/Auth:
 3207 SMTP Service Extension for Secure SMTP over Transport Layer
      Security. P. Hoffman. February 2002. (Format: TXT=18679 bytes)
-     (Obsoletes RFC2487) (tqStatus: PROPOSED STANDARD)
+     (Obsoletes RFC2487) (Status: PROPOSED STANDARD)
 
 2554 SMTP Service Extension for Authentication. J. Myers. March 1999.
-     (Format: TXT=20534 bytes) (tqStatus: PROPOSED STANDARD)
+     (Format: TXT=20534 bytes) (Status: PROPOSED STANDARD)
 (with all SASL mechanisms supported by KDESasl)
 
 General:
 1652 SMTP Service Extension for 8bit-MIMEtransport. J. Klensin, N.
      Freed, M. Rose, E. Stefferud, D. Crocker. July 1994. (Format:
-     TXT=11842 bytes) (Obsoletes RFC1426) (tqStatus: DRAFT STANDARD)
+     TXT=11842 bytes) (Obsoletes RFC1426) (Status: DRAFT STANDARD)
 
 1870 SMTP Service Extension for Message Size Declaration. J. Klensin,
      N. Freed, K. Moore. November 1995. (Format: TXT=18226 bytes)
-     (Obsoletes RFC1653) (Also STD0010) (tqStatus: STANDARD)
+     (Obsoletes RFC1653) (Also STD0010) (Status: STANDARD)
 
 2920 SMTP Service Extension for Command Pipelining. N. Freed.
      September 2000. (Format: TXT=17065 bytes) (Obsoletes RFC2197) (Also
-     STD0060) (tqStatus: STANDARD)
+     STD0060) (Status: STANDARD)
 
 Known shortcomings:
 - Doesn't enforce the CRLF lineending convention on user-supplied data.
diff --git a/kioslave/smtp/interactivesmtpserver.h b/kioslave/smtp/interactivesmtpserver.h
index 556b3cb3d..39a07f6a9 100644
--- a/kioslave/smtp/interactivesmtpserver.h
+++ b/kioslave/smtp/interactivesmtpserver.h
@@ -49,10 +49,10 @@ static TQString err2str( int err ) {
 
 static TQString escape( TQString s ) {
   return s
-    .tqreplace( '&', "&" )
-    .tqreplace( '>', ">" )
-    .tqreplace( '<', "&lt;" )
-    .tqreplace( '"', "&quot;" )
+    .replace( '&', "&amp;" )
+    .replace( '>', "&gt;" )
+    .replace( '<', "&lt;" )
+    .replace( '"', "&quot;" )
     ;
 }
 
diff --git a/kioslave/smtp/request.cc b/kioslave/smtp/request.cc
index b019b8285..ab02abc1c 100644
--- a/kioslave/smtp/request.cc
+++ b/kioslave/smtp/request.cc
@@ -93,7 +93,7 @@ namespace KioSMTP {
 
   static bool isUsAscii( const TQString & s ) {
     for ( uint i = 0 ; i < s.length() ; ++i )
-      if ( s[i].tqunicode() > 127 ) return false;
+      if ( s[i].unicode() > 127 ) return false;
     return true;
   }
 
diff --git a/kioslave/smtp/response.h b/kioslave/smtp/response.h
index 2fd48ebf3..26c79b9c1 100644
--- a/kioslave/smtp/response.h
+++ b/kioslave/smtp/response.h
@@ -49,7 +49,7 @@ namespace KioSMTP {
 	mWellFormed(true) {}
 
     void parseLine( const char * line ) {
-      parseLine( line, tqstrlen( line ) );
+      parseLine( line, qstrlen( line ) );
     }
     void parseLine( const char * line, int len );
 
diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc
index 883ee3ebb..e493f5132 100644
--- a/kioslave/smtp/smtp.cc
+++ b/kioslave/smtp/smtp.cc
@@ -200,7 +200,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
   KURL open_url = url;
   if ( !request.hasProfile() ) {
     //kdDebug(7112) << "kio_smtp: Profile is null" << endl;
-    bool hasProfile = mset.profiles().tqcontains( open_url.host() );
+    bool hasProfile = mset.profiles().contains( open_url.host() );
     if ( hasProfile ) {
       mset.setProfile(open_url.host());
       open_url.setHost(mset.getSetting(KEMailSettings::OutServer));
diff --git a/kioslave/smtp/test_commands.cc b/kioslave/smtp/test_commands.cc
index fd3adb949..680514b10 100644
--- a/kioslave/smtp/test_commands.cc
+++ b/kioslave/smtp/test_commands.cc
@@ -55,7 +55,7 @@ public:
   }
   bool usingSSL() const { return usesSSL; }
   bool usingTLS() const { return usesTLS; }
-  bool haveCapability( const char * cap ) const { return caps.tqcontains( cap ); }
+  bool haveCapability( const char * cap ) const { return caps.contains( cap ); }
   void error( int id, const TQString & msg ) {
     lastErrorCode = id;
     lastErrorMessage = msg;
@@ -82,16 +82,16 @@ public:
 using namespace KioSMTP;
 
 static const char * foobarbaz = ".Foo bar baz";
-static const unsigned int foobarbaz_len = tqstrlen( foobarbaz );
+static const unsigned int foobarbaz_len = qstrlen( foobarbaz );
 
 static const char * foobarbaz_dotstuffed = "..Foo bar baz";
-static const unsigned int foobarbaz_dotstuffed_len = tqstrlen( foobarbaz_dotstuffed );
+static const unsigned int foobarbaz_dotstuffed_len = qstrlen( foobarbaz_dotstuffed );
 
 static const char * foobarbaz_lf = ".Foo bar baz\n";
-static const unsigned int foobarbaz_lf_len = tqstrlen( foobarbaz_lf );
+static const unsigned int foobarbaz_lf_len = qstrlen( foobarbaz_lf );
 
 static const char * foobarbaz_crlf = "..Foo bar baz\r\n";
-static const unsigned int foobarbaz_crlf_len = tqstrlen( foobarbaz_crlf );
+static const unsigned int foobarbaz_crlf_len = qstrlen( foobarbaz_crlf );
 
 static void checkSuccessfulTransferCommand( bool, bool, bool, bool, bool );
 
@@ -657,10 +657,10 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast,
                          mailEndsInNewline ? foobarbaz_lf : foobarbaz
                        :
                          mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ;
-  const unsigned int s_pre_len = tqstrlen( s_pre );
+  const unsigned int s_pre_len = qstrlen( s_pre );
 
   const char * s_post = mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ;
-  //const unsigned int s_post_len = tqstrlen( s_post );
+  //const unsigned int s_post_len = qstrlen( s_post );
 
   TransferCommand xfer( &smtp, preload ? s_post : 0 );