1 files changed, 10 insertions, 10 deletions
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 469f03f11..25fc6c0f0 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -113,7 +113,7 @@ void FolderStorage::close( const char* owner, bool aForced )
 TQString FolderStorage::dotEscape(const TQString& aStr)
 {
   if (aStr[0] != '.') return aStr;
-  return aStr.left(aStr.tqfind(TQRegExp("[^\\.]"))) + aStr;
+  return aStr.left(aStr.find(TQRegExp("[^\\.]"))) + aStr;
 }
 
 void FolderStorage::addJob( FolderJob* job ) const
@@ -350,8 +350,8 @@ void FolderStorage::reallyAddCopyOfMsg(KMMessage* aMsg)
   unGetMsg( count() - 1 );
 }
 
-int FolderStorage::tqfind( const KMMessage * msg ) const {
-  return tqfind( &msg->toMsgBase() );
+int FolderStorage::find( const KMMessage * msg ) const {
+  return find( &msg->toMsgBase() );
 }
 
 //-----------------------------------------------------------------------------
@@ -359,7 +359,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMsgBase>& msgList, bool imapQuie
 {
   for( TQPtrListIterator<KMMsgBase> it( msgList ); *it; ++it )
   {
-    int idx = tqfind(it.current());
+    int idx = find(it.current());
     assert( idx != -1);
     removeMsg(idx, imapQuiet);
   }
@@ -370,7 +370,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMessage>& msgList, bool imapQuie
 {
   for( TQPtrListIterator<KMMessage> it( msgList ); *it; ++it )
   {
-    int idx = tqfind(it.current());
+    int idx = find(it.current());
     assert( idx != -1);
     removeMsg(idx, imapQuiet);
   }
@@ -465,7 +465,7 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList)
   {
     if (msg->tqparent())
     {
-      int idx = msg->tqparent()->tqfind(msg);
+      int idx = msg->tqparent()->find(msg);
       if ( idx >= 0 )
         take(idx);
     }
@@ -725,11 +725,11 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
     // if the folder is being moved then move its node and, if necessary, also
     // the associated subfolder directory node to the new tqparent
     if (newParent) {
-      if (oldParent->tqfindRef( folder() ) != -1)
+      if (oldParent->findRef( folder() ) != -1)
         oldParent->take();
       newParent->inSort( folder() );
       if ( child ) {
-        if ( child->tqparent()->tqfindRef( child ) != -1 )
+        if ( child->tqparent()->findRef( child ) != -1 )
           child->tqparent()->take();
         newParent->inSort( child );
         child->setParent( newParent );
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
 void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
 {
   if (idx < 0)
-    idx = aMsg->tqparent()->tqfind( aMsg );
+    idx = aMsg->tqparent()->find( aMsg );
 
   if (idx >= 0 )
   {
@@ -1025,7 +1025,7 @@ int FolderStorage::appendToFolderIdsFile( int idx )
 void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
-  KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
+  KMMsgDict::mutableInstance()->replace( sernum, msg, idx );
 }
 
 void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const