1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 2782bfa93..de168cebb 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -133,7 +133,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
 
       int commentPos = -1;
 
-      if( (commentPos = s.tqfind('#')) > -1 ) {
+      if( (commentPos = s.find('#')) > -1 ) {
         // get rid of trailing comment
         s.truncate(commentPos);
         s = s.stripWhiteSpace();
@@ -143,7 +143,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
         processGlobalLock(s);
       } else if( lockFileLocal.search(s) != -1 ) {
         processLocalLock(s);
-      } else if( int i = s.tqfind('=') ) {
+      } else if( int i = s.find('=') ) {
         processVariableSetting(s,i);
       }
     }
@@ -156,11 +156,11 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
     default_Location += '/';
     default_Location += getenv("USER");
   }
-  if ( !mSpoolFiles.tqcontains(default_Location) )
+  if ( !mSpoolFiles.contains(default_Location) )
     mSpoolFiles << default_Location;
 
   default_Location = default_Location + ".lock";
-  if ( !mLockFiles.tqcontains(default_Location) )
+  if ( !mLockFiles.contains(default_Location) )
     mLockFiles << default_Location;
 }
 
@@ -172,8 +172,8 @@ ProcmailRCParser::~ProcmailRCParser()
 void
 ProcmailRCParser::processGlobalLock(const TQString &s)
 {
-  TQString val = expandVars(s.mid(s.tqfind('=') + 1).stripWhiteSpace());
-  if ( !mLockFiles.tqcontains(val) )
+  TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
+  if ( !mLockFiles.contains(val) )
     mLockFiles << val;
 }
 
@@ -181,7 +181,7 @@ void
 ProcmailRCParser::processLocalLock(const TQString &s)
 {
   TQString val;
-  int colonPos = s.tqfindRev(':');
+  int colonPos = s.findRev(':');
 
   if (colonPos > 0) { // we don't care about the leading one
     val = s.mid(colonPos + 1).stripWhiteSpace();
@@ -190,7 +190,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       // user specified a lockfile, so process it
       //
       val = expandVars(val);
-      if( val[0] != '/' && mVars.tqfind("MAILDIR") )
+      if( val[0] != '/' && mVars.find("MAILDIR") )
         val.insert(0, *(mVars["MAILDIR"]) + '/');
     } // else we'll deduce the lockfile name one we
     // get the spoolfile name
@@ -211,11 +211,11 @@ ProcmailRCParser::processLocalLock(const TQString &s)
     line = expandVars(line);
 
     // prepend default MAILDIR if needed
-    if( line[0] != '/' && mVars.tqfind("MAILDIR") )
+    if( line[0] != '/' && mVars.find("MAILDIR") )
       line.insert(0, *(mVars["MAILDIR"]) + '/');
 
     // now we have the spoolfile name
-    if ( !mSpoolFiles.tqcontains(line) )
+    if ( !mSpoolFiles.contains(line) )
       mSpoolFiles << line;
 
     if( colonPos > 0 && (!val || val.isEmpty()) ) {
@@ -224,13 +224,13 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       val = line;
 
       // append lock extension
-      if( mVars.tqfind("LOCKEXT") )
+      if( mVars.find("LOCKEXT") )
         val += *(mVars["LOCKEXT"]);
       else
         val += ".lock";
     }
 
-    if ( !val.isNull() && !mLockFiles.tqcontains(val) ) {
+    if ( !val.isNull() && !mLockFiles.contains(val) ) {
       mLockFiles << val;
     }
   }
@@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s)
   TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict
 
   while ( it.current() ) {
-    expS.tqreplace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current());
+    expS.replace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current());
     ++it;
   }
 
@@ -806,7 +806,7 @@ void AccountDialog::makePopAccountPage()
   mPop.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mPop.authGroup, "auth digest-md5" );
   mPop.authNTLM = new TQRadioButton( i18n("&NTLM"), mPop.authGroup, "auth ntlm" );
   mPop.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mPop.authGroup, "auth gssapi" );
-  if ( KProtocolInfo::capabilities("pop3").tqcontains("SASL") == 0 )
+  if ( KProtocolInfo::capabilities("pop3").contains("SASL") == 0 )
   {
     mPop.authNTLM->hide();
     mPop.authGSSAPI->hide();
@@ -1764,7 +1764,7 @@ void AccountDialog::checkHighest( TQButtonGroup *btnGroup )
 {
   kdDebug(5006) << "checkHighest( " << btnGroup << " )" << endl;
   for ( int i = btnGroup->count() - 1; i >= 0 ; --i ) {
-    TQButton * btn = btnGroup->tqfind( i );
+    TQButton * btn = btnGroup->find( i );
     if ( btn && btn->isEnabled() ) {
       btn->animateClick();
       return;
@@ -1972,7 +1972,7 @@ void AccountDialog::saveSettings()
   // get the new account and register the new destination folder
   // this is the target folder for local or pop accounts and the root folder
   // of the account for (d)imap
-  KMAccount* newAcct = kmkernel->acctMgr()->tqfind(mAccount->id());
+  KMAccount* newAcct = kmkernel->acctMgr()->find(mAccount->id());
   if (newAcct)
   {
     if( accountType == "local" ) {
@@ -2298,7 +2298,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
 
   mBg = new TQButtonGroup( 0 );
   connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) );
-  mDelimMap = mNamespaceMap->tqfind( mType ).data();
+  mDelimMap = mNamespaceMap->find( mType ).data();
   ImapAccountBase::namespaceDelim::Iterator it;
   for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) {
     NamespaceLineEdit* edit = new NamespaceLineEdit( grid );
@@ -2315,7 +2315,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
 
 void NamespaceEditDialog::slotRemoveEntry( int id )
 {
-  if ( mLineEditMap.tqcontains( id ) ) {
+  if ( mLineEditMap.contains( id ) ) {
     // delete the lineedit and remove namespace from map
     NamespaceLineEdit* edit = mLineEditMap[id];
     mDelimMap.remove( edit->text() );
@@ -2325,9 +2325,9 @@ void NamespaceEditDialog::slotRemoveEntry( int id )
     mLineEditMap.remove( id );
     delete edit;
   }
-  if ( mBg->tqfind( id ) ) {
+  if ( mBg->find( id ) ) {
     // delete the button
-    delete mBg->tqfind( id );
+    delete mBg->find( id );
   }
   adjustSize();
 }
@@ -2343,7 +2343,7 @@ void NamespaceEditDialog::slotOk()
       mDelimMap.remove( edit->lastText() );
     }
   }
-  mNamespaceMap->tqreplace( mType, mDelimMap );
+  mNamespaceMap->replace( mType, mDelimMap );
   KDialogBase::slotOk();
 }