TQt4 port kdeaccessibility

This enables compilation under both Qt3 and Qt4


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

14 files changed, 124 insertions, 118 deletions

diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index 88dc6b0..0889143 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -37,8 +37,8 @@
 /**
  * Constructor.
  */
-FilterMgr::FilterMgr( TQObject *parent, const char *name) :
-    KttsFilterProc(parent, name) 
+FilterMgr::FilterMgr( TQObject *tqparent, const char *name) :
+    KttsFilterProc(tqparent, name) 
 {
     // kdDebug() << "FilterMgr::FilterMgr: Running" << endl;
     m_state = fsIdle;
@@ -101,7 +101,7 @@ bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/)
             // and DesktopEntryName won't change.
             if (desktopEntryName.isEmpty())
             {
-                TQString filterPlugInName = config->readEntry("PlugInName", TQString::null);
+                TQString filterPlugInName = config->readEntry("PlugInName", TQString());
                 // See if the translated name will untranslate.  If not, well, sorry.
                 desktopEntryName = FilterNameToDesktopEntryName(filterPlugInName);
                 // Record the DesktopEntryName from now on.
@@ -116,8 +116,8 @@ bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/)
                     filterProc->init( config, groupName );
                     m_filterList.append( filterProc );
                 }
-                if (config->readEntry("DocType").contains("html") ||
-                    config->readEntry("RootElement").contains("html"))
+                if (config->readEntry("DocType").tqcontains("html") ||
+                    config->readEntry("RootElement").tqcontains("html"))
                     m_supportsHTML = true;
             }
         }
