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, 73 insertions, 73 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 70fce267..7c2ff3f1 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -2546,7 +2546,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri
               for (uint i = 0; i < values->count(); i++)
               {
                 u = (*values)[i];
-                u = TQExtFileInfo::toRelative(u, base);
+                u = QExtFileInfo::toRelative(u, base);
                 (*values)[i] = u.path();
               }
               values->remove(values->at(0));
@@ -2878,7 +2878,7 @@ void Document::open(const KURL &url, const TQString &encoding)
       slotOpeningFailed(TQString());
     if (!url.isLocalFile())
     {
-      TQExtFileInfo internalFileInfo;
+      QExtFileInfo internalFileInfo;
       internalFileInfo.enter_loop();
     }
 }
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index e1c5a742..5061abd4 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -274,7 +274,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
     readTagFile(dirName + "common.tag", dtd, 0L);
   //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
   emit enableIdleTimer(false);
-  KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
+  KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
   //quantaApp->slotEnableIdleTimer(idleTimertqStatus);
   emit enableIdleTimer(true);
   TQString tmpStr;
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 1f1f0401..0323d2c0 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -1,5 +1,5 @@
 /*
-    KTQApplication.cpp
+    KQApplication.cpp
 
     KNode, the KDE newsreader
     Copyright (c) 1999-2001 the KNode authors.
@@ -59,7 +59,7 @@ KSplash::~KSplash()
 }
 
 
-KTQApplication::KTQApplication()
+KQApplication::KQApplication()
  : KApplication()
 {
    args = KCmdLineArgs::parsedArgs();
@@ -101,16 +101,16 @@ KTQApplication::KTQApplication()
    }
 }
 
-void KTQApplication::slotInit()
+void KQApplication::slotInit()
 {
-  KTQApplicationPrivate::init();
+  KQApplicationPrivate::init();
 }
 
-KTQApplication::~KTQApplication()
+KQApplication::~KQApplication()
 {
 }
 
-void KTQApplication::slotSplashTimeout()
+void KQApplication::slotSplashTimeout()
 {
   delete splash;
   delete sp;
@@ -118,19 +118,19 @@ void KTQApplication::slotSplashTimeout()
   sp = 0L;
 }
 
-KTQUniqueApplication::KTQUniqueApplication()
+KQUniqueApplication::KQUniqueApplication()
  : KUniqueApplication()
 {
   KGlobal::dirs()->addPrefix(PREFIX);
   dcopClient()->registerAs("quanta", false);
 }
 
-KTQUniqueApplication::~KTQUniqueApplication()
+KQUniqueApplication::~KQUniqueApplication()
 {
 }
 
 
-int KTQUniqueApplication::newInstance()
+int KQUniqueApplication::newInstance()
 {
   args = KCmdLineArgs::parsedArgs();
   if (mainWidget())
@@ -174,12 +174,12 @@ int KTQUniqueApplication::newInstance()
   return 0;
 }
 
-void KTQUniqueApplication::slotInit()
+void KQUniqueApplication::slotInit()
 {
-  KTQApplicationPrivate::init();
+  KQApplicationPrivate::init();
 }
 
-void KTQUniqueApplication::slotSplashTimeout()
+void KQUniqueApplication::slotSplashTimeout()
 {
   delete splash;
   delete sp;
@@ -188,7 +188,7 @@ void KTQUniqueApplication::slotSplashTimeout()
 }
 
 
-void KTQApplicationPrivate::init()
+void KQApplicationPrivate::init()
 {
   if (quantaApp->quantaStarted)
   {
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index ea4b9b7d..728a3f63 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -35,11 +35,11 @@ class KSplash : public TQFrame
     ~KSplash();
 };
 
-class KTQApplicationPrivate
+class KQApplicationPrivate
 {
   public:
-    KTQApplicationPrivate():splash(0L), sp(0L) {};
-    ~KTQApplicationPrivate() {};
+    KQApplicationPrivate():splash(0L), sp(0L) {};
+    ~KQApplicationPrivate() {};
 
   protected:
     void init();
@@ -49,27 +49,27 @@ class KTQApplicationPrivate
     KSplashScreen *sp;
 };
 
-class KTQApplication : public KApplication, KTQApplicationPrivate
+class KQApplication : public KApplication, KQApplicationPrivate
 {
   Q_OBJECT
   TQ_OBJECT
 
   public:
-    KTQApplication();
-    ~KTQApplication();
+    KQApplication();
+    ~KQApplication();
   public slots:
     void slotInit();
     void slotSplashTimeout();
 };
 
-class KTQUniqueApplication : public KUniqueApplication, KTQApplicationPrivate
+class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate
 {
   Q_OBJECT
   TQ_OBJECT
 
   public:
-    KTQUniqueApplication();
-    ~KTQUniqueApplication();
+    KQUniqueApplication();
+    ~KQUniqueApplication();
 
     /** Create new instance of Quanta. Make the existing
         main window active if Quanta is already running */
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 7c2fe22a..fda7d0dc 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -208,9 +208,9 @@ int main(int argc, char *argv[])
           DCOPRef("quanta", QUANTA_PACKAGE).call("newInstance()");
           exit(0);
       }
