Fix kdewebdev FTBFS under Qt3

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

11 files changed, 84 insertions, 84 deletions

diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 226c4bff..d50eb1e0 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -48,7 +48,7 @@ void EventConfigurationDlg::initEvents(EventActions *events)
     for (TQValueList<EventAction>::ConstIterator it2 = evList.constBegin(); it2 != evList.constEnd(); ++it2)
     {
       EventAction ev = *it2;
-      item = new TQListViewItem(eventsListView, TQPEvents::ref()->fullEventName(it.key()), TQPEvents::ref()->fullActionName(ev.action));
+      item = new TQListViewItem(eventsListView, QPEvents::ref()->fullEventName(it.key()), QPEvents::ref()->fullActionName(ev.action));
       int argcount = ev.arguments.count();
       if (argcount > 0)
           item->setText(2, ev.arguments[0]);
@@ -78,8 +78,8 @@ void EventConfigurationDlg::saveEvents(TQDomDocument dom)
        node = dom.createElement("event");
        eventsNode.appendChild(node);
        TQDomElement el = node.toElement();
-       el.setAttribute("name", TQPEvents::ref()->eventName(item->text(0)));
-       el.setAttribute("action", TQPEvents::ref()->actionName(item->text(1)));
+       el.setAttribute("name", QPEvents::ref()->eventName(item->text(0)));
+       el.setAttribute("action", QPEvents::ref()->actionName(item->text(1)));
        if (el.attribute("action") == "script" || el.attribute("action") == "action")
          el.setAttribute("type", "external");
        else
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index db5c8b93..4c3edd34 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -39,8 +39,8 @@ EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tq
 : EventEditorDlgS(tqparent,name,fl)
 {
   m_actionCollection = actionCollection;
-  eventCombo->insertStringList(TQPEvents::ref()->eventNames());
-  actionCombo->insertStringList(TQPEvents::ref()->actionNames());
+  eventCombo->insertStringList(QPEvents::ref()->eventNames());
+  actionCombo->insertStringList(QPEvents::ref()->actionNames());
   slotActionChanged(actionCombo->currentText());
 }
 
@@ -79,7 +79,7 @@ TQString EventEditorDlg::argument1()
    {
       TQString s = argument1Combo->currentText();
       TQString actionType = actionCombo->currentText();
-      if (actionType == TQPEvents::ref()->fullActionName("email"))
+      if (actionType == QPEvents::ref()->fullActionName("email"))
       {
           if (s ==  i18n(teamLeaderStr.utf8()))
               s = "teamleader";
@@ -96,7 +96,7 @@ TQString EventEditorDlg::argument1()
           }
           return s;
        } else
-       if (actionType == TQPEvents::ref()->fullActionName("script"))
+       if (actionType == QPEvents::ref()->fullActionName("script"))
        {
           TQString s = argument1Combo->currentText();
           for (TQMap<TQString, TQString>::ConstIterator it = m_scriptActions.constBegin(); it != m_scriptActions.constEnd(); ++it)
@@ -109,7 +109,7 @@ TQString EventEditorDlg::argument1()
           }
           return s;
        } else
