rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

4 files changed, 33 insertions, 33 deletions

diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 4fcf761..a428c4c 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -125,7 +125,7 @@ bool KSim::PluginLoader::unloadPlugin(const TQCString &name)
     return false;
 
   // see if our plugin is loaded
-  KSim::Plugin plugin = tqfind(name);
+  KSim::Plugin plugin = find(name);
   if (plugin.isNull())
     return false;
 
@@ -161,7 +161,7 @@ bool KSim::PluginLoader::isLoaded(const TQCString &library) const
   if (library.isEmpty())
     return false;
 
-  return !tqfind(library).isNull();
+  return !find(library).isNull();
 }
 
 KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name,
@@ -211,13 +211,13 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name,
   return info;
 }
 
-KSim::Plugin &KSim::PluginLoader::tqfind(const TQCString &libName)
+KSim::Plugin &KSim::PluginLoader::find(const TQCString &libName)
 {
   if (libName.isEmpty())
     return KSim::Plugin::null;
 
   TQCString library(libName);
-  if (libName.tqfind(Private::ksimString) == -1)
+  if (libName.find(Private::ksimString) == -1)
     library.prepend(Private::ksimString);
 
   KSim::PluginList::Iterator it;
@@ -229,13 +229,13 @@ KSim::Plugin &KSim::PluginLoader::tqfind(const TQCString &libName)
   return KSim::Plugin::null;
 }
 
-const KSim::Plugin &KSim::PluginLoader::tqfind(const TQCString &libName) const
+const KSim::Plugin &KSim::PluginLoader::find(const TQCString &libName) const
 {
   if (libName.isEmpty())
     return KSim::Plugin::null;
 
   TQCString library(libName);
-  if (libName.tqfind(Private::ksimString) == -1)
+  if (libName.find(Private::ksimString) == -1)
     library.prepend(Private::ksimString);
 
   KSim::PluginList::ConstIterator it;
@@ -247,14 +247,14 @@ const KSim::Plugin &KSim::PluginLoader::tqfind(const TQCString &libName) const
   return KSim::Plugin::null;
 }
 
-KSim::Plugin &KSim::PluginLoader::tqfind(const KSim::PluginInfo &info)
+KSim::Plugin &KSim::PluginLoader::find(const KSim::PluginInfo &info)
 {
-  return tqfind(info.libName());
+  return find(info.libName());
 }
 
-const KSim::Plugin &KSim::PluginLoader::tqfind(const KSim::PluginInfo &info) const
+const KSim::Plugin &KSim::PluginLoader::find(const KSim::PluginInfo &info) const
 {
-  return tqfind(info.libName());
+  return find(info.libName());
 }
 
 const KSim::PluginList &KSim::PluginLoader::pluginList() const
diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h
index b1806fa..7110c72 100644
--- a/ksim/library/pluginloader.h
+++ b/ksim/library/pluginloader.h
@@ -123,19 +123,19 @@ namespace KSim
        * @return a KSim::Plugin object
        * @see KSim::Plugin
        */
-      KSim::Plugin &tqfind(const TQCString &libName);
+      KSim::Plugin &find(const TQCString &libName);
       /**
        * convenience function, see the above function for details.
        */
-      const KSim::Plugin &tqfind(const TQCString &libName) const;
+      const KSim::Plugin &find(const TQCString &libName) const;
       /**
-       * equivalent to tqfind(info.libName());
+       * equivalent to find(info.libName());
        */
-      KSim::Plugin &tqfind(const KSim::PluginInfo &info);
+      KSim::Plugin &find(const KSim::PluginInfo &info);
       /**
        * convenience function, see the above function for details.
        */