-  app = new KTQUniqueApplication;
+  app = new KQUniqueApplication;
   } else {
-  app = new KTQApplication;
+  app = new KQApplication;
   }
 
   return app->exec();
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index ada60632..1ca3aa96 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -373,7 +373,7 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding)
   m_parserEnabled = false;
   for (KURL::List::ConstIterator i = urls.begin(); i != urls.end(); ++i)
   {
-    if (!TQExtFileInfo::exists(*i, true, this))
+    if (!QExtFileInfo::exists(*i, true, this))
     {
       KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol)));
 
@@ -409,7 +409,7 @@ void QuantaApp::slotFileOpen(const KURL &url, const TQString& encoding, bool rea
 
 void QuantaApp::slotFileOpenRecent(const KURL &url)
 {
-  if (!TQExtFileInfo::exists(url, true, this))
+  if (!QExtFileInfo::exists(url, true, this))
   {
     if (KMessageBox::questionYesNo(this,
         i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep"))
@@ -602,7 +602,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
     stream << content;
     tempFile->file()->flush();
     tempFile->close();
-    if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false,  this))
+    if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false,  this))
       KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
     delete tempFile;
   } else
@@ -809,7 +809,7 @@ void QuantaApp::slotRepaintPreview()
       tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii()));
       *(tmpFile->textStream()) << w->editIf->text();
       tmpFile->close();
-      if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
+      if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
         m_htmlPart->setPreviewedURL(KURL());    //  copy failed, force the preview of the original
       };
       delete tmpFile;
@@ -864,7 +864,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
       baseURL = w->url();
       baseURL.setFileName("");
     }
-    KURL relURL = TQExtFileInfo::toRelative(url, baseURL);
+    KURL relURL = QExtFileInfo::toRelative(url, baseURL);
     TQString urlStr = relURL.url();
     if (relURL.protocol() == baseURL.protocol())
         urlStr = relURL.path();
@@ -1964,10 +1964,10 @@ void QuantaApp::slotContextMenuAboutToShow()
     {
       if (!name.isEmpty())
       {
-        KURL baseUrl = TQExtFileInfo::path(w->url());
+        KURL baseUrl = QExtFileInfo::path(w->url());
         urlUnderCursor = baseUrl;
         QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace());
-        urlUnderCursor = TQExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
+        urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
         action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
         action->setEnabled(true);
       } else
