TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 16 insertions, 16 deletions

diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index a28da2c..77ca40d 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -49,9 +49,9 @@
 
 #define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
 
-ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename,
+ArchiveDialog::ArchiveDialog(TQWidget *tqparent, const TQString &filename,
         KHTMLPart *part) :
-        KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"),
+        KDialogBase(tqparent, "WebArchiveDialog", false, i18n("Web Archiver"),
           KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ),
         m_bPreserveWS(false), m_tmpFile(0), m_url(part->url())
 {
@@ -88,7 +88,7 @@ void ArchiveDialog::archive()
 
    } else {
      const TQString title = i18n( "Unable to Open Web-Archive" );
-     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
+     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName());
      KMessageBox::sorry( 0L, text, title );
    }
 }
@@ -144,7 +144,7 @@ void ArchiveDialog::setSavingState()
    TQString fileName="index.html";
    TQFile file(tmpFile.name());
    file.open(IO_ReadOnly);
-   m_tarBall->writeFile(fileName, TQString::null, TQString::null, file.size(), file.readAll());
+   m_tarBall->writeFile(fileName, TQString(), TQString(), file.size(), file.readAll());
 #ifdef DEBUG_WAR
    kdDebug(90110) << "HTML-file written: " << fileName << endl;
 #endif
@@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
    }
    catch (...)
    {
-     // No children, stop recursion here
+     // No tqchildren, stop recursion here
      child = DOM::Node();
    }
 
@@ -237,12 +237,12 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
         /* Don't save khtml internal tags '-konq..'
          * Approximating it with <DIV>
          */
-        text += "<DIV> <!-- -KONQ_BLOCK -->";
+        text += "<DIV> <!-- -KONTQ_BLOCK -->";
       } else if (nodeName == "BASE") {
         /* Skip BASE, everything is relative to index.html
          * Saving SCRIPT but they can cause trouble!
          */
-      } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-EQUIV", "CONTENT-TYPE")) {
+      } else if ((nodeName == "META") && hasAttribute(pNode, "HTTP-ETQUIV", "CONTENT-TYPE")) {
         /* Skip content-type meta tag, we provide our own.
          */
       } else {
@@ -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.replace(TQRegExp("\\s"), ""));
+              attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), ""));
            }
         /*
          * ## Make recursion level configurable
@@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
    }
    catch (...)
    {
-     // No children, stop recursion here
+     // No tqchildren, stop recursion here
      child = DOM::Node();
    }
 
@@ -370,7 +370,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
            text ="";
         }
         if (nodeName.at(0)=='-') {
-           text += "</DIV> <!-- -KONQ_BLOCK -->";
+           text += "</DIV> <!-- -KONTQ_BLOCK -->";
         } else {
 	   text += "</" + pNode.nodeName().string() + ">";
 	   if (nodeName == "PRE") {
@@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext()
    TQString tarFileName;
 
   // Only download file once
-   if (m_downloadedURLDict.contains(url.url())) {
+   if (m_downloadedURLDict.tqcontains(url.url())) {
       tarFileName = m_downloadedURLDict[url.url()];
 #ifdef DEBUG_WAR
       kdDebug(90110) << "File already downloaded: " << url.url()
@@ -477,7 +477,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
    // Add file to Tar-Ball
    TQFile file(m_tmpFile->name());
    file.open(IO_ReadOnly);
-   m_tarBall->writeFile(tarFileName, TQString::null, TQString::null, file.size(), file.readAll());
+   m_tarBall->writeFile(tarFileName, TQString(), TQString(), file.size(), file.readAll());
    file.close();
    m_tmpFile->unlink();
    delete m_tmpFile;
@@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName)
    kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl;
 #endif
 
-   while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName))
+   while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(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.find("url(", pos);
+      pos = str.tqfind("url(", pos);
       if (pos!=-1) {
          pos += 4; // url(
 
          if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature'
 	    pos++;
          startUrl = pos;
-         pos = str.find(")",startUrl);
+         pos = str.tqfind(")",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.replace(startUrl, endUrl-startUrl, url);
+         str = str.tqreplace(startUrl, endUrl-startUrl, url);
          pos++;
       }
    }