rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

2 files changed, 11 insertions, 11 deletions

diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 77ca40d..802b2fe 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
              ((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") ||
              ((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) {
            // Some people use carriage return in file names and browsers support that!
-              attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), ""));
+              attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), ""));
            }
         /*
          * ## Make recursion level configurable
@@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext()
    TQString tarFileName;
 
   // Only download file once
-   if (m_downloadedURLDict.tqcontains(url.url())) {
+   if (m_downloadedURLDict.contains(url.url())) {
       tarFileName = m_downloadedURLDict[url.url()];
 #ifdef DEBUG_WAR
       kdDebug(90110) << "File already downloaded: " << url.url()
@@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName)
    kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl;
 #endif
 
-   while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(uniqueFileName))
+   while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName))
       uniqueFileName = TQString::number(id++) + fileName;
 
    return uniqueFileName;
@@ -532,14 +532,14 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str
    int endUrl = 0;
    int length = string.length();
    while (pos < length && pos >= 0) {
-      pos = str.tqfind("url(", pos);
+      pos = str.find("url(", pos);
       if (pos!=-1) {
          pos += 4; // url(
 
          if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature'
 	    pos++;
          startUrl = pos;
-         pos = str.tqfind(")",startUrl);
+         pos = str.find(")",startUrl);
          endUrl = pos;
          if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature'
             endUrl--;
@@ -555,7 +555,7 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str
          kdDebug () << "url: " << url << endl;
 #endif
 
-         str = str.tqreplace(startUrl, endUrl-startUrl, url);
+         str = str.replace(startUrl, endUrl-startUrl, url);
          pos++;
       }
    }
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 280b0e2..0b6ed68 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -78,12 +78,12 @@ void PluginWebArchiver::slotSaveToArchive()
 
   // Replace space with underscore, proposed Frank Pieczynski <pieczy@knuut.de>
 
-  archiveName.tqreplace( "\\s:", " ");
+  archiveName.replace( "\\s:", " ");
   archiveName = archiveName.simplifyWhiteSpace();
-  archiveName.tqreplace( "?", "");
-  archiveName.tqreplace( ":", "");
-  archiveName.tqreplace( "/", "");
-  archiveName = archiveName.tqreplace( TQRegExp("\\s+"), "_");
+  archiveName.replace( "?", "");
+  archiveName.replace( ":", "");
+  archiveName.replace( "/", "");
+  archiveName = archiveName.replace( TQRegExp("\\s+"), "_");
 
   archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ;