rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

10 files changed, 32 insertions, 32 deletions

diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp
index aaf40f38..e8955556 100644
--- a/kfilereplace/commandengine.cpp
+++ b/kfilereplace/commandengine.cpp
@@ -89,11 +89,11 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg)
   Q_UNUSED(arg);
 
   TQString tempOpt = opt;
-  tempOpt.tqreplace("ln","l");
-  tempOpt.tqreplace("sin","s");
-  tempOpt.tqreplace("cos","c");
-  tempOpt.tqreplace("arctan","a");
-  tempOpt.tqreplace("exp","e");
+  tempOpt.replace("ln","l");
+  tempOpt.replace("sin","s");
+  tempOpt.replace("cos","c");
+  tempOpt.replace("arctan","a");
+  tempOpt.replace("exp","e");
   
   TQString program = "var=("+tempOpt+");print var";
   TQString script = "echo '"+program+"' | bc -l;";
@@ -156,7 +156,7 @@ TQString CommandEngine::variableValue(const TQString &variable)
 
   s.remove("[$").remove("$]").remove(" ");
 
-  if(s.tqcontains(":") == 0)
+  if(s.contains(":") == 0)
     return variable;
   else
     {
diff --git a/kfilereplace/configurationclasses.cpp b/kfilereplace/configurationclasses.cpp
index 8d0ff303..bb66c3ef 100644
--- a/kfilereplace/configurationclasses.cpp
+++ b/kfilereplace/configurationclasses.cpp
@@ -104,12 +104,12 @@ ResultViewEntry::ResultViewEntry(TQString nkey, TQString ndata, bool regexp, boo
 
 int ResultViewEntry::lineNumber(const TQString& line) const
 {
-  return line.mid(0,m_pos).tqcontains('\n')+1;
+  return line.mid(0,m_pos).contains('\n')+1;
 }
 
 int ResultViewEntry::columnNumber(const TQString& line) const
 {
-  return(m_pos - line.tqfindRev('\n',m_pos));
+  return(m_pos - line.findRev('\n',m_pos));
 }
 
 void ResultViewEntry::incOccurrences()
@@ -132,7 +132,7 @@ int ResultViewEntry::pos(const TQString& line)
   if(m_regexp)
     m_pos = m_rxKey.search(line,m_pos);
   else
-    m_pos = line.tqfind(m_key, m_pos, m_caseSensitive);
+    m_pos = line.find(m_key, m_pos, m_caseSensitive);
 
   return m_pos;
 }
diff --git a/kfilereplace/configurationclasses.h b/kfilereplace/configurationclasses.h
index e5fc77d4..0d36261b 100644
--- a/kfilereplace/configurationclasses.h
+++ b/kfilereplace/configurationclasses.h
@@ -52,7 +52,7 @@ const TQString rcSearchMode = "Search only mode";
 const TQString rcBackupExtension = "Backup file extension";
 const TQString rcIgnoreFiles = "Ignore files if there is no match";
 const TQString rcNotifyOnErrors = "NotifyOnErrors";
-const TQString rcAskConfirmReplace = "Ask confirmation on tqreplace";
+const TQString rcAskConfirmReplace = "Ask confirmation on replace";
 const TQString rcDontAskAgain = "Dont ask again";
 // Default configuration options
 const TQString EncodingOption = "utf8";
diff --git a/kfilereplace/kaddstringdlg.h b/kfilereplace/kaddstringdlg.h
index 6193cbae..0a3ee320 100644
--- a/kfilereplace/kaddstringdlg.h
+++ b/kfilereplace/kaddstringdlg.h
@@ -64,7 +64,7 @@ class KAddStringDlg : public KAddStringDlgS
      */
     void raiseView();
     /**
-     * Verifies whether 'lv' tqcontains 's'
+     * Verifies whether 'lv' contains 's'
      */
     bool columnContains(TQListView* lv,const TQString& s, int column);
     void saveViewContentIntoMap();
diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index c68821d7..d6a5aa6d 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -464,7 +464,7 @@ void KFileReplacePart::resetActions()
   actionCollection()->action("new_project")->setEnabled(true);
   actionCollection()->action("search")->setEnabled(hasItems && searchOnlyMode);
   actionCollection()->action("file_simulate")->setEnabled(hasItems && !searchOnlyMode);
-  actionCollection()->action("tqreplace")->setEnabled(hasItems && !searchOnlyMode);
+  actionCollection()->action("replace")->setEnabled(hasItems && !searchOnlyMode);
   actionCollection()->action("save_results")->setEnabled(hasItems);
   actionCollection()->action("stop")->setEnabled(false);
 
@@ -570,7 +570,7 @@ void KFileReplacePart::initGUI()
   (void)new KAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
   (void)new KAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
   (void)new KAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
-  (void)new KAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "tqreplace");
+  (void)new KAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
   (void)new KAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
   (void)new KAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
 
