1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index d82ba5cc9..a06163799 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -669,7 +669,7 @@ namespace KMail {
       // split, allow empty parts as we can get empty namespaces
       TQStringList parts = TQStringList::split( "=", *it, true );
       imapNamespace section = imapNamespace( parts[0].toInt() );
-      if ( map.tqcontains( section ) ) {
+      if ( map.contains( section ) ) {
         nsDelim = map[section];
       } else {
         nsDelim.clear();
@@ -736,12 +736,12 @@ namespace KMail {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
             "support of IMAP namespaces.").tqarg( name() );
-        if ( list.tqcontains( "" ) ) {
+        if ( list.contains( "" ) ) {
           // replace empty entry with the old prefix
           list.remove( "" );
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
+          if ( mNamespaceToDelimiter.contains( "" ) ) {
             TQString delim = mNamespaceToDelimiter[""];
             mNamespaceToDelimiter.remove( "" );
             mNamespaceToDelimiter[mOldPrefix] = delim;
@@ -755,7 +755,7 @@ namespace KMail {
           list.clear();
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.tqcontains( old ) ) {
+          if ( mNamespaceToDelimiter.contains( old ) ) {
             TQString delim = mNamespaceToDelimiter[old];
             mNamespaceToDelimiter.remove( old );
             mNamespaceToDelimiter[mOldPrefix] = delim;
@@ -799,7 +799,7 @@ namespace KMail {
           ns = ns.left( ns.length()-1 );
         }
         // first ignore an empty prefix as it would match always
-        if ( !ns.isEmpty() && path.tqfind( ns ) != -1 ) {
+        if ( !ns.isEmpty() && path.find( ns ) != -1 ) {
           return (*strit);
         }
       }
@@ -812,7 +812,7 @@ namespace KMail {
   {
     //kdDebug(5006) << "delimiterForNamespace " << prefix << endl;
     // try to match exactly
-    if ( mNamespaceToDelimiter.tqcontains(prefix) ) {
+    if ( mNamespaceToDelimiter.contains(prefix) ) {
       return mNamespaceToDelimiter[prefix];
     }
 
@@ -824,13 +824,13 @@ namespace KMail {
       // make sure we also match this version
       TQString stripped = it.key().left( it.key().length() - 1 );
       if ( !it.key().isEmpty() &&
-          ( prefix.tqcontains( it.key() ) || prefix.tqcontains( stripped ) ) ) {
+          ( prefix.contains( it.key() ) || prefix.contains( stripped ) ) ) {
         return it.data();
       }
     }
     // see if we have an empty namespace
     // this should always be the case
-    if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
+    if ( mNamespaceToDelimiter.contains( "" ) ) {
       return mNamespaceToDelimiter[""];
     }
     // well, we tried
@@ -894,7 +894,7 @@ namespace KMail {
   TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
   {
       TQString error = _error;
-      if ( error.tqfind( "quota", 0, false ) == -1 ) return error;
+      if ( error.find( "quota", 0, false ) == -1 ) return error;
       // this is a quota error, prettify it a bit
       JobIterator it = findJob( job );
       TQString quotaAsString( i18n("No detailed quota information available.") );
@@ -1025,7 +1025,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::processNewMailInFolder( KMFolder* folder, FolderListType type /*= Single*/ )
   {
-    if ( mFoldersQueuedForChecking.tqcontains( folder ) )
+    if ( mFoldersQueuedForChecking.contains( folder ) )
       return;
     mFoldersQueuedForChecking.append( folder );
     mCheckingSingleFolder = ( type == Single );
@@ -1057,7 +1057,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   bool ImapAccountBase::checkingMail( KMFolder *folder )
   {
-    if (checkingMail() && mFoldersQueuedForChecking.tqcontains(folder))
+    if (checkingMail() && mFoldersQueuedForChecking.contains(folder))
       return true;
     return false;
   }