5 files changed, 9 insertions, 9 deletions

diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h
index e859f4055..919633d64 100644
--- a/kioslave/smtp/capabilities.h
+++ b/kioslave/smtp/capabilities.h
@@ -54,7 +54,7 @@ namespace KioSMTP {
     void clear() { mCapabilities.clear(); }
 
     bool have( const TQString & cap ) const {
-      return mCapabilities.tqfind( cap.upper() ) != mCapabilities.end();
+      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 ) ); }
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 22042769b..05f8bdc99 100644
--- a/kioslave/smtp/request.cc
+++ b/kioslave/smtp/request.cc
@@ -50,7 +50,7 @@ namespace KioSMTP {
     kdDebug(7112) << "Parsing request from query:\n" + query.join("\n" ) << endl;
 #endif
     for ( TQStringList::const_iterator it = query.begin() ; it != query.end() ; ++it ) {
-      int equalsPos = (*it).tqfind( '=' );
+      int equalsPos = (*it).find( '=' );
       if ( equalsPos <= 0 )
 	continue;
 
@@ -101,7 +101,7 @@ namespace KioSMTP {
 
   static inline bool isSpecial( char ch ) {
     static const TQCString specials = "()<>[]:;@\\,.\"";
-    return specials.tqfind( ch ) >= 0;
+    return specials.find( ch ) >= 0;
   }
 
 
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..23d7723ee 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;