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

This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d.

5 files changed, 10 insertions, 10 deletions

diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index 91fff38..5e4065a 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -352,7 +352,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
+        TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
 
     if (offers.count() == 1)
     {
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp
index 6363426..de4320c 100644
--- a/kttsd/kttsd/kttsd.cpp
+++ b/kttsd/kttsd/kttsd.cpp
@@ -20,9 +20,9 @@
 
 // TQt includes.
 #include <tqcstring.h>
-#include <clipboard.h>
-#include <textstream.h>
-#include <textcodec.h>
+#include <tqclipboard.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 // KDE includes.
@@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/)
 void KTTSD::speakClipboard()
 {
     // Get the clipboard object.
-    TQClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = kapp->tqclipboard();
 
     // Copy text from the clipboard.
     TQString text = cb->text();
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index 4d4ee3e..fce3b32 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -1316,7 +1316,7 @@ uttIterator Speaker::deleteUtterance(uttIterator it)
                 TQCString jobStr;
                 jobStr.sprintf("%08i", it->sentence->jobNum);
                 TQString dest = m_speechData->keepAudioPath + "/kttsd-" +
-                    TQString("%1-%2").arg(jobStr.data()).arg(seqStr.data()) + ".wav";
+                    TQString("%1-%2").tqarg(jobStr.data()).tqarg(seqStr.data()) + ".wav";
                 TQFile::remove(dest);
                 TQDir d;
                 d.rename(it->audioUrl, dest);
@@ -1541,7 +1541,7 @@ Player* Speaker::createPlayerObject()
             }
     }
     KTrader::OfferList offers = KTrader::self()->query(
-            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
+            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
 
     if(offers.count() == 1)
     {
diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp
index 76c7bc3..694b355 100644
--- a/kttsd/kttsd/ssmlconvert.cpp
+++ b/kttsd/kttsd/ssmlconvert.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 // KDE includes.
 #include <tdeversion.h>
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index a6e5a9c..8d6264b 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -107,7 +107,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
 
             // Find the KTTSD SynthPlugin.
             KTrader::OfferList offers = KTrader::self()->query(
-                "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
+                "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
 
             if(offers.count() > 1){
                 ++bad;
@@ -134,7 +134,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
                         } else {
                             // Synchronous plugins are run in a separate thread.
                             // Init will start the thread and it will immediately go to sleep.
-                            TQString threadedPlugInName = TQString::fromLatin1("threaded") + desktopEntryName;
+                            TQString threadedPlugInName = TQString::tqfromLatin1("threaded") + desktopEntryName;
                             ThreadedPlugIn* speechThread = new ThreadedPlugIn(speech,
                                     this, threadedPlugInName.latin1());
                             speechThread->init(config, "Talker_" + talkerCode);