@@ -310,7 +310,7 @@ TQString FilterMgr::getOutput()
 void FilterMgr::ackFinished()
 {
     m_state = fsIdle;
-    m_text = TQString::null;
+    m_text = TQString();
 }
 
 /**
@@ -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)
     {
@@ -392,14 +392,14 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName)
  * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName.
  * @param name                   The translated plugin name.  From Name= line in .desktop file.
  * @return                       DesktopEntryName.  The name of the .desktop file (less .desktop).
- *                               TQString::null if not found.
+ *                               TQString() if not found.
  */
 TQString FilterMgr::FilterNameToDesktopEntryName(const TQString& name)
 {
-    if (name.isEmpty()) return TQString::null;
+    if (name.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin");
     for (uint ndx = 0; ndx < offers.count(); ++ndx)
         if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName();
-    return TQString::null;
+    return TQString();
 }
 
diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h
index 2a8ea23..539329b 100644
--- a/kttsd/kttsd/filtermgr.h
+++ b/kttsd/kttsd/filtermgr.h
@@ -26,7 +26,7 @@
 #ifndef _FILTERMGR_H_
 #define _FILTERMGR_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqptrlist.h>
 
 // KTTS includes.
@@ -40,12 +40,13 @@ typedef TQPtrList<KttsFilterProc> FilterList;
 class FilterMgr : public KttsFilterProc
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
          * Constructor.
          */
-        FilterMgr(TQObject *parent = 0, const char *name = 0);
+        FilterMgr(TQObject *tqparent = 0, const char *name = 0);
 
         /**
          * Destructor.
@@ -167,7 +168,7 @@ class FilterMgr : public KttsFilterProc
         // Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName.
         // @param name                   The translated plugin name.  From Name= line in .desktop file.
         // @return                       DesktopEntryName.  The name of the .desktop file (less .desktop).
-        //                               TQString::null if not found.
+        //                               TQString() if not found.
         TQString FilterNameToDesktopEntryName(const TQString& name);
 
         // List of filters.
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp
index 5a643a1..c546100 100644
--- a/kttsd/kttsd/kttsd.cpp
+++ b/kttsd/kttsd/kttsd.cpp
@@ -18,7 +18,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqcstring.h>
 #include <tqclipboard.h>
 #include <tqtextstream.h>
@@ -49,9 +49,9 @@
 * Note that most of the real tts work occurs in Speaker.
 */
 
-KTTSD::KTTSD(const TQCString& objId, TQObject *parent, const char *name) :
+KTTSD::KTTSD(const TQCString& objId, TQObject *tqparent, const char *name) :
     DCOPObject(objId),
-    TQObject(parent, name)
+    TQObject(tqparent, name)
 {
     // kdDebug() << "KTTSD::KTTSD Running" << endl;
     m_speaker = 0;
@@ -479,7 +479,7 @@ uint KTTSD::getTextJobCount()
 */
 TQString KTTSD::getTextJobNumbers()
 {
-    if (!m_speaker) return TQString::null;
+    if (!m_speaker) return TQString();
     return m_speechData->getTextJobNumbers();
 }
 
@@ -540,7 +540,7 @@ TQByteArray KTTSD::getTextJobInfo(const uint jobNum /*=0*/)
 */
 TQString KTTSD::talkerCodeToTalkerId(const TQString& talkerCode)
 {
-    if (!m_talkerMgr) return TQString::null;
+    if (!m_talkerMgr) return TQString();
     return m_talkerMgr->talkerCodeToTalkerId(fixNullString(talkerCode));
 }
 
@@ -728,7 +728,7 @@ void KTTSD::changeTextTalker(const TQString &talker, uint jobNum)
 */
 TQString KTTSD::userDefaultTalker()
 {
-    if (!m_talkerMgr) return TQString::null;
+    if (!m_talkerMgr) return TQString();
     return m_talkerMgr->userDefaultTalker();
 }
 
@@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/)
 void KTTSD::speakClipboard()
 {
     // Get the clipboard object.
-    QClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = kapp->tqclipboard();
 
     // Copy text from the clipboard.
     TQString text = cb->text();
@@ -893,20 +893,20 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp,
             TQString msg;
             TQString talker;
             // Check for app-specific action.
-            if ( m_speechData->notifyAppMap.contains( fromApp ) )
+            if ( m_speechData->notifyAppMap.tqcontains( fromApp ) )
             {
                 NotifyEventMap notifyEventMap = m_speechData->notifyAppMap[ fromApp ];
-                if ( notifyEventMap.contains( event ) )
+                if ( notifyEventMap.tqcontains( event ) )
                 {
                     found = true;
                     notifyOptions = notifyEventMap[ event ];
                 } else {
                     // Check for app-specific default.
-                    if ( notifyEventMap.contains( "default" ) )
+                    if ( notifyEventMap.tqcontains( "default" ) )
                     {
                         found = true;
                         notifyOptions = notifyEventMap[ "default" ];
-                        notifyOptions.eventName = TQString::null;
+                        notifyOptions.eventName = TQString();
                     }
                 }
             }
@@ -965,14 +965,14 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp,
                         break;
                     case NotifyAction::SpeakCustom:
                         msg = notifyOptions.customMsg;
-                        msg.replace( "%a", fromApp );
-                        msg.replace( "%m", text );
-                        if ( msg.contains( "%e" ) )
+                        msg.tqreplace( "%a", fromApp );
+                        msg.tqreplace( "%m", text );
+                        if ( msg.tqcontains( "%e" ) )
                         {
                             if ( notifyOptions.eventName.isEmpty() )
-                                msg.replace( "%e", NotifyEvent::getEventName( fromApp, event ) );
+                                msg.tqreplace( "%e", NotifyEvent::getEventName( fromApp, event ) );
                             else
-                                msg.replace( "%e", notifyOptions.eventName );
+                                msg.tqreplace( "%e", notifyOptions.eventName );
                         }
                         break;
                 }
@@ -1084,21 +1084,21 @@ uint KTTSD::applyDefaultJobNum(const uint jobNum)
 
 /*
 * Fixes a string argument passed in via dcop.
-* If NULL or "0" return TQString::null.
+* If NULL or "0" return TQString().
 */
 TQString KTTSD::fixNullString(const TQString &talker) const
 {
-    if (!talker) return TQString::null;
-    if (talker == "0") return TQString::null;
+    if (!talker) return TQString();
+    if (talker == "0") return TQString();
     return talker;
 }
 
 // kspeech is obsolete.  Applications should use KSpeech instead.
 
 // Constructor.
-kspeech::kspeech(const TQCString& objId, TQObject *parent, const char *name) :
+kspeech::kspeech(const TQCString& objId, TQObject *tqparent, const char *name) :
     DCOPObject(objId),
-    TQObject(parent, name),
+    TQObject(tqparent, name),
     m_kttsd("KSpeech")
 {
 }
diff --git a/kttsd/kttsd/kttsd.h b/kttsd/kttsd/kttsd.h
index 075383b..c082f1d 100644
--- a/kttsd/kttsd/kttsd.h
+++ b/kttsd/kttsd/kttsd.h
@@ -39,6 +39,7 @@
 class KTTSD : public TQObject, virtual public KSpeech
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
     public:
@@ -48,7 +49,7 @@ class KTTSD : public TQObject, virtual public KSpeech
         * Create objects, speechData and speaker.
         * Start thread
         */
-        KTTSD(const TQCString& objId, TQObject *parent=0, const char *name=0);
+        KTTSD(const TQCString& objId, TQObject *tqparent=0, const char *name=0);
 
         /**
         * Destructor.
@@ -608,7 +609,7 @@ class KTTSD : public TQObject, virtual public KSpeech
 
         /*
         * Fixes a talker argument passed in via dcop.
-        * If NULL or "0" return TQString::null.
+        * If NULL or "0" return TQString().
         */
         TQString fixNullString(const TQString &talker) const;
 
@@ -632,11 +633,12 @@ class KTTSD : public TQObject, virtual public KSpeech
 class kspeech : public TQObject, virtual public KSpeech
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
     public:
         // Constructor.
-        kspeech(const TQCString& objId, TQObject *parent=0, const char *name=0);
+        kspeech(const TQCString& objId, TQObject *tqparent=0, const char *name=0);
 
         // Destructor.
         ~kspeech();
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index 42fa39e..1434ab9 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -19,7 +19,7 @@
  *                                                                            *
  ******************************************************************************/
 
-// Qt includes. 
+// TQt includes. 
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqdir.h>
@@ -77,7 +77,7 @@
 *   You might have to wait for the plugin to complete before asking it
 *   to perform the next operation, but in the meantime, there might be
 *   other useful work that can be performed.
-* - In no case allow the main thread Qt event loop to block.
+* - In no case allow the main thread TQt event loop to block.
 * - Plugins that do not have asynchronous support are wrapped in the
 *   ThreadedPlugin class, which attempts to make them as asynchronous as
 *   it can, but there are limits.
@@ -107,8 +107,8 @@
 * Loads plugins.
 */
 Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr,
-    TQObject *parent, const char *name) :
-    TQObject(parent, name), 
+    TQObject *tqparent, const char *name) :
+    TQObject(tqparent, name), 
     m_speechData(speechData),
     m_talkerMgr(talkerMgr)
 {
@@ -806,7 +806,7 @@ TQString Speaker::uttStateToStr(uttState state)
         case usPreempted:           return "usPreempted";
         case usFinished:            return "usFinished";
     }