@@ -2074,7 +2074,7 @@ void QuantaApp::slotContextMenuAboutToShow()
 
 void QuantaApp::slotOpenFileUnderCursor()
 {
-  if (TQExtFileInfo::exists(urlUnderCursor, true, this))
+  if (QExtFileInfo::exists(urlUnderCursor, true, this))
   {
     if (QuantaCommon::checkMimeGroup(urlUnderCursor, "text" ))
     {
@@ -2458,7 +2458,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
   if (!tar.writeFile(TQFileInfo(tarFile.path()).baseName()+".actions", "user", "group", buffer2.buffer().size(), buffer2.buffer().data()))
       return KURL();
   tar.close();
-  if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
+  if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
   {
     KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>"
         "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
@@ -2767,7 +2767,7 @@ void QuantaApp::slotSendToolbar()
 void QuantaApp::slotDownloadToolbar()
 {
   if (!m_newToolbarStuff)
-    m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
+    m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
   m_newToolbarStuff->downloadResource();
 }
 
@@ -2777,7 +2777,7 @@ void QuantaApp::slotUploadToolbar()
   if (tempFileName.isNull())
     return;
   if (!m_newToolbarStuff)
-    m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
+    m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
 //  tempDirList.append(m_newToolbarStuff->uploadResource(tempFileName));
   m_newToolbarStuff->uploadResource(tempFileName);
 }
@@ -3200,7 +3200,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
       //first load the local version if it exists
       fileName = locateLocal("data", resourceDir + "toolbars/"+newDtd->toolbars[i]);
       QuantaCommon::setUrl(url, fileName);
-      if (TQExtFileInfo::exists(url, true, this))
+      if (QExtFileInfo::exists(url, true, this))
       {
         //showToolbarFile(url);
         newToolbars += url;
@@ -3208,7 +3208,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
       {
         fileName = qConfig.globalDataDir + resourceDir + "toolbars/"+newDtd->toolbars[i];
         QuantaCommon::setUrl(url, fileName);
-        if (TQExtFileInfo::exists(url, true, this))
+        if (QExtFileInfo::exists(url, true, this))
         {
           newToolbars += url;//  showToolbarFile(url);
         }
@@ -3461,7 +3461,7 @@ void QuantaApp::slotBuildPrjToolbarsMenu()
   if (Project::ref()->hasProject())
   {
     buildInProgress = true;
-    toolbarList = TQExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
+    toolbarList = QExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
     buildInProgress = false;
     projectToolbarFiles->setMaxItems(toolbarList.count());
     for (uint i = 0; i < toolbarList.count(); i++)
@@ -3580,7 +3580,7 @@ TQString QuantaApp::createDTEPTarball()
     dirURL.setPath(DTDs::ref()->tqfind(dtdName)->fileName);
     dirURL.setPath(dirURL.directory(false));
 
-    KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this);
+    KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this);
     for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
     {
       TQString name = (*it_f).fileName();
@@ -3643,7 +3643,7 @@ void QuantaApp::slotEmailDTEP()
 void QuantaApp::slotDownloadDTEP()
 {
   if (!m_newDTEPStuff)
-    m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
+    m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
   m_newDTEPStuff->downloadResource();
 }
 
@@ -3653,7 +3653,7 @@ void QuantaApp::slotUploadDTEP()
   if (tempFileName.isNull())
     return;
   if (!m_newDTEPStuff)
-    m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
+    m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
 //  tempDirList.append(m_newDTEPStuff->uploadResource(tempFileName));
   m_newDTEPStuff->uploadResource(tempFileName);
 }
@@ -3677,14 +3677,14 @@ void QuantaApp::slotSmartTagInsertion()
 void QuantaApp::slotDownloadTemplate()
 {
   if (!m_newTemplateStuff)
-    m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
+    m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
   m_newTemplateStuff->downloadResource();
 }
 
 void QuantaApp::slotUploadTemplate(const TQString &fileName)
 {
   if (!m_newTemplateStuff)
-    m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
+    m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
 //  tempDirList.append(m_newTemplateStuff->uploadResource(fileName));
   m_newTemplateStuff->uploadResource(fileName);
 }
@@ -3692,14 +3692,14 @@ void QuantaApp::slotUploadTemplate(const TQString &fileName)
 void QuantaApp::slotDownloadScript()
 {
     if (!m_newScriptStuff)
-      m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
+      m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
     m_newScriptStuff->downloadResource();
 }
 
 void QuantaApp::slotUploadScript(const TQString &fileName)
 {
   if (!m_newScriptStuff)
-    m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
+    m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
 //  tempDirList.append(m_newScriptStuff->uploadResource(fileName));
   m_newScriptStuff->uploadResource(fileName);
 }
@@ -3708,7 +3708,7 @@ void QuantaApp::slotDownloadDoc()
 {
   if (!m_newDocStuff)
   {
-    m_newDocStuff = new TQNewDocStuff("quanta/documentation", this);
+    m_newDocStuff = new QNewDocStuff("quanta/documentation", this);
     connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree()));
   }
   m_newDocStuff->downloadResource();
@@ -5122,7 +5122,7 @@ void QuantaApp::slotFileClosed(Document *w)
     KURL url = w->url();
     if (Project::ref()->hasProject() && Project::ref()->tqcontains(url))
     {
-      KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
+      KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
       m_annotationOutput->writeAnnotations(QuantaCommon::qUrl(u), w->annotations());
     }
   }
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index b10d6480..404a9329 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -56,11 +56,11 @@ class QuantaPluginInterface;
 
 class QuantaDoc;
 class QuantaView;
-class TQNewDTEPStuff;
-class TQNewToolbarStuff;
-class TQNewTemplateStuff;
-class TQNewScriptStuff;
-class TQNewDocStuff;
+class QNewDTEPStuff;
+class QNewToolbarStuff;
+class QNewTemplateStuff;
+class QNewScriptStuff;
+class QNewDocStuff;
 
 class TQTabWidget;
 class TQWidgetStack;
@@ -644,11 +644,11 @@ protected: // Protected attributes
   DCOPQuanta *dcopQuanta;
   KParts::PartManager *m_partManager;  ///< the pointer to the part manager
   TQGuardedPtr<KTextEditor::View> m_oldKTextEditor;  ///< remembers the last activated GUI
-  TQNewDTEPStuff *m_newDTEPStuff;
-  TQNewToolbarStuff *m_newToolbarStuff;
-  TQNewTemplateStuff *m_newTemplateStuff;
-  TQNewScriptStuff *m_newScriptStuff;
-  TQNewDocStuff *m_newDocStuff;
+  QNewDTEPStuff *m_newDTEPStuff;
+  QNewToolbarStuff *m_newToolbarStuff;
+  QNewTemplateStuff *m_newTemplateStuff;
+  QNewScriptStuff *m_newScriptStuff;
+  QNewDocStuff *m_newDocStuff;
   TQDict<ToolbarEntry> m_toolbarList;
 
 public: //TODO: check if it's worth to make a read method for them
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 2fcdda6b..d1e2054c 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -309,7 +309,7 @@ void QuantaInit::initQuanta()
   TQString infoCss = tmpDir;
   infoCss.tqreplace(TQRegExp("/quanta$"),"");
   infoCss += "/info.css";
-  TQExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
+  QExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
 
   checkRuntimeDependencies();
   ViewManager::ref()->activeDocument()->view()->setFocus();
@@ -379,7 +379,7 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
           pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
   connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll()));
