1 files changed, 17 insertions, 17 deletions

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 931d15ea..7a05280e 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -425,7 +425,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     for ( QCStringList::ConstIterator it = customHeaders.begin() ; it != customHeaders.end() ; ++it )
       if ( !(*it).isEmpty() )
       {
-        const int pos = (*it).tqfind( ':' );
+        const int pos = (*it).find( ':' );
         if ( pos > 0 )
         {
           TQCString header, value;
@@ -606,7 +606,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
 void KMKernel::setDefaultTransport( const TQString & transport )
 {
   TQStringList availTransports = KMail::TransportManager::transportNames();
-  TQStringList::const_iterator it = availTransports.tqfind( transport );
+  TQStringList::const_iterator it = availTransports.find( transport );
   if ( it == availTransports.end() ) {
     kdWarning() << "The transport you entered is not available" << endl;
     return;
@@ -814,7 +814,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
   int retval;
   bool readFolderMsgIds = false;
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     mAddMessageMsgIds.clear();
@@ -840,7 +840,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
     msg->fromString( messageText );
 
     if (readFolderMsgIds) {
-      if ( foldername.tqcontains("/")) {
+      if ( foldername.contains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -937,8 +937,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
 	msgId += msg->dateStr();
       }
 
-      int k = mAddMessageMsgIds.tqfindIndex( msgId );
-      //fprintf(stderr,"tqfind %s = %d\n",(const char *) msgId,k);
+      int k = mAddMessageMsgIds.findIndex( msgId );
+      //fprintf(stderr,"find %s = %d\n",(const char *) msgId,k);
 
       if ( k == -1 ) {
         if ( !msgId.isEmpty() ) {
@@ -1000,7 +1000,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
   bool createNewFolder = false;
 
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     createNewFolder = true;
@@ -1018,7 +1018,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
     msg->fromString( messageText );
 
     if (createNewFolder) {
-      if ( foldername.tqcontains("/")) {
+      if ( foldername.contains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -1528,7 +1528,7 @@ void KMKernel::init()
   recreateCorruptIndexFiles();
 
   the_searchFolderMgr = new KMFolderMgr(locateLocal("data","kmail/search"), KMSearchDir);
-  KMFolder *lsf = the_searchFolderMgr->tqfind( i18n("Last Search") );
+  KMFolder *lsf = the_searchFolderMgr->find( i18n("Last Search") );
   if (lsf)
     the_searchFolderMgr->remove( lsf );
 
@@ -1597,7 +1597,7 @@ void KMKernel::init()
 
 bool KMKernel::isCodecAsciiCompatible( const TQTextCodec *codec )
 {
-  return !mNonAsciiCompatibleCodecs.tqcontains( codec );
+  return !mNonAsciiCompatibleCodecs.contains( codec );
 }
 
 void KMKernel::readConfig()
@@ -1613,7 +1613,7 @@ void KMKernel::cleanupImapFolders()
   KMFolderNode *node = the_imapFolderMgr->dir().first();
   while (node)
   {
-    if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id()))
+    if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
 			  && ( acct->type() == "imap" )) )
     {
       node = the_imapFolderMgr->dir().next();
@@ -1629,7 +1629,7 @@ void KMKernel::cleanupImapFolders()
   node = the_dimapFolderMgr->dir().first();
   while (node)
   {
-    if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id()))
+    if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
 			  && ( acct->type() == "cachedimap" )) )
     {
       node = the_dimapFolderMgr->dir().next();
@@ -1665,7 +1665,7 @@ void KMKernel::cleanupImapFolders()
 
     if (acct->type() != "cachedimap" ) continue;
 
-    KMFolder* fld = the_dimapFolderMgr->tqfind(TQString::number(acct->id()));
+    KMFolder* fld = the_dimapFolderMgr->find(TQString::number(acct->id()));
     if( fld )
       cfld = static_cast<KMFolderCachedImap*>( fld->storage() );
     if (cfld == 0) {
@@ -2016,7 +2016,7 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
 {
   // send the data in 64 KB chunks
   const int MAX_CHUNK_SIZE = 64*1024;
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job);
+  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   int remainingBytes = (*it).data.size() - (*it).offset;
   if( remainingBytes > MAX_CHUNK_SIZE )
@@ -2039,7 +2039,7 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
 
 void KMKernel::slotResult(KIO::Job *job)
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job);
+  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   if (job->error())
   {
@@ -2108,7 +2108,7 @@ bool KMKernel::haveSystemTrayApplet()
 
 bool KMKernel::registerSystemTrayApplet( const KSystemTray* applet )
 {
-  if ( systemTrayApplets.tqfindIndex( applet ) == -1 ) {
+  if ( systemTrayApplets.findIndex( applet ) == -1 ) {
     systemTrayApplets.append( applet );
     return true;
   }
@@ -2119,7 +2119,7 @@ bool KMKernel::registerSystemTrayApplet( const KSystemTray* applet )
 bool KMKernel::unregisterSystemTrayApplet( const KSystemTray* applet )
 {
   TQValueList<const KSystemTray*>::iterator it =
-    systemTrayApplets.tqfind( applet );
+    systemTrayApplets.find( applet );
   if ( it != systemTrayApplets.end() ) {
     systemTrayApplets.remove( it );
     return true;