-       if (actionType == TQPEvents::ref()->fullActionName("action"))
+       if (actionType == QPEvents::ref()->fullActionName("action"))
        {
           TQString s = argument1Combo->currentText();
           for (TQMap<TQString, TQString>::ConstIterator it = m_otherActions.constBegin(); it != m_otherActions.constEnd(); ++it)
@@ -134,7 +134,7 @@ TQString EventEditorDlg::argument2()
    if (argument2Combo->isEnabled())
    {
      TQString actionType = actionCombo->currentText();
-     if (actionType == TQPEvents::ref()->fullActionName("log"))
+     if (actionType == QPEvents::ref()->fullActionName("log"))
      {
         int id = argument2Combo->currentItem();
         if (id == 0)
@@ -142,7 +142,7 @@ TQString EventEditorDlg::argument2()
        else
             return "minimal";
      } else
-     if (actionType == TQPEvents::ref()->fullActionName("script"))
+     if (actionType == QPEvents::ref()->fullActionName("script"))
      {
         int id = argument2Combo->currentItem();
         if (id == 0)
@@ -160,7 +160,7 @@ TQString EventEditorDlg::argument3()
    if (argument3Combo->isEnabled())
    {
      TQString actionType = actionCombo->currentText();
-     if (actionType == TQPEvents::ref()->fullActionName("log"))
+     if (actionType == QPEvents::ref()->fullActionName("log"))
      {
         int id = argument3Combo->currentItem();
         if (id == 0)
@@ -185,7 +185,7 @@ TQString EventEditorDlg::argument4()
 void EventEditorDlg::setArguments(const TQStringList& arguments)
 {
    TQString actionType = actionCombo->currentText();
-   if (actionType == TQPEvents::ref()->fullActionName("email"))
+   if (actionType == QPEvents::ref()->fullActionName("email"))
    {
       TQString s = arguments[0];
       if (s == "teamleader")
@@ -218,7 +218,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
          argument1Combo->setCurrentItem(0);
       }
    } else
-   if (actionType == TQPEvents::ref()->fullActionName("script"))
+   if (actionType == QPEvents::ref()->fullActionName("script"))
    {
       TQString s = arguments[0];
       if (m_scriptActions.tqcontains(s))
@@ -246,7 +246,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
         argument2Combo->setCurrentItem(1);
       return; //setup for script arguments completed
    } else
-   if (actionType == TQPEvents::ref()->fullActionName("action"))
+   if (actionType == QPEvents::ref()->fullActionName("action"))
    {
       TQString s = arguments[0];
       if (m_otherActions.tqcontains(s))
@@ -268,7 +268,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
          argument1Combo->setCurrentItem(0);
       }
    } else
-   if (actionType == TQPEvents::ref()->fullActionName("log"))
+   if (actionType == QPEvents::ref()->fullActionName("log"))
    {
       argument1Combo->insertItem(arguments[0], 0);
       argument1Combo->setCurrentItem(0);
@@ -312,7 +312,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
    resetArgumentWidgets(argument2Label, argument2Combo);
    resetArgumentWidgets(argument3Label, argument3Combo);
    resetArgumentWidgets(argument4Label, argument4Combo);
-   if (name == TQPEvents::ref()->fullActionName("email"))
+   if (name == QPEvents::ref()->fullActionName("email"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Receiver:"));
@@ -331,7 +331,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
           argument1Combo->insertItem(i18n(taskLeaderStr.utf8()) + " - " + tasks[i]);
        }
    } else
-   if (name == TQPEvents::ref()->fullActionName("log"))
+   if (name == QPEvents::ref()->fullActionName("log"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Log file:"));
@@ -350,7 +350,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
        argument3Combo->insertItem(i18n("Create New Log"), 0);
        argument3Combo->insertItem(i18n("Append to Existing Log"), 1);
    } else
-   if (name == TQPEvents::ref()->fullActionName("script"))
+   if (name == QPEvents::ref()->fullActionName("script"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Action name:"));
@@ -378,7 +378,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
        argument2Combo->insertItem(i18n("Yes"), 0);
        argument2Combo->insertItem(i18n("No"), 1);
    } else
-   if (name == TQPEvents::ref()->fullActionName("action"))
+   if (name == QPEvents::ref()->fullActionName("action"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Action name:"));
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index d5988c69..aa80e4f3 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -146,7 +146,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
     if ( !d->m_projectFiles.tqcontains(url) )
     {
       el = d->dom.createElement("item");
-      el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(url, d->baseURL) ));
+      el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
       d->dom.firstChild().firstChild().appendChild( el );
       KURL u = url.upURL();
       ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u);
@@ -258,7 +258,7 @@ void Project::slotOpenProject(const KURL &url)
   kdDebug(24000) << "Open recent project: " << url <<endl;
   if ( !url.isEmpty() )
   {
-    if ( !TQExtFileInfo::exists(url, true, d->m_mainWindow) )
+    if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) )
     {
       emit hideSplash();
       if (KMessageBox::questionYesNo(d->m_mainWindow,
@@ -424,7 +424,7 @@ void Project::slotRemove(const KURL& urlToRemove)
   emit reloadTree( &(d->m_projectFiles), false, TQStringList() );
   emit newtqStatus();
 
-  TQString urlPath = TQExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
+  TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
   TQString nice = urlPath;
   nice = KStringHandler::lsqueeze(nice, 60);
   if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue )
@@ -468,9 +468,9 @@ void Project::slotOptions()
   topLayout->addWidget(&optionsPage);
 
   optionsPage.linePrjName->setText( d->projectName );
-  url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
+  url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
   optionsPage.linePrjTmpl->setText(QuantaCommon::qUrl(url));
-  url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+  url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
   optionsPage.linePrjToolbar->setText( QuantaCommon::qUrl(url) );
 
   optionsPage.lineAuthor->setText( d->author );
@@ -627,16 +627,16 @@ void Project::slotOptions()
 
     QuantaCommon::setUrl(d->templateURL, optionsPage.linePrjTmpl->text());
     d->templateURL.adjustPath(1);
-    d->templateURL = TQExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
-    if (!TQExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
+    d->templateURL = QExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
+    if (!QExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
     {
       QuantaCommon::dirCreationError(d->m_mainWindow, d->templateURL);
     }
 
     QuantaCommon::setUrl(d->toolbarURL, optionsPage.linePrjToolbar->text());
     d->toolbarURL.adjustPath(1);
-    d->toolbarURL = TQExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
-    if (!TQExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
+    d->toolbarURL = QExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
+    if (!QExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
     {
       QuantaCommon::dirCreationError(d->m_mainWindow, d->toolbarURL);
     }
@@ -706,7 +706,7 @@ void Project::slotOptions()
     }
 
     el = projectNode.namedItem("templates").toElement();
-    url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
+    url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
     if(el.isNull())
     {
       el =d->dom.createElement("templates");
@@ -718,7 +718,7 @@ void Project::slotOptions()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
 
-    url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+    url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
     el = projectNode.namedItem("toolbars").toElement();
     if(el.isNull())
     {
@@ -874,7 +874,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName
   if (!ViewManager::ref()->saveAll())
     return;
 
-  KURL url = TQExtFileInfo::toRelative( urlToUpload, d->baseURL);
+  KURL url = QExtFileInfo::toRelative( urlToUpload, d->baseURL);
   if (!d->m_uploadDialog)
   {
     d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii());
@@ -909,7 +909,7 @@ KURL Project::urlWithPrefix(const KURL& url)
 
   if (d->usePreviewPrefix)
   {
-    KURL tempUrl = TQExtFileInfo::toRelative(url, d->baseURL );
+    KURL tempUrl = QExtFileInfo::toRelative(url, d->baseURL );
     if ( !tempUrl.path().startsWith("/") )
     {
       returnUrl = d->previewPrefix;
@@ -985,10 +985,10 @@ KURL Project::projectBaseURL()
     Document *w = ViewManager::ref()->activeDocument();
     if  ( !w || w->isUntitled() )
     {
-      result = TQExtFileInfo::home();
+      result = QExtFileInfo::home();
     } else
     {
-       result = TQExtFileInfo::path(w->url());
+       result = QExtFileInfo::path(w->url());
     }
   }
   return result;
@@ -1317,7 +1317,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
     return;
   TQDomNodeList nl = d->dom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1349,7 +1349,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
   }
   TQDomNodeList nl = d->dom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1367,7 +1367,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
     return;
   TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1400,7 +1400,7 @@ void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
     return;
   TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
   uint line, col;
   viewCursorIf->cursorPosition(&line, &col);
   bool found = false;
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index db162ce2..82b4d86e 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -69,7 +69,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
       }
     }
     path = url.path();
-    url = TQExtFileInfo::toAbsolute(url, baseURL);
+    url = QExtFileInfo::toAbsolute(url, baseURL);
     if ( el.nodeName() == "item" )
     {
       if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h
index baec78ec..361c119c 100644
--- a/quanta/project/projectlist.h
+++ b/quanta/project/projectlist.h
@@ -56,7 +56,7 @@ public:
   */
   KURL toRelative(const KURL &url) const
   {
-    return TQExtFileInfo::toRelative(url, m_baseURL, false);
+    return QExtFileInfo::toRelative(url, m_baseURL, false);
   }
 
   /**
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 76a98a79..81c53728 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -137,7 +137,7 @@ void ProjectNewGeneral::slotLinePrjFile( const TQString & )
     baseUrl = url;
     if (baseUrl.isLocalFile())
     {
-      s = TQExtFileInfo::canonicalPath(baseUrl.path());
+      s = QExtFileInfo::canonicalPath(baseUrl.path());
       if (!s.isEmpty())
         baseUrl.setPath(s);
     }
@@ -222,7 +222,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
     {
       KURL url = baseUrl;
       QuantaCommon::setUrl(url, linePrjTmpl->text());
-      url = TQExtFileInfo::toAbsolute(url, baseUrl);
+      url = QExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
         KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
@@ -235,7 +235,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
     {
       KURL url = baseUrl;
       QuantaCommon::setUrl(url, linePrjToolbar->text());
-      url = TQExtFileInfo::toAbsolute(url, baseUrl);
+      url = QExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
         KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 1de12e9e..5a47a3db 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -112,7 +112,7 @@ KURL::List ProjectNewLocal::projectFiles()
 {
   KURL::List list;
 
-  if (!TQExtFileInfo::exists(baseURL, false, this) ||
+  if (!QExtFileInfo::exists(baseURL, false, this) ||
       !baseURL.path().endsWith("/")  ||
       !checkInsert->isChecked() ) return list;
 
@@ -142,7 +142,7 @@ KURL::List ProjectNewLocal::projectFiles()
     ftqmask = tqmask->text();
   }
 
-  list = TQExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
+  list = QExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
 
   return list;
 }
@@ -180,7 +180,7 @@ void ProjectNewLocal::resizeEvent ( TQResizeEvent *t )
 /** No descriptions */
 void ProjectNewLocal::slotAddFiles()
 {
-  TQExtFileInfo::createDir(baseURL, this);
+  QExtFileInfo::createDir(baseURL, this);
   KURL::List list = KFileDialog::getOpenURLs(
     baseURL.url(),  i18n("*"), this, i18n("Insert Files in Project"));
 
@@ -188,7 +188,7 @@ void ProjectNewLocal::slotAddFiles()
   {
     KURL u = list.first();
 
-    u = TQExtFileInfo::toRelative( u, baseURL, false );
+    u = QExtFileInfo::toRelative( u, baseURL, false );
 
     if ( u.path().startsWith("..") || u.path().startsWith("/"))
     {
@@ -218,7 +218,7 @@ void ProjectNewLocal::slotAddFiles()
     progressBar->setTextEnabled(true);
     for (uint i = 0; i < list.count(); i++)
     {
-       list[i] = TQExtFileInfo::toRelative(list[i], baseURL, false);
+       list[i] = QExtFileInfo::toRelative(list[i], baseURL, false);
        if (!fileList.tqcontains(list[i]))
        {
          fileList.append(list[i]);
@@ -238,7 +238,7 @@ void ProjectNewLocal::slotAddFolder()
 {
 //TODO/FIXME: This returns null if the selected directory is not on the local disk.
 //I think this is a KDE bug
-  TQExtFileInfo::createDir(baseURL, this);
+  QExtFileInfo::createDir(baseURL, this);
   KURL dirURL ;
   dirURL = KFileDialog::getExistingURL(
            baseURL.url(),  this, i18n("Insert Folder in Project"));
@@ -248,7 +248,7 @@ void ProjectNewLocal::slotAddFolder()
     dirURL.adjustPath(1);
 
     KURL sdir = dirURL;
-    sdir = TQExtFileInfo::toRelative( sdir, baseURL, false);
+    sdir = QExtFileInfo::toRelative( sdir, baseURL, false);
 
     if ( sdir.path().startsWith("..") || sdir.path().startsWith("/") )
     {
@@ -293,7 +293,7 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList)
   {
     dirURL = *it;
    // dirURL.adjustPath(1);
-    KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this, false);
+    KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this, false);
     progressBar->setTotalSteps(files.count() - 1);
     progressBar->setTextEnabled(true);
     KURL u;
@@ -328,7 +328,7 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList)
   progressBar->setTextEnabled(true);
   for (it = a_urlList.begin(); it != a_urlList.end(); ++it)
   {
-    u = TQExtFileInfo::toRelative(*it, baseURL, false);
+    u = QExtFileInfo::toRelative(*it, baseURL, false);
     if ( !fileList.tqcontains(u))
     {
       fileList.append(u);
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 08391dbe..ef4ee2b7 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -99,7 +99,7 @@ void ProjectNewWeb::slotStart()
   {
     emit enableMessagesWidget();
 
-    if (TQExtFileInfo::createDir(baseURL, this))
+    if (QExtFileInfo::createDir(baseURL, this))
     {
       if (baseURL.protocol() == "file")
       {
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 871ae7bc..e5a9e8e5 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -254,11 +254,11 @@ void ProjectPrivate::openCurrentView()
         TQDomElement el2 = itemNodes.item(j).cloneNode().toElement();
         KURL url = baseURL;
         QuantaCommon::setUrl(url,el2.attribute("url"));
-        url = TQExtFileInfo::toAbsolute(url, baseURL);
+        url = QExtFileInfo::toAbsolute(url, baseURL);
         if (el2.nodeName() == "viewitem")
         {
           urlsInView.append(url);
-          if (!ViewManager::ref()->isOpened(url) && TQExtFileInfo::exists(url, true, m_mainWindow))
+          if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow))
             urlsToOpen.append(url);
         } else {
           if (el2.nodeName() == "viewtoolbar")
@@ -325,7 +325,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
         if (!m_projectFiles.tqcontains(url))
         {
           el = dom.createElement("item");
-          el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
+          el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
           dom.firstChild().firstChild().appendChild(el);
           m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
           emit eventHappened("after_project_add", url.url(), TQString());
@@ -337,7 +337,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
       url = *it;
       if (!excludeRx.exactMatch(url.path()))
       {
-        el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
+        el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
         dom.firstChild().firstChild().appendChild(el);
         m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
         emit eventHappened("after_project_add", url.url(), TQString());
@@ -362,7 +362,7 @@ void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask )
   KURL::List list;
 
   list.append(pathURL);
-  list += TQExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
+  list += QExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
   insertFiles(list);
 }
 
@@ -464,7 +464,7 @@ void ProjectPrivate::loadProjectXML()
   if (tmpString != QuantaCommon::qUrl(templateURL) )
   {
     el = no.toElement();
-    url = TQExtFileInfo::toRelative(templateURL, baseURL);
+    url = QExtFileInfo::toRelative(templateURL, baseURL);
     if(el.isNull())
     {
       el = dom.createElement("templates");
@@ -476,7 +476,7 @@ void ProjectPrivate::loadProjectXML()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
   }
-  templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
+  templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
 
   no = projectNode.namedItem("toolbars");
   toolbarURL = baseURL;
@@ -492,7 +492,7 @@ void ProjectPrivate::loadProjectXML()
   if (tmpString != QuantaCommon::qUrl(toolbarURL))
   {
     el = no.toElement();
-    url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
+    url = QExtFileInfo::toRelative(toolbarURL, baseURL);
     if(el.isNull())
     {
       el = dom.createElement("toolbars");
@@ -504,7 +504,7 @@ void ProjectPrivate::loadProjectXML()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
   }
-  toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
+  toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
 
   no = projectNode.namedItem("exclude");
   m_excludeCvsignore = (no.toElement().attribute("cvsignore", "false") == "true");
@@ -739,7 +739,7 @@ void ProjectPrivate::slotAcceptCreateProject()
   if (baseURL.protocol() == i18n("Local")) baseURL.setProtocol("file");
   baseURL.adjustPath(1);
   if (!baseURL.path().startsWith("/")) baseURL.setPath("/"+ baseURL.path());
-  if (!TQExtFileInfo::createDir(baseURL, m_mainWindow))
+  if (!QExtFileInfo::createDir(baseURL, m_mainWindow))
   {
     QuantaCommon::dirCreationError(m_mainWindow, baseURL);
     baseURL = oldBaseURL;
@@ -789,7 +789,7 @@ void ProjectPrivate::slotAcceptCreateProject()
 
       for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it )
       {
-        url = *it;//TQExtFileInfo::toRelative(*it, baseURL );
+        url = *it;//QExtFileInfo::toRelative(*it, baseURL );
         el = dom.createElement("item");
         el.setAttribute("url",QuantaCommon::qUrl(url));
         dom.firstChild().firstChild().appendChild( el );
@@ -823,28 +823,28 @@ void ProjectPrivate::slotAcceptCreateProject()
     {
       QuantaCommon::setUrl(templateURL, png->linePrjTmpl->text());
       templateURL.adjustPath(1);
-      templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
-      if (!TQExtFileInfo::createDir(templateURL, m_mainWindow))
+      templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
+      if (!QExtFileInfo::createDir(templateURL, m_mainWindow))
       {
         QuantaCommon::dirCreationError(m_mainWindow, templateURL);
       }
     }
     //the nodes are already created in loadProjectXML() called from createEmptyDom()
     el = dom.firstChild().firstChild().namedItem("templates").toElement();
-    url = TQExtFileInfo::toRelative(templateURL, baseURL);
+    url = QExtFileInfo::toRelative(templateURL, baseURL);
     el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
 
     //setup the toolbars directory
     toolbarURL = baseURL;
     QuantaCommon::setUrl(toolbarURL,png->linePrjToolbar->text());
     toolbarURL.adjustPath(1);
-    toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
-    if (!TQExtFileInfo::createDir(toolbarURL, m_mainWindow))
+    toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
+    if (!QExtFileInfo::createDir(toolbarURL, m_mainWindow))
     {
       QuantaCommon::dirCreationError(m_mainWindow, toolbarURL);
     }
     el = dom.firstChild().firstChild().namedItem("toolbars").toElement();
-    url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
+    url = QExtFileInfo::toRelative(toolbarURL, baseURL);
     el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
 
 #if KDE_IS_VERSION(3,4,89)
@@ -939,7 +939,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
     if (m_projectFiles.tqcontains(url))
     {
       item = dom.createElement("viewitem");
-      item.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL)) );
+      item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) );
       el.appendChild(item);
     }
   }
@@ -950,7 +950,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
   {
     item = dom.createElement("viewtoolbar");
     KURL url = toolbarList[i];
-    url = TQExtFileInfo::toRelative(url, baseURL);
+    url = QExtFileInfo::toRelative(url, baseURL);
     item.setAttribute("url", QuantaCommon::qUrl(url) );
     el.appendChild(item);
   }
@@ -1008,7 +1008,7 @@ bool ProjectPrivate::createEmptyDom()
     tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8);
     *(tempFile->textStream()) << str;
     tempFile->close();
-    result = TQExtFileInfo::createDir(baseURL, m_mainWindow);
+    result = QExtFileInfo::createDir(baseURL, m_mainWindow);
     if (result)
       result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow);
     if (result)
@@ -1100,7 +1100,7 @@ void ProjectPrivate::getStatusFromTree()
   }
   TQStringList folderList;
   tqparent->getTreetqStatus( &folderList );
-  // toplevel folder is always open in a project and TQExtFileInfo::toRelative
+  // toplevel folder is always open in a project and QExtFileInfo::toRelative
   // creates strange output -> we remove the toplevel folder
   if (folderList.count() > 0)
      folderList.remove(folderList.begin());
@@ -1110,7 +1110,7 @@ void ProjectPrivate::getStatusFromTree()
     m_sessionDom.firstChild().firstChild().appendChild(root);
     for (TQStringList::Iterator it = folderList.begin(); it != folderList.end(); ++it) {
       el = m_sessionDom.createElement("openfolder");
-      el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(KURL(*it), baseURL) ) );
+      el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(KURL(*it), baseURL) ) );
       root.appendChild( el );
     }
   }
@@ -1432,7 +1432,7 @@ void ProjectPrivate::slotAddFiles()
   if ( !list.isEmpty() )
   {
     KURL firstURL = list.first();
-    firstURL = TQExtFileInfo::toRelative( firstURL, baseURL );
+    firstURL = QExtFileInfo::toRelative( firstURL, baseURL );
 
     if ( firstURL.path().startsWith("/") || firstURL.path().startsWith("."))
     {
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 52f52908..dd88ab5c 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree()
  KURL u = m_project->projectBaseURL();
  if (!startUrl.isEmpty())
  {
-   u = TQExtFileInfo::toAbsolute(startUrl, u);
+   u = QExtFileInfo::toAbsolute(startUrl, u);
  }
  TQDict<KFileItem> projectDirFiles;
 
  if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder
  {
-   projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this);
+   projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this);
  } else
  {
    projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true));
@@ -197,7 +197,7 @@ void ProjectUpload::slotBuildTree()
    {
      QuantaCommon::setUrl(u, s);
      absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1));
-/*     if (!TQExtFileInfo::exists(absUrl))
+/*     if (!QExtFileInfo::exists(absUrl))
        continue; */
      KFileItem *p_item = projectDirFiles.tqfind(absUrl.url());
      if (!p_item)
@@ -375,7 +375,7 @@ void ProjectUpload::startUpload()
     buttonUpload->setEnabled(false);
     KURL u = *baseUrl;
     u.setPath(u.protocol() == "file" ? "/" : "");
-    if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this)))
+    if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this)))
     {
       upload();
       return;
@@ -425,7 +425,7 @@ void ProjectUpload::upload()
   }
 
 
-  KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
+  KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
   to = *baseUrl;
   to.addPath( currentURL.path() );
   if (to.fileName(false).isEmpty())
@@ -440,7 +440,7 @@ void ProjectUpload::upload()
   if ( !madeDirs.tqcontains(dir) )
   {
     madeDirs.append( dir );
-    if (!TQExtFileInfo::createDir(dir, this))
+    if (!QExtFileInfo::createDir(dir, this))
     {
       QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
       buttonUpload->setEnabled(true);
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index b24b123f..1c97da09 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -115,7 +115,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
       else       
         u.setPath(linkDest);
       u.adjustPath(+1);
-      KURL u2 = TQExtFileInfo::toRelative(u, baseURL);
+      KURL u2 = QExtFileInfo::toRelative(u, baseURL);
       bool found = false;
       for (uint i = 0; i < urlList.count(); i++)
        if (urlList[i].url == u2)
@@ -214,7 +214,7 @@ KURL::List RescanPrj::files()
      }
 
      if (!u.isEmpty())
-       r.append( TQExtFileInfo::toAbsolute(u, baseURL) );
+       r.append( QExtFileInfo::toAbsolute(u, baseURL) );
    }
   }
   return r;