-  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
   connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)),
           m_project, TQT_SLOT(slotAddDirectory(const KURL&)));
@@ -1081,9 +1081,9 @@ void QuantaInit::initActions()
     connect( char_action, TQT_SIGNAL(activated()),
              TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) );
 
-    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
     QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta)));
     m_bookmarks->createActions(ac);
@@ -1199,9 +1199,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
             //backup the current version and restore it from the autosaved backup
             KURL backupURL = originalVersion;
             backupURL.setPath(backupURL.path() + "." + TQString::number(getpid(),10) + ".backup");
-            TQExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
-            TQExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
-            //we save a list of autosaved file names so "KTQApplicationPrivate::init()"
+            QExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
+            QExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
+            //we save a list of autosaved file names so "KQApplicationPrivate::init()"
             //can open them. If autosavedVersion.path().right(1) == "U" then we are recovering
             //an untitled document
             if(isUntitledDocument)
@@ -1302,7 +1302,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
     connect(timer, TQT_SIGNAL(timeout()),
             TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout()));
     timer->start(180*1000, true);
-    TQExtFileInfo internalFileInfo;
+    QExtFileInfo internalFileInfo;
     m_quanta->m_loopStarted = true;
     internalFileInfo.enter_loop();
     delete timer;
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 51729fb6..1ea690dc 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -171,7 +171,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
   }
   if (!url.isEmpty())
   {
-    if (TQExtFileInfo::exists(url, true, quantaApp))
+    if (QExtFileInfo::exists(url, true, quantaApp))
     {
        if (encoding.isEmpty())
           encoding = quantaApp->defaultEncoding();
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index e0c761e9..988bf338 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -290,7 +290,7 @@ void QuantaView::updateTab()
         TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small));
         if (mimeIcon.isNull())
           mimeIcon = TQIconSet(SmallIcon("document"));
-        TQString urlStr = TQExtFileInfo::shortName(m_document->url().path());
+        TQString urlStr = QExtFileInfo::shortName(m_document->url().path());
         if (m_document->isModified())
         {
             if (qConfig.showCloseButtons == "ShowAlways")
@@ -1140,7 +1140,7 @@ bool QuantaView::saveDocument(const KURL& url)
     if (m_saveResult)
     {
       //start an event loop and wait until the saving finished
-      TQExtFileInfo internalFileInfo;
+      QExtFileInfo internalFileInfo;
       m_eventLoopStarted = true;
       internalFileInfo.enter_loop();
     }
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 152063c8..bc91a218 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -99,7 +99,7 @@ QuantaView* ViewManager::createView(const TQString &caption)
     disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 );
     connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*)));
     connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&)));
-    connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
     return view;
 }