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

11 files changed, 60 insertions, 60 deletions

diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp
index 9dfeb5a6..055512da 100644
--- a/quanta/components/debugger/conditionalbreakpointdialog.cpp
+++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp
@@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog()
 void ConditionalBreakpointDialog::slotExpressionChanged()
 {
 
-  if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0)
+  if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0)
     ledWarning->on();
   else
     ledWarning->off();
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index d5ce7b86..584e71f0 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
@@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead()
       // If datalen == -1, we didnt read the size yet, otherwise we're reading data.
       if(m_datalen == -1)
       {
-        bytes = m_fifo.tqfind('\0');
+        bytes = m_fifo.find('\0');
         if(bytes < 0)
           break;
 
diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp
index c76e00c2..e9bbc249 100644
--- a/quanta/components/debugger/dbgp/dbgpsettings.cpp
+++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp
@@ -23,7 +23,7 @@
 DBGpSettings::DBGpSettings(const TQString &protocolversion)
     : DBGpSettingsS(0, "DBGpSettings", false, 0)
 {
-  textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion));
+  textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion));
   connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool)));
 }
 
diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
index 6a52ac39..578fedb9 100644
--- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
+++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
@@ -38,7 +38,7 @@ TQString TQByteArrayFifo::retrieve( )
   for(size_t cnt = 0; cnt < m_size; cnt++)
     m_array[cnt] = m_array[cnt + size];
 
-  // Resize array, needed for tqfind() to work
+  // Resize array, needed for find() to work
   m_array.resize(m_size);
 
   return str;
@@ -60,13 +60,13 @@ bool TQByteArrayFifo::append(const char * chars, size_t size )
   return true;
 }
 
-long TQByteArrayFifo::tqfind( char character )
+long TQByteArrayFifo::find( char character )
 {
-  // If size is 0, tqfind() outputs a warning for some reason
+  // If size is 0, find() outputs a warning for some reason
   if(m_size == 0)
     return -1;
 
-  return m_array.tqfind(character);
+  return m_array.find(character);
 }
 
 TQString TQByteArrayFifo::base64Encoded()
diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h
index 2f46df76..9672c619 100644
--- a/quanta/components/debugger/dbgp/qbytearrayfifo.h
+++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h
@@ -31,7 +31,7 @@ class TQByteArrayFifo
     bool append(const char * chars, size_t size);
     TQString retrieve();
     TQString base64Encoded();
-    long tqfind(char character);
+    long find(char character);
     size_t length() { return m_size; }
 
   private:
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index ac3793bd..44071116 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node)
     // Type isnt currently correct with xdebug
 //     type = (attribute(child, "type") == "file" ? File : Eval);
     typestr = attribute(child, "filename");
-    if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
+    if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
       type = Eval;
     else
       type = File;
@@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&)
 // Watch a variable
 void QuantaDebuggerDBGp::addWatch(const TQString & variable)
 {
-  if(m_watchlist.tqfind(variable) == m_watchlist.end())
+  if(m_watchlist.find(variable) == m_watchlist.end())
     m_watchlist.append(variable);
   m_network.sendCommand("property_get", "-n " + variable);
 }
 // Remove watch
 void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable)
 {
-  if(m_watchlist.tqfind(variable->name()) != m_watchlist.end())
-    m_watchlist.remove(m_watchlist.tqfind(variable->name()));
+  if(m_watchlist.find(variable->name()) != m_watchlist.end())
+    m_watchlist.remove(m_watchlist.find(variable->name()));
 }
 
 // Show conditional breakpoint state
@@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen()
 void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
 {
   TQString profileroutput = m_profilerFilename;
-  profileroutput.tqreplace("%a", m_appid);
-  profileroutput.tqreplace("%c", m_initialscript);
+  profileroutput.replace("%a", m_appid);
+  profileroutput.replace("%c", m_initialscript);
 
   if(m_profilerMapFilename)
     profileroutput = mapServerPathToLocal( profileroutput);
diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp
index 2d18309f..6a47d296 100644
--- a/quanta/components/debugger/debuggerbreakpointlist.cpp
+++ b/quanta/components/debugger/debuggerbreakpointlist.cpp
@@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp)
 
 void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp)
 {
-  BreakpointList_t::iterator it = tqfind(*bp);
+  BreakpointList_t::iterator it = find(*bp);
   if(it == m_breakpointList->end())
     return;
 
@@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear()
 
 bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp)
 {
-  BreakpointList_t::iterator it = tqfind(*bp);
+  BreakpointList_t::iterator it = find(*bp);
   if(it == m_breakpointList->end())
     return false;
 
@@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp)
 }
 
 
-BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp)
+BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp)
 {
   BreakpointList_t::iterator it;
 
@@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp,
 {
   //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp);
   BreakpointList_t::iterator it;
-  it = tqfind(bp);
+  it = find(bp);
   if(it != m_breakpointList->end())
   {
     (*it)->setKey(newkey);
diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h
index ef9233bc..aa6cd803 100644
--- a/quanta/components/debugger/debuggerbreakpointlist.h
+++ b/quanta/components/debugger/debuggerbreakpointlist.h
@@ -31,7 +31,7 @@ class DebuggerBreakpointList
   private:
     BreakpointList_t* m_breakpointList;
     BreakpointList_t::iterator m_current;
-    BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp);
+    BreakpointList_t::iterator find(const DebuggerBreakpoint &bp);
 
   public:
     DebuggerBreakpointList();
diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp
index b6df9b25..9464dc81 100644
--- a/quanta/components/debugger/gubed/gubedsettings.cpp
+++ b/quanta/components/debugger/gubed/gubedsettings.cpp
@@ -22,7 +22,7 @@
 GubedSettings::GubedSettings(const TQString &protocolversion)
     : GubedSettingsS(0, "GubedSettings", false, 0)
 {
-  textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion));
+  textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion));
 }
 
 GubedSettings::~GubedSettings()
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index e14ca894..7b84380d 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead()
       // If datalen == -1, we didnt read the command yet, otherwise were reading data.
       if(m_datalen == -1)
       {
-        bytes = m_buffer.tqfind(";");
+        bytes = m_buffer.find(";");
         if(bytes < 0)
           break;
 
         data = m_buffer.left(bytes);
         m_buffer.remove(0, bytes + 1);
-        bytes = data.tqfind(":");
+        bytes = data.find(":");
         m_command = data.left(bytes);
         data.remove(0, bytes + 1);
         m_datalen = data.toLong();
@@ -445,7 +445,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
     long argcnt = args["args"].toLong();
     TQString msg = i18n(args["message"].ascii());  // How will we get these messages throught to the translators?
     for(int cnt = 1; cnt <= argcnt; cnt++)
-      msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
+      msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
 
     debuggerInterface()->showtqStatus(msg, false);
   }
@@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&)
 // Watch a variable
 void QuantaDebuggerGubed::addWatch(const TQString &variable)
 {
-  if(m_watchlist.tqfind(variable) == m_watchlist.end())
+  if(m_watchlist.find(variable) == m_watchlist.end())
     m_watchlist.append(variable);
   sendCommand("getwatch", "variable", variable.ascii(), (char*)0L);
 }
 // Remove watch
 void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable)
 {
-  if(m_watchlist.tqfind(variable->name()) != m_watchlist.end())
-    m_watchlist.remove(m_watchlist.tqfind(variable->name()));
+  if(m_watchlist.find(variable->name()) != m_watchlist.end())
+    m_watchlist.remove(m_watchlist.find(variable->name()));
   //sendCommand("unwatchvariable", var->name());
 }
 
@@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     return ca;
   }
 
-  cnt = args.mid(2, args.tqfind("{") - 3).toLong();
-  TQString data = args.mid(args.tqfind("{") + 1);
+  cnt = args.mid(2, args.find("{") - 3).toLong();
+  TQString data = args.mid(args.find("{") + 1);
 
   TQString tmp, func;
   while(cnt > 0)
   {
-    tmp = data.left(data.tqfind("\""));
+    tmp = data.left(data.find("\""));
     length = tmp.mid(2, tmp.length() - 3).toLong();
 
     func = data.mid(tmp.length() + 1, length);
@@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     if(data.left(1) == "i")
     {
       // Integer data
-      tmp = data.mid(data.tqfind(":") + 1);
-      tmp = tmp.left(tmp.tqfind(";"));
+      tmp = data.mid(data.find(":") + 1);
+      tmp = tmp.left(tmp.find(";"));
       ca[func] = tmp;
       data = data.mid(tmp.length() + 3);
 //       kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl;
@@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     else
     {
       // String data
-      tmp = data.left(data.tqfind("\""));
+      tmp = data.left(data.find("\""));
       length = tmp.mid(2, tmp.length() - 3).toLong();
 
       ca[func] = data.mid(tmp.length() + 1, length);
@@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
   if(type == "s")
   {
     // Get length of key
-    tempstring = str.left(str.tqfind(':'));
-    str.remove(0, str.tqfind(':') + 1);
+    tempstring = str.left(str.find(':'));
+    str.remove(0, str.find(':') + 1);
     length = tempstring.toUInt();
 
     key = str.left(length + 1);
@@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
   }
   else if(type == "i")
   {
-    key = str.left(str.tqfind(';'));
-    str.remove(0, str.tqfind(';') + 1);
+    key = str.left(str.find(';'));
+    str.remove(0, str.find(';') + 1);
 
   }
 
@@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:4:"$row";i:6;
     */
-    data = str.left(str.tqfind(';'));
-    str.remove(0, str.tqfind(';') + 1);
+    data = str.left(str.find(';'));
+    str.remove(0, str.find(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer);
 
   }
@@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:8:"$boolvar";b:1;
     */
-    data = str.left(str.tqfind(';'));
+    data = str.left(str.find(';'));
     data = (data == "0" ? i18n("False"): i18n("True"));
-    str.remove(0, str.tqfind(';') + 1);
+    str.remove(0, str.find(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean);
   }
   else if(type == "N")
@@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of string
-    tempstring = str.left(str.tqfind(':'));
-    str.remove(0, str.tqfind(':') + 1);
+    tempstring = str.left(str.find(':'));
+    str.remove(0, str.find(':') + 1);
     length = tempstring.toUInt();
 
     data = str.left(length + 1);
@@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of array
-    tempstring = str.left(str.tqfind(':'));
-    str.remove(0, str.tqfind(':') + 2);
+    tempstring = str.left(str.find(':'));
+    str.remove(0, str.find(':') + 2);
     length = tempstring.toUInt();
 
     TQPtrList<DebuggerVariable> vars ;
@@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of array
-    tempstring = str.left(str.tqfind(':'));
-    str.remove(0, str.tqfind(':') + 2);
-    tempstring = str.mid(str.tqfind(':') + 1);
-    tempstring = tempstring.left(tempstring.tqfind(':'));
+    tempstring = str.left(str.find(':'));
+    str.remove(0, str.find(':') + 2);
+    tempstring = str.mid(str.find(':') + 1);
+    tempstring = tempstring.left(tempstring.find(':'));
     length = tempstring.toUInt();
 
-    str.remove(0, str.tqfind('{') + 1);
+    str.remove(0, str.find('{') + 1);
     
     TQPtrList<DebuggerVariable> vars ;
     while(length > 0)
@@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;"
     */
-    data = str.left(str.tqfind(';'));
-    str.remove(0, str.tqfind(';') + 1);
+    data = str.left(str.find(';'));
+    str.remove(0, str.find(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float);
 
   }
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index be930d17..83eb582c 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str)
   // n/d/p = name/dir/path
 
   // Filename, filedir and filepath
-  newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName());
-  newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory());
-  newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path());
+  newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName());
+  newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory());
+  newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path());
 
   // filedir and filepath relative to project root
-  newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path()));
-  newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory()));
+  newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path()));
+  newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory()));
 
   // filedir and filepath relative to document root
-  newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path()));
-  newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory()));
+  newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path()));
+  newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory()));
 
-  newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path());
-  newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory());
+  newstr.replace("%apd", Project::ref()->projectBaseURL().path());
+  newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory());
 
   kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl;