rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 21 insertions, 21 deletions

diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 54d177b4..63f2a077 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog()
    _logWindow->show();
 }
 
-TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest )
+TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 {
    CatManListItem* i=(CatManListItem*) currentItem();
 
@@ -1391,8 +1391,8 @@ bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList
     for( TQStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 )
 	for( TQStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 )
 	    if( *it1 == *it2
-		|| (*it1).tqcontains(*it2)
-		|| (*it2).tqcontains(*it1) ) return true;
+		|| (*it1).contains(*it2)
+		|| (*it2).contains(*it1) ) return true;
     return false;
 }
 
@@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index)
    if(index>=0 && item && item->isDir())
    {
       TQString cmd=*(_settings.dirCommands).at(index);
-      cmd.tqreplace("@PACKAGE@",item->name());
-      cmd.tqreplace("@PODIR@",item->poFile());
-      cmd.tqreplace("@POTDIR@",item->potFile());
-      cmd.tqreplace("@POFILES@",current().join(" "));
-      cmd.tqreplace("@MARKEDPOFILES@",marked().join(" "));
+      cmd.replace("@PACKAGE@",item->name());
+      cmd.replace("@PODIR@",item->poFile());
+      cmd.replace("@POTDIR@",item->potFile());
+      cmd.replace("@POFILES@",current().join(" "));
+      cmd.replace("@MARKEDPOFILES@",marked().join(" "));
 
       kdDebug(KBABEL_CATMAN) << cmd << endl;
 
@@ -1641,12 +1641,12 @@ void CatalogManagerView::slotFileCommand(int index)
       CatManListItem* tqparent = (CatManListItem*)item->tqparent();
 
       TQString cmd=*(_settings.fileCommands).at(index);
-      cmd.tqreplace("@PACKAGE@",item->name());
-      cmd.tqreplace("@POFILE@",item->poFile());
-      cmd.tqreplace("@POTFILE@",item->potFile());
-      cmd.tqreplace("@PODIR@",tqparent->poFile());
-      cmd.tqreplace("@POTDIR@",tqparent->potFile());
-      cmd.tqreplace("@POEMAIL@",item->text(COL_TRANSLATOR));
+      cmd.replace("@PACKAGE@",item->name());
+      cmd.replace("@POFILE@",item->poFile());
+      cmd.replace("@POTFILE@",item->potFile());
+      cmd.replace("@PODIR@",tqparent->poFile());
+      cmd.replace("@POTDIR@",tqparent->potFile());
+      cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR));
 
       kdDebug(KBABEL_CATMAN) << cmd << endl;
 
@@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir
              _fileList.insert(file,item);
              _readInfoFileList.prepend(file);
 
-             if(_markerList.tqcontains(file))
+             if(_markerList.contains(file))
              {
                 item->setMarked(true);
              }
@@ -2027,7 +2027,7 @@ void CatalogManagerView::updateDir(TQString relDir)
              item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file);
              _fileList.insert(file,item);
 
-             if(_markerList.tqcontains(file))
+             if(_markerList.contains(file))
              {
                 item->setMarked(true);
              }
@@ -2109,7 +2109,7 @@ void CatalogManagerView::updateDir(TQString relDir)
              item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file);
              _fileList.insert(file,item);
 
-             if(_markerList.tqcontains(file))
+             if(_markerList.contains(file))
              {
                 item->setMarked(true);
              }
@@ -2207,7 +2207,7 @@ void CatalogManagerView::updateDir(TQString relDir)
 
           // if this directory has to be removed, check, if
 		  // the tqparent directory has to be removed too
-          const int index=relDir.tqfindRev("/",relDir.length()-2);
+          const int index=relDir.findRev("/",relDir.length()-2);
           if(index<0)
           {
             relDir="/";
@@ -2271,7 +2271,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
       do
       {
           prevRelDir=relDir;
-          const int index=relDir.tqfindRev("/",relDir.length()-2);
+          const int index=relDir.findRev("/",relDir.length()-2);
           if(index<0)
           {
             relDir="/";
@@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir)
 
 void CatalogManagerView::fileInfoRead( TQString filename )
 {
-    if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) {
+    if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) {
 	emit progress( ++_readInfoCount);
 	_readInfoFileList.remove( filename );
     }
@@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show )
 }
 
 #include "catalogmanagerview.moc"
-// kate: space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;