Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.

1 files changed, 27 insertions, 27 deletions

diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 24663af3..5239c8de 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -22,13 +22,13 @@
 #include <tqpainter.h>
 #include <tqtabwidget.h>
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqeventloop.h>
 #include <tqtimer.h>
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqpopupmenu.h>
 #include <tqdatetime.h>
 #include <tqradiobutton.h>
@@ -191,13 +191,13 @@ void QuantaInit::initQuanta()
   m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
 
-  // Restore the dock layout
+  // Restore the dock tqlayout
   m_config->setGroup  ("General Options");
-  TQString layout = m_config->readEntry("Window layout", "Default");
+  TQString tqlayout = m_config->readEntry("Window tqlayout", "Default");
   int mdiMode = m_config->readNumEntry("MDI mode", -1);
-  if (mdiMode != -1 && layout != "Default")
+  if (mdiMode != -1 && tqlayout != "Default")
   {
-      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout...
+      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout...
       if (mdiMode != KMdi::IDEAlMode)
         m_quanta->setToolviewStyle(qConfig.toolviewTabs);
   }
@@ -268,7 +268,7 @@ void QuantaInit::initQuanta()
           TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 
   m_quanta->slotFileNew();
-  m_quanta->slotNewStatus();
+  m_quanta->slotNewtqStatus();
   initToolBars();
   Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown());
   Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject());
@@ -301,7 +301,7 @@ void QuantaInit::initQuanta()
           continue;
       int length = s.find(";)") - begin + 1;
       TQString s2 = s.mid(begin, length - 1);
-      replacementMap[s[0].unicode()] = s2;
+      replacementMap[s[0].tqunicode()] = s2;
     }
     file.close();
   }
@@ -356,16 +356,16 @@ void QuantaInit::initStatusBar()
 void QuantaInit::initDocument()
 {
   m_quanta->m_doc = new QuantaDoc(0L);
-  connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
+  connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
 }
 
 void QuantaInit::initProject()
 {
   Project *m_project = Project::ref(m_quanta);
 
-  connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
-          pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
+  connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)),
+          pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *)));
   connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
           TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
   connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
@@ -424,8 +424,8 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(messages(const TQString&)),
           m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
 
-  connect(m_project, TQT_SIGNAL(newStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
+  connect(m_project, TQT_SIGNAL(newtqStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
 
   connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -438,10 +438,10 @@ void QuantaInit::initProject()
 
   connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)),
           m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&)));
-  connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)),
+  connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)),
           m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int)));
-  connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
-          m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
+  connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)),
+          m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool)));
 
   connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
 
@@ -679,7 +679,7 @@ void QuantaInit::openLastFiles()
   if (w) //w==0 might happen on quick close on startup
   {
     m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) );
-//    m_quanta->slotUpdateStatus(w);//FIXME:
+//    m_quanta->slotUpdatetqStatus(w);//FIXME:
   }
 }
 
@@ -963,7 +963,7 @@ void QuantaInit::initActions()
           n = n.nextSibling();
         }
       } else
-        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
       f.close();
     }
     m_quanta->m_actions->clear();
@@ -990,7 +990,7 @@ void QuantaInit::initActions()
             n = n.nextSibling();
           }
         } else
-        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
         f.close();
       }
     } else
@@ -1180,9 +1180,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
             "Backup file size: <b>%4</b><br>"
             "Backup created on: <b>%5</b><br><br>"
             "</qt>")
-            .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
-            .arg(KIO::convertSize(origSize)).arg(origTime)
-            .arg(KIO::convertSize(backupSize)).arg(backupTime));
+            .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
+            .tqarg(KIO::convertSize(origSize)).tqarg(origTime)
+            .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime));
           w->buttonLoad->setText(i18n("&Restore the file from backup"));
           w->buttonIgnore->setText(i18n("Do &not restore the file from backup"));
           delete w->warningLabel;
@@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies()
     if (dependency.type == Dependency::Executable)
     {
       if (KStandardDirs::findExe(dependency.execName).isNull())
-        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
+        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
 
     } else
     if (dependency.type == Dependency::Plugin)
     {
       if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName)))
-        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
+        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
     }
   }
 
@@ -1500,7 +1500,7 @@ void QuantaInit::checkRuntimeDependencies()
                                             &appId);
   if (appId.isEmpty())
   {
-     errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management"));
+     errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management"));
   } else
   {
      CVSService::ref(m_quanta->actionCollection())->setAppId(appId);
@@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas()
   int i = 0;
   for (QCStringList::iterator it = list.begin(); it != list.end(); ++it)
   {
-    if (TQString(*it).startsWith("quanta", false))
+    if (TQString(*it).tqstartsWith("quanta", false))
       ++i;
   }
   return i;