rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index 223a8adf9..f49437928 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -215,15 +215,15 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum,
   }
 
   if (index == -1)
-    index = folder->tqfind(msg);
+    index = folder->find(msg);
 
   // Should not happen, indicates id file corruption
-  while (dict->tqfind((long)msn)) {
+  while (dict->find((long)msn)) {
     msn = getNextMsgSerNum();
     folder->setDirty( true ); // rewrite id file
   }
 
-  // Insert into the dict. Don't use dict->tqreplace() as we _know_
+  // Insert into the dict. Don't use dict->replace() as we _know_
   // there is no entry with the same msn, we just made sure.
   KMMsgDictEntry *entry = new KMMsgDictEntry(folder->folder(), index);
   dict->insert((long)msn, entry);
@@ -246,12 +246,12 @@ unsigned long KMMsgDict::insert(const KMMsgBase *msg, int index)
 
 //-----------------------------------------------------------------------------
 
-void KMMsgDict::tqreplace(unsigned long msgSerNum,
+void KMMsgDict::replace(unsigned long msgSerNum,
 		       const KMMsgBase *msg, int index)
 {
   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
   if ( !folder ) {
-    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot replace the message serial "
+    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
       << "number, null pointer to storage. Requested serial: " << msgSerNum
       << endl;
     kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
@@ -260,7 +260,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum,
   }
 
   if ( index == -1 )
-    index = folder->tqfind( msg );
+    index = folder->find( msg );
 
   remove( msgSerNum );
   KMMsgDictEntry *entry = new KMMsgDictEntry( folder->folder(), index );
@@ -279,7 +279,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum,
 void KMMsgDict::remove(unsigned long msgSerNum)
 {
   long key = (long)msgSerNum;
-  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind(key);
+  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find(key);
   if (!entry)
     return;
 
@@ -319,7 +319,7 @@ void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex)
 void KMMsgDict::getLocation(unsigned long key,
                             KMFolder **retFolder, int *retIndex) const
 {
-  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind((long)key);
+  KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find((long)key);
   if (entry) {
     *retFolder = (KMFolder *)entry->folder;
     *retIndex = entry->index;
@@ -448,7 +448,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
     if (swapByteOrder)
        msn = kmail_swap_32(msn);
 
-    if (!readOk || dict->tqfind(msn)) {
+    if (!readOk || dict->find(msn)) {
       for (unsigned int i = 0; i < index; i++) {
         msn = rentry->getMsn(i);
         dict->remove((long)msn);
@@ -468,7 +468,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
       Q_ASSERT( msn != 0 );
     }
 
-    // Insert into the dict. Don't use dict->tqreplace() as we _know_
+    // Insert into the dict. Don't use dict->replace() as we _know_
     // there is no entry with the same msn, we just made sure.
     KMMsgDictEntry *entry = new KMMsgDictEntry( storage.folder(), index);
     dict->insert((long)msn, entry);