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, 12 insertions, 12 deletions

diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 32f6e3c44..6a280856f 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -136,7 +136,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const
     }
     // non-root search folders
     if ( protocol() == KMFolderTreeItem::Search ) {
-      icon = "mail_tqfind";
+      icon = "mail_find";
     }
     if ( mFolder && mFolder->noContent() ) {
       icon = "folder_grey";
@@ -1392,7 +1392,7 @@ void KMFolderTree::cleanupConfigFile()
   {
     if ((*grpIt).left(7) != "Folder-") continue;
     name = (*grpIt).mid(7);
-    if (folderMap.tqfind(name) == folderMap.end())
+    if (folderMap.find(name) == folderMap.end())
     {
       KMFolder* folder = kmkernel->findFolderById( name );
       if ( folder ) {
@@ -1634,8 +1634,8 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
   else
           fldName = oldFldName;
 
-  fldName.tqreplace("/", "");
-  fldName.tqreplace(TQRegExp("^\\."), "");
+  fldName.replace("/", "");
+  fldName.replace(TQRegExp("^\\."), "");
 
   if (fldName.isEmpty())
           fldName = i18n("unnamed");
@@ -1648,7 +1648,7 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
 void KMFolderTree::slotUpdateCountsDelayed(KMFolder * folder)
 {
 //  kdDebug(5006) << "KMFolderTree::slotUpdateCountsDelayed()" << endl;
-  if ( !mFolderToUpdateCount.tqcontains( folder->idString() ) )
+  if ( !mFolderToUpdateCount.contains( folder->idString() ) )
   {
 //    kdDebug( 5006 )<< "adding " << folder->idString() << " to updateCountList " << endl;
     mFolderToUpdateCount.insert( folder->idString(),folder );
@@ -1851,7 +1851,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
 {
   while ( menu->count() )
   {
-    TQPopupMenu *popup = menu->tqfindItem( menu->idAt( 0 ) )->popup();
+    TQPopupMenu *popup = menu->findItem( menu->idAt( 0 ) )->popup();
     if ( popup )
       delete popup;
     else
@@ -1897,7 +1897,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
       continue;
     }
     TQString label = fti->text( 0 );
-    label.tqreplace( "&","&&" );
+    label.replace( "&","&&" );
     if ( fti->firstChild() )
     {
       // new level
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     if ( source )
       sourceFolderName = source->label();
 
-    if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
+    if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
           .tqarg( sourceFolderName ) );
       setDragEnabled( true );
@@ -2016,7 +2016,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
       while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
           ( folderDir != source->tqparent() ) )
       {
-        if ( folderDir->tqfindRef( source ) != -1 )
+        if ( folderDir->findRef( source ) != -1 )
         {
           KMessageBox::error( this, message );
           setDragEnabled( true );
@@ -2027,7 +2027,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     }
 
     if( source && source->child() && tqparent &&
-        ( tqparent->path().tqfind( source->child()->path() + "/" ) == 0 ) ) {
+        ( tqparent->path().find( source->child()->path() + "/" ) == 0 ) ) {
       KMessageBox::error( this, message );
       setDragEnabled( true );
       return;
@@ -2051,7 +2051,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
         continue;
       KMFolderDir *childDir = (*it2)->tqparent();
       do {
-        if ( parentDir == childDir || parentDir->tqfindRef( childDir->owner() ) != -1 ) {
+        if ( parentDir == childDir || parentDir->findRef( childDir->owner() ) != -1 ) {
           KMessageBox::error( this, i18n("Moving the selected folders is not possible") );
           setDragEnabled( true );
           return;
@@ -2118,7 +2118,7 @@ void KMFolderTree::cutFolder()
 void KMFolderTree::pasteFolder()
 {
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( currentItem() );
-  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.tqcontains( item->folder() ) ) {
+  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.contains( item->folder() ) ) {
     moveOrCopyFolder( mCopySourceFolders, item->folder(), mCutFolder );
     if ( mCutFolder )
       mCopySourceFolders.clear();