TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 28 insertions, 28 deletions

diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index ce621c07..52f52908 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -63,7 +63,7 @@
 #include "resource.h"
 
 ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool showOnlyProfiles, bool quickUpload, bool markOnly, const char* name)
-  :ProjectUploadS( 0L, name, false, Qt::WDestructiveClose)
+  :ProjectUploadS( 0L, name, false, TQt::WDestructiveClose)
 {
     m_quickUpload = quickUpload;
     m_profilesOnly = showOnlyProfiles;
@@ -73,7 +73,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool
     startUrl = url;
     if (m_profilesOnly)
     {
-      clearWFlags(Qt::WDestructiveClose);
+      clearWFlags(TQt::WDestructiveClose);
       uploadFrame->hide();
       buttonCancel->hide();
       adjustSize();
@@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree()
  KURL u = m_project->projectBaseURL();
  if (!startUrl.isEmpty())
  {
-   u = QExtFileInfo::toAbsolute(startUrl, u);
+   u = TQExtFileInfo::toAbsolute(startUrl, u);
  }
  TQDict<KFileItem> projectDirFiles;
 
  if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder
  {
-   projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this);
+   projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this);
  } else
  {
    projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true));
@@ -197,9 +197,9 @@ void ProjectUpload::slotBuildTree()
    {
      QuantaCommon::setUrl(u, s);
      absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1));
-/*     if (!QExtFileInfo::exists(absUrl))
+/*     if (!TQExtFileInfo::exists(absUrl))
        continue; */
-     KFileItem *p_item = projectDirFiles.find(absUrl.url());
+     KFileItem *p_item = projectDirFiles.tqfind(absUrl.url());
      if (!p_item)
        continue;
      KFileItem item(*p_item);
@@ -207,19 +207,19 @@ void ProjectUpload::slotBuildTree()
      if ( it != 0 )
      {
        int uploadedTime = -1;
-       if (m_uploadTimeList.contains(s))
+       if (m_uploadTimeList.tqcontains(s))
          uploadedTime = m_uploadTimeList[s];
        int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
        el.setAttribute("modified_time", modifiedTime);
-       int uploadStatus = el.attribute("uploadstatus", "1").toInt();
-       if (m_quickUpload || (forceUpload && uploadStatus == 0))
-        uploadStatus = 1;
-       if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0))
+       int uploadtqStatus = el.attribute("uploadstatus", "1").toInt();
+       if (m_quickUpload || (forceUpload && uploadtqStatus == 0))
+        uploadtqStatus = 1;
+       if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0))
        {
          modified.append( u );
          it->setSelected(true);
        }
-       if (uploadStatus == 2)
+       if (uploadtqStatus == 2)
          it->setConfirmUpload(true);
        totalProgress->setValue(i);
      }
@@ -235,7 +235,7 @@ void ProjectUpload::slotBuildTree()
  totalText->setText(i18n("Total:"));
  totalProgress->setTotalSteps(1);
  totalProgress->setValue(0);
- //hack to force repainting of the treeview
+ //hack to force tqrepainting of the treeview
  resize(width() + 1, height());
  resize(width() - 1, height());
  if (m_quickUpload)
@@ -338,7 +338,7 @@ void ProjectUpload::startUpload()
     for ( uint i = 0; i < nl.count(); i++ )
     {
       el = nl.item(i).toElement();
-      if ( selectedList.contains(el.attribute("url")))
+      if ( selectedList.tqcontains(el.attribute("url")))
       {
         m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt();
       }
@@ -362,7 +362,7 @@ void ProjectUpload::startUpload()
         if (!ok)  return;
         for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it)
         {
-            if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
+            if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
               toUpload.remove(*it);
         }
 
@@ -375,14 +375,14 @@ void ProjectUpload::startUpload()
     buttonUpload->setEnabled(false);
     KURL u = *baseUrl;
     u.setPath(u.protocol() == "file" ? "/" : "");
-    if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this)))
+    if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this)))
     {
       upload();
       return;
     } else
     {
       if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>")
-          .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString::null,KStdGuiItem::cont()) == KMessageBox::Continue)
+          .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue)
       {
         upload();
         return;
@@ -425,7 +425,7 @@ void ProjectUpload::upload()
   }
 
 
-  KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
+  KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
   to = *baseUrl;
   to.addPath( currentURL.path() );
   if (to.fileName(false).isEmpty())
@@ -437,10 +437,10 @@ void ProjectUpload::upload()
     dir = to.upURL() ;
   }
 
-  if ( !madeDirs.contains(dir) )
+  if ( !madeDirs.tqcontains(dir) )
   {
     madeDirs.append( dir );
-    if (!QExtFileInfo::createDir(dir, this))
+    if (!TQExtFileInfo::createDir(dir, this))
     {
       QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
       buttonUpload->setEnabled(true);
@@ -463,7 +463,7 @@ void ProjectUpload::upload()
     connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ),
                 this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) );
 
-    labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
+    labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName()));
     currentProgress->setProgress( 0 );
     return;
   } else  //it is a dir, so just go to the next item
@@ -517,7 +517,7 @@ void ProjectUpload::selectModified()
   {
     TQListViewItem *it = list->findItem( (*file).path() );
     it->setSelected(true);
-    it->repaint();
+    it->tqrepaint();
   }
   list->checkboxTree();
 }
@@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext()
      UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it);
      if (itf)
       itf->setWhichPixmap( "check_clear" );
-     it->repaint();
+     it->tqrepaint();
     }
     toUpload.remove( it );
 
@@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile()
    } else
    {
       TQString profileName = comboProfile->currentText();
-      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(profileName),
+      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").tqarg(profileName),
                                    i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue)
        {
           m_profilesNode.removeChild(m_currentProfileElement);
@@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile()
           slotNewProfileSelected(currentProfile);
           if (profileName == defaultProfile())
           {
-              KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").arg(currentProfile), i18n("Profile Removal"));
+              KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").tqarg(currentProfile), i18n("Profile Removal"));
               m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile);
           }
           comboProfile->removeItem(idx);
@@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo()
 
 void ProjectUpload::saveRemoteUploadInfo()
 {
-    TQDomNode parent = m_currentProfileElement.parentNode();
+    TQDomNode tqparent = m_currentProfileElement.tqparentNode();
     TQDomNode profileNode = m_currentProfileElement.cloneNode(false);
-    parent.removeChild(m_currentProfileElement);
-    parent.appendChild(profileNode);
+    tqparent.removeChild(m_currentProfileElement);
+    tqparent.appendChild(profileNode);
     TQMap<TQString, int>::ConstIterator it;
     for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it)
     {