-      const KSim::Plugin &tqfind(const KSim::PluginInfo &info) const;
+      const KSim::Plugin &find(const KSim::PluginInfo &info) const;
       /**
        * provides plugin(), view(), config page and plugin information
        * @see KSim::Plugin KSim::PluginList
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index cfc57de..f3b941c 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -64,7 +64,7 @@ void KSim::PluginObject::setConfigFileName(const TQString &name)
     return;
 
   d->configName = name;
-  if (name.tqfind("ksim") == -1)
+  if (name.find("ksim") == -1)
     d->configName.prepend("ksim_");
 }
 
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index b532ab9..58a6f61 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -63,7 +63,7 @@ class KSim::Theme::Private
       TQString text;
       TQStringList::ConstIterator it;
       for (it = file.begin(); it != file.end(); ++it) {
-        if ((*it).tqfind(entry) != -1) {
+        if ((*it).find(entry) != -1) {
           text = TQStringList::split("=", (*it))[1].stripWhiteSpace();
         }
       }
@@ -73,7 +73,7 @@ class KSim::Theme::Private
 
       TQStringList::ConstIterator it2;
       for (it2 = dFile.begin(); it2 != dFile.end(); ++it) {
-        if ((*it2).tqfind(entry) != -1) {
+        if ((*it2).find(entry) != -1) {
           text = TQStringList::split("=", (*it2))[1].stripWhiteSpace();
         }
       }
@@ -135,13 +135,13 @@ TQString KSim::Theme::name() const
   if (name.endsWith("/"))
     name.remove(name.length() - 1, 1);
 
-  return name.remove(0, name.tqfindRev("/") + 1);
+  return name.remove(0, name.findRev("/") + 1);
 }
 
 TQString KSim::Theme::author() const
 {
   TQString author(d->readOption("author", false));
-  return author.tqreplace(TQRegExp("\""), TQString());
+  return author.replace(TQRegExp("\""), TQString());
 }
 
 int KSim::Theme::fontItem() const
@@ -318,7 +318,7 @@ TQFont KSim::Theme::largeFont() const
     return TQApplication::font();
 
   TQFont themeFont;
-  themeFont.setRawName(font.tqreplace(TQRegExp("\""), TQString()));
+  themeFont.setRawName(font.replace(TQRegExp("\""), TQString()));
   return themeFont;
 }
 
@@ -330,7 +330,7 @@ TQFont KSim::Theme::normalFont() const
     return TQApplication::font();
 
   TQFont themeFont;
-  themeFont.setRawName(font.tqreplace(TQRegExp("\""), TQString()));
+  themeFont.setRawName(font.replace(TQRegExp("\""), TQString()));
   return themeFont;
 }
 
@@ -342,7 +342,7 @@ TQFont KSim::Theme::smallFont() const
     return TQApplication::font();
 
   TQFont themeFont;
-  themeFont.setRawName(font.tqreplace(TQRegExp("\""), TQString()));
+  themeFont.setRawName(font.replace(TQRegExp("\""), TQString()));
   return themeFont;
 }
 
@@ -644,7 +644,7 @@ bool KSim::Theme::textShadow(const TQString &itemType,
     return false;
 
   TQString shadow = readEntry(itemType, entry);
-  if (shadow.isEmpty() || shadow.tqfindRev("none") != -1)
+  if (shadow.isEmpty() || shadow.findRev("none") != -1)
     return false;
 
   return true;
@@ -997,26 +997,26 @@ TQString KSim::ThemeLoader::parseConfig(const TQString &url,
   while (!origStream.atEnd()) {
     TQString line(origStream.readLine().simplifyWhiteSpace());
 
-    if (line.tqfind(reg) == 0) // find the location of the * comments
+    if (line.find(reg) == 0) // find the location of the * comments
       // replace all * comments with # comments so KConfig doesn't complain
-      line.tqreplace(reg, "#");
+      line.replace(reg, "#");
 
-    if (line.tqfind("#") == -1) { // find the location of the string 'gkrellmms'
-      if (line.tqfindRev("=") == -1) { // if found we check for the string '='
-        int numLoc = line.tqfindRev(numbers);
+    if (line.find("#") == -1) { // find the location of the string 'gkrellmms'
+      if (line.findRev("=") == -1) { // if found we check for the string '='
+        int numLoc = line.findRev(numbers);
         if (numLoc != -1)
           // if '=' doesn't exist we add one so KConfig doesn't complain
           line.insert(numLoc, " = ");
 
-        numLoc = line.tqfindRev(number);
+        numLoc = line.findRev(number);
         if (numLoc != -1)
           // if '=' doesn't exist we add one so KConfig doesn't complain
           line.insert(numLoc, " = ");
 
-        numLoc = line.tqfindRev(minus);
+        numLoc = line.findRev(minus);
         if (numLoc != -1)
           // replace the '-' with an '=' so KConfig doesn't get confused
-          line.tqreplace(TQRegExp("-"), "=");
+          line.replace(TQRegExp("-"), "=");
       }
     }
 
@@ -1038,7 +1038,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
     homePath = locateLocal( "data", "ksim" )
        + TQString::tqfromLatin1( "/themes" )
        + homePath.right( homePath.length()
-       - homePath.tqfindRev( TQRegExp( "\\/" ),
+       - homePath.findRev( TQRegExp( "\\/" ),
        homePath.length() ) );
 
     if ( !TQFile::exists( homePath ) )