-    return TQString::null;
+    return TQString();
 }
 
 /**
@@ -829,7 +829,7 @@ TQString Speaker::uttTypeToStr(uttType utType)
         case utStartOfJob:   return "utStartOfJob";
         case utEndOfJob:     return "utEndOfJob";
     }
-    return TQString::null;
+    return TQString();
 }
 
 /**
@@ -846,7 +846,7 @@ TQString Speaker::pluginStateToStr(pluginState state)
         case psSynthing:     return "psSynthing";
         case psFinished:     return "psFinished";
     }
-    return TQString::null;
+    return TQString();
 }
 
 /**
@@ -864,7 +864,7 @@ TQString Speaker::jobStateToStr(int state)
         case KSpeech::jsPaused:      return "jsPaused";
         case KSpeech::jsFinished:    return "jsFinished";
     }
-    return TQString::null;
+    return TQString();
 }
 
 /**
@@ -926,7 +926,7 @@ bool Speaker::isSsml(const TQString &text)
 }
 
 /**
- * Determines the initial state of an utterance.  If the utterance contains
+ * Determines the initial state of an utterance.  If the utterance tqcontains
  * SSML, the state is set to usWaitingTransform.  Otherwise, if the plugin
  * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay.
  * If an utterance has already been transformed, usWaitingTransform is
@@ -1019,7 +1019,7 @@ bool Speaker::getNextUtterance()
         utt->state = usNone;
         utt->audioPlayer = 0;
         utt->audioStretcher = 0;
-        utt->audioUrl = TQString::null;
+        utt->audioUrl = TQString();
         utt->plugin = m_talkerMgr->talkerToPlugin(utt->sentence->talker);
         // Save some time by setting initial state now.
         setInitialUtteranceState(*utt);
@@ -1079,7 +1079,7 @@ bool Speaker::getNextUtterance()
                     {
                         Utt intrUtt;
                         intrUtt.sentence = new mlText;
-                        intrUtt.sentence->text = TQString::null;
+                        intrUtt.sentence->text = TQString();
                         intrUtt.sentence->talker = utt->sentence->talker;
                         intrUtt.sentence->appId = utt->sentence->appId;
                         intrUtt.sentence->jobNum = utt->sentence->jobNum;
@@ -1099,11 +1099,11 @@ bool Speaker::getNextUtterance()
                         intrUtt.sentence = new mlText;
                         intrUtt.sentence->text = m_speechData->textPreMsg;
                         // Interruptions are spoken using default Talker.
-                        intrUtt.sentence->talker = TQString::null;
+                        intrUtt.sentence->talker = TQString();
                         intrUtt.sentence->appId = utt->sentence->appId;
                         intrUtt.sentence->jobNum = utt->sentence->jobNum;
                         intrUtt.sentence->seq = 0;
-                        intrUtt.audioUrl = TQString::null;
+                        intrUtt.audioUrl = TQString();
                         intrUtt.audioPlayer = 0;
                         intrUtt.utType = utInterruptMsg;
                         intrUtt.isSSML = isSsml(intrUtt.sentence->text);
@@ -1125,7 +1125,7 @@ bool Speaker::getNextUtterance()
                 {
                     Utt resUtt;
                     resUtt.sentence = new mlText;
-                    resUtt.sentence->text = TQString::null;
+                    resUtt.sentence->text = TQString();
                     resUtt.sentence->talker = utt->sentence->talker;
                     resUtt.sentence->appId = utt->sentence->appId;
                     resUtt.sentence->jobNum = utt->sentence->jobNum;
@@ -1144,11 +1144,11 @@ bool Speaker::getNextUtterance()
                     Utt resUtt;
                     resUtt.sentence = new mlText;
                     resUtt.sentence->text = m_speechData->textPostMsg;
-                    resUtt.sentence->talker = TQString::null;
+                    resUtt.sentence->talker = TQString();
                     resUtt.sentence->appId = utt->sentence->appId;
                     resUtt.sentence->jobNum = utt->sentence->jobNum;
                     resUtt.sentence->seq = 0;
-                    resUtt.audioUrl = TQString::null;
+                    resUtt.audioUrl = TQString();
                     resUtt.audioPlayer = 0;
                     resUtt.utType = utResumeMsg;
                     resUtt.isSSML = isSsml(resUtt.sentence->text);
@@ -1173,12 +1173,12 @@ bool Speaker::getNextUtterance()
                     {
                         Utt jobUtt;
                         jobUtt.sentence = new mlText;
-                        jobUtt.sentence->text = TQString::null;
-                        jobUtt.sentence->talker = TQString::null;
+                        jobUtt.sentence->text = TQString();
+                        jobUtt.sentence->talker = TQString();
                         jobUtt.sentence->appId = m_lastAppId;
                         jobUtt.sentence->jobNum = m_lastJobNum;
                         jobUtt.sentence->seq = 0;
-                        jobUtt.audioUrl = TQString::null;
+                        jobUtt.audioUrl = TQString();
                         jobUtt.utType = utEndOfJob;
                         jobUtt.isSSML = false;
                         jobUtt.plugin = 0;
@@ -1194,12 +1194,12 @@ bool Speaker::getNextUtterance()
                 {
                     Utt jobUtt;
                     jobUtt.sentence = new mlText;
-                    jobUtt.sentence->text = TQString::null;
-                    jobUtt.sentence->talker = TQString::null;
+                    jobUtt.sentence->text = TQString();
+                    jobUtt.sentence->talker = TQString();
                     jobUtt.sentence->appId = m_lastAppId;
                     jobUtt.sentence->jobNum = m_lastJobNum;
                     jobUtt.sentence->seq = utt->sentence->seq;
-                    jobUtt.audioUrl = TQString::null;
+                    jobUtt.audioUrl = TQString();
                     jobUtt.utType = utStartOfJob;
                     jobUtt.isSSML = false;
                     jobUtt.plugin = 0;
@@ -1220,12 +1220,12 @@ bool Speaker::getNextUtterance()
             {
                 Utt jobUtt;
                 jobUtt.sentence = new mlText;
-                jobUtt.sentence->text = TQString::null;
-                jobUtt.sentence->talker = TQString::null;
+                jobUtt.sentence->text = TQString();
+                jobUtt.sentence->talker = TQString();
                 jobUtt.sentence->appId = m_lastAppId;
                 jobUtt.sentence->jobNum = m_lastJobNum;
                 jobUtt.sentence->seq = 0;
-                jobUtt.audioUrl = TQString::null;
+                jobUtt.audioUrl = TQString();
                 jobUtt.utType = utEndOfJob;
                 jobUtt.isSSML = false;
                 jobUtt.plugin = 0;
@@ -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).arg(seqStr) + ".wav";
+                    TQString("%1-%2").tqarg(jobStr.data()).tqarg(seqStr.data()) + ".wav";
                 TQFile::remove(dest);
                 TQDir d;
                 d.rename(it->audioUrl, dest);
@@ -1418,7 +1418,7 @@ bool Speaker::startPlayingUtterance(uttIterator it)
                  (m_speechData->getTextJobState(it->sentence->jobNum) != KSpeech::jsPaused))
             {
                 // kdDebug() << "Speaker::startPlayingUtterance: resuming play" << endl;
-                it->audioPlayer->startPlay(TQString::null);  // resume
+                it->audioPlayer->startPlay(TQString());  // resume
                 it->state = usPlaying;
                 if (!m_timer->start(timerInterval, FALSE))
                     kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl;
@@ -1431,7 +1431,7 @@ bool Speaker::startPlayingUtterance(uttIterator it)
         {
                 // Preempted playback automatically resumes.
                 // Note: Must call stop(), even if player not currently playing.  Why?
-            it->audioPlayer->startPlay(TQString::null);  // resume
+            it->audioPlayer->startPlay(TQString());  // resume
             it->state = usPlaying;
             if (!m_timer->start(timerInterval, FALSE))
                 kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl;
@@ -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/speaker.h b/kttsd/kttsd/speaker.h
index 6c81ada..04e2190 100644
--- a/kttsd/kttsd/speaker.h
+++ b/kttsd/kttsd/speaker.h
@@ -23,7 +23,7 @@
 #ifndef _SPEAKER_H_
 #define _SPEAKER_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqobject.h>
 #include <tqvaluevector.h>
 #include <tqevent.h>
@@ -109,8 +109,9 @@ const int timerInterval = 500;
  * This class is in charge of getting the messages, warnings and text from
  * the queue and call the plug ins function to actually speak the texts.
  */