@@ -583,8 +583,8 @@ void KFileReplacePart::initGUI()
   (void)new KAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
   (void)new KAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
   (void)new KRecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
-  (void)new KAction(i18n("&Invert Current String (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
-  (void)new KAction(i18n("&Invert All Strings (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
+  (void)new KAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
+  (void)new KAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
 
   // Options
   (void)new KToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
@@ -630,7 +630,7 @@ void KFileReplacePart::freezeActions()
   actionCollection()->action("stop")->setEnabled(true);
 
   actionCollection()->action("file_simulate")->setEnabled(false);
-  actionCollection()->action("tqreplace")->setEnabled(false);
+  actionCollection()->action("replace")->setEnabled(false);
   actionCollection()->action("search")->setEnabled(false);
   actionCollection()->action("strings_add")->setEnabled(false);
   actionCollection()->action("strings_del")->setEnabled(false);
@@ -1381,15 +1381,15 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
           int pos;
 
           if(m_option->m_regularExpressions)
-            pos = line.tqfind(rxKey);
+            pos = line.find(rxKey);
           else
-            pos = line.tqfind(strKey, 0 ,m_option->m_caseSensitive);
+            pos = line.find(strKey, 0 ,m_option->m_caseSensitive);
 
           if(pos != -1)
             {
               atLeastOneStringFound = true;
-              int lineNumber = line.mid(0,pos).tqcontains('\n')+1;
-              int columnNumber = pos - line.tqfindRev('\n',pos);
+              int lineNumber = line.mid(0,pos).contains('\n')+1;
+              int columnNumber = pos - line.findRev('\n',pos);
 
               if (!item)
                 item = new KListViewItem(rv);
@@ -1418,7 +1418,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
           if(m_option->m_regularExpressions)
             pos = rxKey.search(line,pos);
           else
-            pos = line.tqfind(strKey, pos ,m_option->m_caseSensitive);
+            pos = line.find(strKey, pos ,m_option->m_caseSensitive);
 
           while(pos != -1)
             {
@@ -1429,8 +1429,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               atLeastOneStringFound = true;
               TQString msg,
                       capturedText;
-              int lineNumber = line.mid(0,pos).tqcontains('\n')+1;
-              int columnNumber = pos - line.tqfindRev('\n',pos);
+              int lineNumber = line.mid(0,pos).contains('\n')+1;
+              int columnNumber = pos - line.findRev('\n',pos);
 
               if(m_option->m_regularExpressions)
                 {
@@ -1440,7 +1440,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               else
                 {
                   capturedText = line.mid(pos,strKey.length());
-                  pos = line.tqfind(strKey,pos+strKey.length());
+                  pos = line.find(strKey,pos+strKey.length());
                 }
 
               msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10));
@@ -1569,7 +1569,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
 
   // Adds file to "load strings form file" menu
   TQStringList fileList = m_option->m_recentStringFileList;
-  if(!fileList.tqcontains(fileName))
+  if(!fileList.contains(fileName))
     {
       fileList.append(fileName);
       ((KRecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList);
@@ -1623,10 +1623,10 @@ bool KFileReplacePart::checkBeforeOperation()
   loadViewContent();
   KListView* sv = m_view->getStringsView();
 
-  // Checks if there are strings to tqreplace (not need in search operation)
+  // Checks if there are strings to replace (not need in search operation)
   if (sv->childCount() == 0)
     {
-      KMessageBox::error(m_w, i18n("There are no strings to search and tqreplace."));
+      KMessageBox::error(m_w, i18n("There are no strings to search and replace."));
       return false;
     }
 
diff --git a/kfilereplace/kfilereplaceview.h b/kfilereplace/kfilereplaceview.h
index 4e94081e..1402c0a7 100644
--- a/kfilereplace/kfilereplaceview.h
+++ b/kfilereplace/kfilereplaceview.h
@@ -52,7 +52,7 @@ class coord
 
 
 /**
- * The view of KFiletqreplace.
+ * The view of KFilereplace.
  */
 class KFileReplaceView : public KFileReplaceViewWdg
 {
diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp
index 14221357..5aa5abc8 100644
--- a/kfilereplace/knewprojectdlg.cpp
+++ b/kfilereplace/knewprojectdlg.cpp
@@ -493,7 +493,7 @@ void KNewProjectDlg::setDatas(const TQString& directoryString, const TQString& f
     m_cbFilter->setEditText(filterString);
 }
 
-bool KNewProjectDlg::tqcontains(TQListView* lv,const TQString& s, int column)
+bool KNewProjectDlg::contains(TQListView* lv,const TQString& s, int column)
 {
   TQListViewItem* i = lv->firstChild();
   while (i != 0)
diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h
index 7459bacf..b0af6ff2 100644
--- a/kfilereplace/knewprojectdlg.h
+++ b/kfilereplace/knewprojectdlg.h
@@ -77,7 +77,7 @@ class KNewProjectDlg : public KNewProjectDlgS
     void saveFiltersList();
     void saveBackupExtensionOptions();
 
-    bool tqcontains(TQListView* lv,const TQString& s, int column);
+    bool contains(TQListView* lv,const TQString& s, int column);
     void setDatas(const TQString& directoryString, const TQString& filterString);
     void whatsThis();
 };
diff --git a/kfilereplace/report.cpp b/kfilereplace/report.cpp
index 5497b045..62e59173 100644
--- a/kfilereplace/report.cpp
+++ b/kfilereplace/report.cpp
@@ -60,7 +60,7 @@ void Report::createReportFile()
       columnReplaceWith = i18n("-");
     }
 
-  TQString css =  cssFileName.mid(cssFileName.tqfindRev("/")+1,cssFileName.length()-(cssFileName.tqfindRev("/")+1));
+  TQString css =  cssFileName.mid(cssFileName.findRev("/")+1,cssFileName.length()-(cssFileName.findRev("/")+1));
   TQTextStream oTStream( &report );
   oTStream << "<?xml version=\"1.0\"?>\n"
               "<?xml-stylesheet href=\""+css+"\" type=\"text/css\"?>"
diff --git a/kfilereplace/whatthis.h b/kfilereplace/whatthis.h
index 01c1e1f4..09f6ac80 100644
--- a/kfilereplace/whatthis.h
+++ b/kfilereplace/whatthis.h
@@ -31,7 +31,7 @@ namespace whatthisNameSpace
   const TQString lvStringsWhatthis = i18n("Shows a list of strings to search for (and if you specified it, a list of strings to replace with). Use the \"add strings\" dialog to edit your string list or double click on a string.");
 
   //KNewProjectDlg messages
-  const TQString cbLocationWhatthis = i18n("Base folder for operations of search/tqreplace. Insert path string here by hand or use the search button.");
+  const TQString cbLocationWhatthis = i18n("Base folder for operations of search/replace. Insert path string here by hand or use the search button.");
 
   const TQString cbFilterWhatthis = i18n("Shell-like wildcards. Example: \"*.html;*.txt;*.xml\".");