-class Speaker : public QObject{
+class Speaker : public TQObject{
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
@@ -118,7 +119,7 @@ class Speaker : public QObject{
          * Calls load plug ins
          */
         Speaker(SpeechData* speechData, TalkerMgr* talkerMgr,
-                TQObject *parent = 0, const char *name = 0);
+                TQObject *tqparent = 0, const char *name = 0);
 
         /**
          * Destructor
@@ -429,7 +430,7 @@ class Speaker : public QObject{
         bool isSsml(const TQString &text);
 
         /**
-        * Determines the initial state of an utterance.  If the utterance contains
+        * Determines the initial state of an utterance.  If the utterance tqcontains
         * SSML, the state is set to usWaitingTransform.  Otherwise, if the plugin
         * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay.
         * If an utterance has already been transformed, usWaitingTransform is
diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp
index 1c8f90f..e3793a5 100644
--- a/kttsd/kttsd/speechdata.cpp
+++ b/kttsd/kttsd/speechdata.cpp
@@ -25,7 +25,7 @@
 // C++ includes.
 #include <stdlib.h>
 
-// Qt includes.
+// TQt includes.
 #include <tqregexp.h>
 #include <tqpair.h>
 #include <tqvaluelist.h>
@@ -156,8 +156,8 @@ void SpeechData::loadNotifyEventsFromFile( const TQString& filename, bool clear)
     {
         notifyDefaultPresent = NotifyPresent::Passive;
         notifyDefaultOptions.action = NotifyAction::SpeakMsg;
-        notifyDefaultOptions.talker = TQString::null;
-        notifyDefaultOptions.customMsg = TQString::null;
+        notifyDefaultOptions.talker = TQString();
+        notifyDefaultOptions.customMsg = TQString();
         notifyAppMap.clear();
     }
 
@@ -195,7 +195,7 @@ void SpeechData::loadNotifyEventsFromFile( const TQString& filename, bool clear)
             notifyEventMap[ event ] = notifyOptions;
             notifyAppMap[ eventSrc ] = notifyEventMap;
         } else {
-            notifyOptions.eventName = TQString::null;
+            notifyOptions.eventName = TQString();
             notifyDefaultPresent = NotifyPresent::present( event );
             notifyDefaultOptions = notifyOptions;
         }
@@ -423,24 +423,24 @@ TQStringList SpeechData::parseText(const TQString &text, const TQCString &appId
     }
     // See if app has specified a custom sentence delimiter and use it, otherwise use default.
     TQRegExp sentenceDelimiter;
-    if (sentenceDelimiters.find(appId) != sentenceDelimiters.end())
+    if (sentenceDelimiters.tqfind(appId) != sentenceDelimiters.end())
         sentenceDelimiter = TQRegExp(sentenceDelimiters[appId]);
     else
         sentenceDelimiter = TQRegExp("([\\.\\?\\!\\:\\;]\\s)|(\\n *\\n)");
     TQString temp = text;
     // Replace spaces, tabs, and formfeeds with a single space.
-    temp.replace(TQRegExp("[ \\t\\f]+"), " ");
+    temp.tqreplace(TQRegExp("[ \\t\\f]+"), " ");
     // Replace sentence delimiters with tab.
-    temp.replace(sentenceDelimiter, "\\1\t");
+    temp.tqreplace(sentenceDelimiter, "\\1\t");
     // Replace remaining newlines with spaces.
-    temp.replace("\n"," ");
-    temp.replace("\r"," ");
+    temp.tqreplace("\n"," ");
+    temp.tqreplace("\r"," ");
     // Remove leading spaces.
-    temp.replace(TQRegExp("\\t +"), "\t");
+    temp.tqreplace(TQRegExp("\\t +"), "\t");
     // Remove trailing spaces.
-    temp.replace(TQRegExp(" +\\t"), "\t");
+    temp.tqreplace(TQRegExp(" +\\t"), "\t");
     // Remove blank lines.
-    temp.replace(TQRegExp("\t\t+"),"\t");
+    temp.tqreplace(TQRegExp("\t\t+"),"\t");
     // Split into sentences.
     TQStringList tempList = TQStringList::split("\t", temp, false);
 
@@ -695,7 +695,7 @@ int SpeechData::getJobPartNumFromSeq(const mlJob& job, const int seq)
 void SpeechData::deleteExpiredJobs(const uint finishedJobNum)
 {
     // Save current pointer.
-    typedef QPair<TQCString, uint> removedJob;
+    typedef TQPair<TQCString, uint> removedJob;
     typedef TQValueList<removedJob> removedJobsList;
     removedJobsList removedJobs;
     // Walk through jobs and delete any other finished jobs.
@@ -1032,7 +1032,7 @@ void SpeechData::moveTextLater(const uint jobNum)
     if (job)
     {
         // Get index of the job.
-        uint index = textJobs.findRef(job);
+        uint index = textJobs.tqfindRef(job);
         // Move job down one position in the queue.
         // kdDebug() << "In SpeechData::moveTextLater, moving jobNum " << movedJobNum << endl;
         if (textJobs.insert(index + 2, job)) textJobs.take(index);
@@ -1149,7 +1149,7 @@ void SpeechData::startJobFiltering(mlJob* job, const TQString& text, bool noSBD)
     // Get TalkerCode structure of closest matching Talker.
     pooledFilterMgr->talkerCode = m_talkerMgr->talkerToTalkerCode(job->talker);
     // Pass Sentence Boundary regular expression (if app overrode default);
-    if (sentenceDelimiters.find(job->appId) != sentenceDelimiters.end())
+    if (sentenceDelimiters.tqfind(job->appId) != sentenceDelimiters.end())
         pooledFilterMgr->filterMgr->setSbRegExp(sentenceDelimiters[job->appId]);
     pooledFilterMgr->filterMgr->asyncConvert(text, pooledFilterMgr->talkerCode, job->appId);
 }
diff --git a/kttsd/kttsd/speechdata.h b/kttsd/kttsd/speechdata.h
index 5f5b92a..73ee03b 100644
--- a/kttsd/kttsd/speechdata.h
+++ b/kttsd/kttsd/speechdata.h
@@ -25,7 +25,7 @@
 #ifndef _SPEECHDATA_H_
 #define _SPEECHDATA_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqptrqueue.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
@@ -110,6 +110,7 @@ typedef TQMap<TQString, NotifyEventMap> NotifyAppMap;
  */
 class SpeechData : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp
index d33eaf3..5f37af4 100644
--- a/kttsd/kttsd/ssmlconvert.cpp
+++ b/kttsd/kttsd/ssmlconvert.cpp
@@ -19,7 +19,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqdom.h>
@@ -66,10 +66,10 @@ void SSMLConvert::setTalkers(const TQStringList &talkers) {
 TQString SSMLConvert::extractTalker(const TQString &talkercode) {
     TQString t = talkercode.section("synthesizer=", 1, 1);
     t = t.section('"', 1, 1);
-    if(t.contains("flite"))
+    if(t.tqcontains("flite"))
         return "flite";
     else
-        return t.left(t.find(" ")).lower();
+        return t.left(t.tqfind(" ")).lower();
 }
 
 /**
@@ -101,7 +101,7 @@ TQString SSMLConvert::extractTalker(const TQString &talkercode) {
 * of the how the talker is chosen, meaning that you don't lose some features of the talker if this
 * search doesn't encompass them.
 * 
-* QDom is the item of choice for the matching. Just walk the tree..
+* TQDom is the item of choice for the matching. Just walk the tree..
 */
 TQString SSMLConvert::appropriateTalker(const TQString &text) const {
     TQDomDocument ssml;
@@ -113,7 +113,7 @@ TQString SSMLConvert::appropriateTalker(const TQString &text) const {
     TQDomElement root = ssml.documentElement();
     if(root.tagName() != "speak") {
         // Not SSML.
-        return TQString::null;
+        return TQString();
     }
 
     /** 
@@ -132,7 +132,7 @@ TQString SSMLConvert::appropriateTalker(const TQString &text) const {
         TQString lang = root.attribute("xml:lang");
         kdDebug() << "SSMLConvert::appropriateTalker: xml:lang found (" << lang << ")" << endl;
         /// If it is set to en*, then match all english speakers. They all sound the same anyways.
-        if(lang.contains("en-")) {
+        if(lang.tqcontains("en-")) {
             kdDebug() << "SSMLConvert::appropriateTalker: English" << endl;
             lang = "en";
         }
@@ -273,7 +273,7 @@ TQString SSMLConvert::getOutput()
     if(!readfile.open(IO_ReadOnly)) {
         /// uhh yeah... Issues writing to the SSML file.
         kdDebug() << "SSMLConvert::slotProcessExited: Could not read file " << m_outFilename << endl;
-        return TQString::null;
+        return TQString();
     }
     TQTextStream rstream(&readfile);
     TQString convertedData = rstream.read();
@@ -283,9 +283,9 @@ TQString SSMLConvert::getOutput()
 
     // Clean up.
     TQFile::remove(m_inFilename);
-    m_inFilename = TQString::null;
+    m_inFilename = TQString();
     TQFile::remove(m_outFilename);
-    m_outFilename = TQString::null;
+    m_outFilename = TQString();
 
     // Ready for another transform.
     m_state = tsIdle;
diff --git a/kttsd/kttsd/ssmlconvert.h b/kttsd/kttsd/ssmlconvert.h
index dd48db3..2fd18bd 100644
--- a/kttsd/kttsd/ssmlconvert.h
+++ b/kttsd/kttsd/ssmlconvert.h
@@ -30,7 +30,7 @@
  * by the talker.
  */
 
-// Qt includes
+// TQt includes
 #include <tqobject.h>
 #include <tqstringlist.h>
 
@@ -39,6 +39,7 @@ class TQString;
 
 class SSMLConvert : public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /** Constructors */
     SSMLConvert();
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index f10281c..b25929c 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -21,7 +21,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
-// Qt includes.
+// TQt includes.
 
 // KDE includes.
 #include <kdebug.h>
@@ -37,8 +37,8 @@
 /**
  * Constructor.
  */
-TalkerMgr::TalkerMgr(TQObject *parent, const char *name) :
-    TQObject( parent, name )
+TalkerMgr::TalkerMgr(TQObject *tqparent, const char *name) :
+    TQObject( tqparent, name )
 {
     m_loadedPlugIns.setAutoDelete(true);
 }
@@ -82,7 +82,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
             config->setGroup("Talker_" + talkerID);
 
             // Get the DesktopEntryName of the plugin we will try to load.
-            TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString::null);
+            TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString());
 
             // If a DesktopEntryName is not in the config file, it was configured before
             // we started using them, when we stored translated plugin names instead.
@@ -91,7 +91,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
             // and DesktopEntryName won't change.
             if (desktopEntryName.isEmpty())
             {
-                TQString synthName = config->readEntry("PlugIn", TQString::null);
+                TQString synthName = config->readEntry("PlugIn", TQString());
                 // See if the translated name will untranslate.  If not, well, sorry.
                 desktopEntryName = TalkerCode::TalkerNameToDesktopEntryName(synthName);
                 // Record the DesktopEntryName from now on.
@@ -99,7 +99,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
             }
 
             // Get the talker code.
-            TQString talkerCode = config->readEntry("TalkerCode", TQString::null);
+            TQString talkerCode = config->readEntry("TalkerCode", TQString());
 
             // Normalize the talker code.
             TQString fullLanguageCode;
@@ -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);
@@ -205,7 +205,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const
 {
     // kdDebug() << "TalkerMgr::talkerToPluginIndex: matching talker " << talker << " to closest matching plugin." << endl;
     // If we have a cached match, return that.
-    if (m_talkerToPlugInCache.contains(talker))
+    if (m_talkerToPlugInCache.tqcontains(talker))
         return m_talkerToPlugInCache[talker];
     else
     {
@@ -223,7 +223,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const
  * If a plugin has not been loaded to match the talker, returns the default
  * plugin.
  *
- * TODO: When picking a talker, %KTTSD will automatically determine if text contains
+ * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains
  * markup and pick a talker that supports that markup, if available.  This
  * overrides all other attributes, i.e, it is treated as an automatic "top priority"
  * attribute.
@@ -244,7 +244,7 @@ PlugInProc* TalkerMgr::talkerToPlugin(const TQString& talker) const
  *
  * The returned TalkerCode is a copy and should be destroyed by caller.
  *
- * TODO: When picking a talker, %KTTSD will automatically determine if text contains
+ * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains
  * markup and pick a talker that supports that markup, if available.  This
  * overrides all other attributes, i.e, it is treated as an automatic "top priority"
  * attribute.
@@ -325,7 +325,7 @@ bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config)
     {
         // See if this plugin supports the desired language.
         TQStringList languageCodes = offers[i]->property("X-KDE-Languages").toStringList();
-        if (languageCodes.contains(languageCode))
+        if (languageCodes.tqcontains(languageCode))
         {
             TQString desktopEntryName = offers[i]->desktopEntryName();
 
diff --git a/kttsd/kttsd/talkermgr.h b/kttsd/kttsd/talkermgr.h
index 52ddc4d..1028990 100644
--- a/kttsd/kttsd/talkermgr.h
+++ b/kttsd/kttsd/talkermgr.h
@@ -24,7 +24,7 @@
 #ifndef _TALKERMGR_H_
 #define _TALKERMGR_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
@@ -34,14 +34,14 @@
 #include "talkercode.h"
 #include "pluginproc.h"
 
-class TalkerMgr: public QObject
+class TalkerMgr: public TQObject
 {
 public:
 
     /**
      * Constructor.
      */
-    TalkerMgr(TQObject *parent = 0, const char *name = 0);
+    TalkerMgr(TQObject *tqparent = 0, const char *name = 0);
 
     /**
      * Destructor.
@@ -95,7 +95,7 @@ public:
      *
      * The returned TalkerCode is a copy and should be destroyed by caller.
      *
-     * TODO: When picking a talker, %KTTSD will automatically determine if text contains
+     * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains
      * markup and pick a talker that supports that markup, if available.  This
      * overrides all other attributes, i.e, it is treated as an automatic "top priority"
      * attribute.
diff --git a/kttsd/kttsd/threadedplugin.cpp b/kttsd/kttsd/threadedplugin.cpp
index eacd598..6158588 100644
--- a/kttsd/kttsd/threadedplugin.cpp
+++ b/kttsd/kttsd/threadedplugin.cpp
@@ -33,11 +33,11 @@
 * Constructor.
 */
 ThreadedPlugIn::ThreadedPlugIn(PlugInProc* plugin, 
-    TQObject *parent /*= 0*/, const char *name /*= 0*/):
-    PlugInProc(parent, name),
+    TQObject *tqparent /*= 0*/, const char *name /*= 0*/):
+    PlugInProc(tqparent, name),
     TQThread(),
     m_plugin(plugin),
-    m_filename(TQString::null),
+    m_filename(TQString()),
     m_requestExit(false),
     m_supportsSynth(false)
 {
@@ -188,7 +188,7 @@ void ThreadedPlugIn::ackFinished()
 {
     // Since plugin should not be running, don't bother with Mutex here.
     if (m_state == psFinished) m_state = psIdle;
-    m_filename = TQString::null;
+    m_filename = TQString();
 }
 
 /**
@@ -265,7 +265,7 @@ void ThreadedPlugIn::run()
                     m_state = psSynthing;
                     m_stateMutex.unlock();
                     TQString filename = m_filename;
-                    m_filename = TQString::null;
+                    m_filename = TQString();
                     kdDebug() << "ThreadedPlugIn::run calling synthText" << endl;
                     m_plugin->synthText(m_text, filename);
                     kdDebug() << "ThreadedPlugIn::run back from synthText" << endl;
diff --git a/kttsd/kttsd/threadedplugin.h b/kttsd/kttsd/threadedplugin.h
index 1a1b13e..c2ee0d6 100644
--- a/kttsd/kttsd/threadedplugin.h
+++ b/kttsd/kttsd/threadedplugin.h
@@ -45,7 +45,7 @@ class ThreadedPlugIn : public PlugInProc, public TQThread
         /**
         * Constructor.
         */
-        ThreadedPlugIn(PlugInProc* plugin, TQObject *parent = 0, const char *name = 0);
+        ThreadedPlugIn(PlugInProc* plugin, TQObject *tqparent = 0, const char *name = 0);
 
         /**
         * Destructor.