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

21 files changed, 143 insertions, 136 deletions

diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp
index 4947698..bfeb1f5 100644
--- a/kttsd/libkttsd/filterconf.cpp
+++ b/kttsd/libkttsd/filterconf.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <sys/param.h>
 
-// Qt includes.
+// TQt includes.
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqstring.h>
@@ -42,7 +42,7 @@
 /**
 * Constructor 
 */
-KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(parent, name){
+KttsFilterConf::KttsFilterConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){
     // kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl;
     TQString systemPath(getenv("PATH"));
     // kdDebug() << "Path is " << systemPath << endl;
@@ -114,7 +114,7 @@ bool KttsFilterConf::supportsMultiInstance() { return false; }
  * return an empty string.
  * @return           Filter instance name.
  */
-TQString KttsFilterConf::userPlugInName() { return TQString::null; }
+TQString KttsFilterConf::userPlugInName() { return TQString(); }
 
 /**
  * Returns True if this filter is a Sentence Boundary Detector.
@@ -125,7 +125,7 @@ bool KttsFilterConf::isSBD() { return false; }
 /**
 * Return the full path to any program in the $PATH environmental variable
 * @param name        The name of the file to search for.
-* @returns           The path to the file on success, a blank QString
+* @returns           The path to the file on success, a blank TQString
 *                    if its not found.
 */
 TQString KttsFilterConf::getLocation(const TQString &name) {
diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h
index 7fdc8e4..c508532 100644
--- a/kttsd/libkttsd/filterconf.h
+++ b/kttsd/libkttsd/filterconf.h
@@ -25,7 +25,7 @@
 #ifndef _FILTERCONF_H_
 #define _FILTERCONF_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqwidget.h>
 
 // KDE includes.
@@ -34,14 +34,15 @@
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 
-class KDE_EXPORT KttsFilterConf : public QWidget{
+class KDE_EXPORT KttsFilterConf : public TQWidget{
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
         * Constructor 
         */
-        KttsFilterConf( TQWidget *parent = 0, const char *name = 0);
+        KttsFilterConf( TQWidget *tqparent = 0, const char *name = 0);
 
         /**
         * Destructor 
@@ -137,7 +138,7 @@ class KDE_EXPORT KttsFilterConf : public QWidget{
         * Searches the $PATH variable for any file. If that file exists in the PATH, or
         * is contained in any directory in the PATH, it returns the full path to it.
         * @param name        The name of the file to search for.
-        * @returns           The path to the file on success, a blank QString
+        * @returns           The path to the file on success, a blank TQString
         *                    if its not found.
         */
         TQString getLocation(const TQString &name);
diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp
index 8de5c62..9daf281 100644
--- a/kttsd/libkttsd/filterproc.cpp
+++ b/kttsd/libkttsd/filterproc.cpp
@@ -31,8 +31,8 @@
 /**
  * Constructor.
  */
-KttsFilterProc::KttsFilterProc( TQObject *parent, const char *name) :
-        TQObject(parent, name) 
+KttsFilterProc::KttsFilterProc( TQObject *tqparent, const char *name) :
+        TQObject(tqparent, name) 
 {
     // kdDebug() << "KttsFilterProc::KttsFilterProc: Running" << endl;
 }
@@ -123,7 +123,7 @@ bool KttsFilterProc::init(KConfig* /*config*/, const TQString& /*configGroup*/){
 /**
  * Returns the filtered output.
  */
-/*virtual*/ TQString KttsFilterProc::getOutput() { return TQString::null; }
+/*virtual*/ TQString KttsFilterProc::getOutput() { return TQString(); }
 
 /**
  * Acknowledges the finished filtering.
diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h
index bc11921..3484061 100644
--- a/kttsd/libkttsd/filterproc.h
+++ b/kttsd/libkttsd/filterproc.h
@@ -25,7 +25,7 @@
 #ifndef _FILTERPROC_H_
 #define _FILTERPROC_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqobject.h>
 #include <tqstringlist.h>
 
@@ -36,9 +36,10 @@
 class TalkerCode;
 class KConfig;
 
-class KDE_EXPORT KttsFilterProc : virtual public QObject
+class KDE_EXPORT KttsFilterProc : virtual public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum FilterState {
@@ -51,7 +52,7 @@ public:
     /**
      * Constructor.
      */
-    KttsFilterProc( TQObject *parent, const char *name );
+    KttsFilterProc( TQObject *tqparent, const char *name );
 
     /**
      * Destructor.
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index c633779..f21f813 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -15,9 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt includes.
+// TQt includes.
 
-// Qt includes.
+// TQt includes.
 #include <tqstring.h>
 #include <tqstringlist.h>
 
@@ -68,7 +68,7 @@ static void notifyaction_init()
 /*static*/ int NotifyAction::action( const TQString& actionName )
 {
     notifyaction_init();
-    return s_actionNames->findIndex( actionName );
+    return s_actionNames->tqfindIndex( actionName );
 }
 
 /*static*/ TQString NotifyAction::actionDisplayName( const int action )
@@ -126,7 +126,7 @@ static void notifypresent_init()
 /*static*/ int NotifyPresent::present( const TQString& presentName )
 {
     notifypresent_init();
-    return s_presentNames->findIndex( presentName );
+    return s_presentNames->tqfindIndex( presentName );
 }
 
 /*static*/ TQString NotifyPresent::presentDisplayName( const int present )
@@ -148,9 +148,9 @@ static void notifypresent_init()
  */
 /*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName)
 {
-    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
-    config->setGroup( TQString::fromLatin1( "!Global!" ) );
+    config->setGroup( TQString::tqfromLatin1( "!Global!" ) );
     TQString appDesc = config->readEntry( "Comment", i18n("No description available") );
     iconName = config->readEntry( "IconName" );
     delete config;
@@ -163,13 +163,13 @@ static void notifypresent_init()
 /*static*/ TQString NotifyEvent::getEventName(const TQString& eventSrc, const TQString& event)
 {
     TQString eventName;
-    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
     if ( config->hasGroup( event ) )
     {
         config->setGroup( event );
-        eventName = config->readEntry( TQString::fromLatin1( "Comment" ),
-            config->readEntry( TQString::fromLatin1( "Name" )));
+        eventName = config->readEntry( TQString::tqfromLatin1( "Comment" ),
+            config->readEntry( TQString::tqfromLatin1( "Name" )));
     }
     delete config;
     return eventName;
diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h
index f83c5b4..a0b8311 100644
--- a/kttsd/libkttsd/player.h
+++ b/kttsd/libkttsd/player.h
@@ -25,9 +25,10 @@
 
 // #include "filehandle.h"
 
-class KDE_EXPORT Player : virtual public QObject
+class KDE_EXPORT Player : virtual public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     virtual ~Player() {}
@@ -66,8 +67,8 @@ public:
     virtual void setPeriods(uint periods) {Q_UNUSED(periods); }
 
 protected:
-    Player(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) :
-        TQObject(parent, name) {
+    Player(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) :
+        TQObject(tqparent, name) {
         Q_UNUSED(args);
     }
 
diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp
index f23eaed..8138547 100644
--- a/kttsd/libkttsd/pluginconf.cpp
+++ b/kttsd/libkttsd/pluginconf.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <sys/param.h>
 
-// Qt includes.
+// TQt includes.
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqstring.h>
@@ -36,7 +36,7 @@
 /**
 * Constructor 
 */
-PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){
+PlugInConf::PlugInConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){
     kdDebug() << "PlugInConf::PlugInConf: Running" << endl;
     KGlobal::locale()->insertCatalogue("kttsd");
     TQString systemPath(getenv("PATH"));
@@ -110,7 +110,7 @@ bool PlugInConf::supportsMultiInstance() { return true; }
 * This function informs the plugin of the desired language to be spoken
 * by the plugin.  The plugin should attempt to adapt itself to the
 * specified language code, choosing sensible defaults if necessary.
-* If the passed-in code is TQString::null, no specific language has
+* If the passed-in code is TQString(), no specific language has
 * been chosen.
 * @param lang        The desired language code or Null if none.
 *
@@ -122,10 +122,10 @@ void PlugInConf::setDesiredLanguage(const TQString& /*lang*/ ) { }
 * Return fully-specified talker code for the configured plugin.  This code
 * uniquely identifies the configured instance of the plugin and distinquishes
 * one instance from another.  If the plugin has not been fully configured,
-* i.e., cannot yet synthesize, return TQString::null.
+* i.e., cannot yet synthesize, return TQString().
 * @return            Fully-specified talker code.
 */
-TQString PlugInConf::getTalkerCode() { return TQString::null; }
+TQString PlugInConf::getTalkerCode() { return TQString(); }
 
 /**
 * Return a list of all the languages currently supported by the plugin.
@@ -143,7 +143,7 @@ TQStringList PlugInConf::getSupportedLanguages() { return TQStringList(); }
 /**
 * Return the full path to any program in the $PATH environmental variable
 * @param name        The name of the file to search for.
-* @returns           The path to the file on success, a blank QString
+* @returns           The path to the file on success, a blank TQString
 *                    if its not found.
 */
 TQString PlugInConf::getLocation(const TQString &name) {
diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h
index 90d3cec..b76ec21 100644
--- a/kttsd/libkttsd/pluginconf.h
+++ b/kttsd/libkttsd/pluginconf.h
@@ -18,7 +18,7 @@
 #ifndef _PLUGINCONF_H_
 #define _PLUGINCONF_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqwidget.h>
 
 // KDE includes.
@@ -125,7 +125,7 @@
 * Next, @ref getTalkerCode
 * will be called.  If your plugin can automatically configure itself to the desired
 * language, it should do so and return a fully-specified talker code.  If your
-* plugin is not yet ready and requires user help, return TQString::null. Note that
+* plugin is not yet ready and requires user help, return TQString(). Note that
 * @ref setDesiredLanguage may be Null, in which case, you should allow the
 * user to configure your plugin to any of your supported languages.
 *
@@ -138,7 +138,7 @@
 * - @e lang.         If user has completed configuring your plugin, i.e., it is
 *                    ready to begin synthesizing, return the ISO 639-1 language code
 *                    for the language it can synthesize.  If your plugin is not yet 
-*                    fully configured, you should return TQString::null for the entire
+*                    fully configured, you should return TQString() for the entire
 *                    talker code.  If your plugin supports a specific national version
 *                    of a language, that should also be included using the ISO 3166
 *                    country code separated from the language code by underscore (_).
@@ -207,14 +207,15 @@
 * order to synthesize speech.
 */
 
-class KDE_EXPORT PlugInConf : public QWidget{
+class KDE_EXPORT PlugInConf : public TQWidget{
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
         * Constructor 
         */
-        PlugInConf( TQWidget *parent = 0, const char *name = 0);
+        PlugInConf( TQWidget *tqparent = 0, const char *name = 0);
 
         /**
         * Destructor 
@@ -281,7 +282,7 @@ class KDE_EXPORT PlugInConf : public QWidget{
         * This function informs the plugin of the desired language to be spoken
         * by the plugin.  The plugin should attempt to adapt itself to the
         * specified language code, choosing sensible defaults if necessary.
-        * If the passed-in code is TQString::null, no specific language has
+        * If the passed-in code is TQString(), no specific language has
         * been chosen.
         * @param lang        The desired language code or Null if none.
         *
@@ -299,7 +300,7 @@ class KDE_EXPORT PlugInConf : public QWidget{
         * Return fully-specified talker code for the configured plugin.  This code
         * uniquely identifies the configured instance of the plugin and distinquishes
         * one instance from another.  If the plugin has not been fully configured,
-        * i.e., cannot yet synthesize, return TQString::null.
+        * i.e., cannot yet synthesize, return TQString().
         * @return            Fully-specified talker code.
         */
         virtual TQString getTalkerCode();
@@ -356,7 +357,7 @@ class KDE_EXPORT PlugInConf : public QWidget{
         * Searches the $PATH variable for any file. If that file exists in the PATH, or
         * is contained in any directory in the PATH, it returns the full path to it.
         * @param name        The name of the file to search for.
-        * @returns           The path to the file on success, a blank QString
+        * @returns           The path to the file on success, a blank TQString
         *                    if its not found.
         */
         TQString getLocation(const TQString &name);
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index a712687..39c523b 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt includes. 
+// TQt includes. 
 #include <tqstring.h>
 #include <tqtextcodec.h>
 
@@ -31,7 +31,7 @@
 /**
 * Constructor
 */
-PlugInProc::PlugInProc( TQObject *parent, const char *name) : TQObject(parent, name){
+PlugInProc::PlugInProc( TQObject *tqparent, const char *name) : TQObject(tqparent, name){
     // kdDebug() << "PlugInProc::PlugInProc: Running" << endl;
 }
 
@@ -79,7 +79,7 @@ void PlugInProc::synthText(const TQString& /*text*/, const TQString& /*suggested
 *
 * The plugin must not re-use the filename.
 */
-TQString PlugInProc::getFilename() { return TQString::null; }
+TQString PlugInProc::getFilename() { return TQString(); }
 
 /**
 * Stop current operation (saying or synthesizing text).
diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h
index 8d867bc..ab156b3 100644
--- a/kttsd/libkttsd/pluginproc.h
+++ b/kttsd/libkttsd/pluginproc.h
@@ -114,8 +114,8 @@
 * when @ref sayText or @ref synthText is called,
 * with the exception of KProcess and family (KProcIO, KShellProcess).
 * This restriction comes about because the KDE Libraries make use of the
-* main Qt event loop, which unfortunately, runs only in the main thread.
-* This restriction will likely be lifted in Qt 4 and later.
+* main TQt event loop, which unfortunately, runs only in the main thread.
+* This restriction will likely be lifted in TQt 4 and later.
 *
 * Since the KDE library is not available from the @ref sayText and @ref synthText methods,
 * it is best if the plugin reads configuration settings in the @ref init method.
@@ -135,7 +135,7 @@
 * running.  Keep this in mind when implementing the code.
 *
 * If the plugin returns True from @ref supportsAsync, you will of course
-* need to deal with similar issues.  If you have to use QThreads
+* need to deal with similar issues.  If you have to use TQThreads
 * to implement asynchronous support, do not be concerned about emitting
 * the @ref sayFinished or @ref synthFinished signals from your threads, since
 * KTTSD will convert the received signals into postEvents and
@@ -227,8 +227,9 @@ enum pluginState
     psFinished = 3               /**< Plugin has finished synthesizing.  Audio file is ready. */
 };
 
-class KDE_EXPORT PlugInProc : virtual public QObject{
+class KDE_EXPORT PlugInProc : virtual public TQObject{
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         enum CharacterCodec {
@@ -241,7 +242,7 @@ class KDE_EXPORT PlugInProc : virtual public QObject{
         /**
         * Constructor.
         */
-        PlugInProc( TQObject *parent = 0, const char *name = 0);
+        PlugInProc( TQObject *tqparent = 0, const char *name = 0);
 
         /**
         * Destructor.
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index 9028bf7..99a2b03 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -24,7 +24,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
@@ -45,14 +45,14 @@
 #include "selecttalkerdlg.moc"
 
 SelectTalkerDlg::SelectTalkerDlg(
-    TQWidget* parent,
+    TQWidget* tqparent,
     const char* name,
     const TQString& caption,
     const TQString& talkerCode,
     bool runningTalkers) :
 
     KDialogBase(
-        parent,
+        tqparent,
         name,
         true,
         caption,
@@ -69,25 +69,25 @@ SelectTalkerDlg::SelectTalkerDlg(
 
     // Fill combo boxes.
     KComboBox* cb = m_widget->genderComboBox;
-    cb->insertItem( TQString::null );
+    cb->insertItem( TQString() );
     cb->insertItem( TalkerCode::translatedGender("male") );
     cb->insertItem( TalkerCode::translatedGender("female") );
     cb->insertItem( TalkerCode::translatedGender("neutral") );
 
     cb = m_widget->volumeComboBox;
-    cb->insertItem( TQString::null );
+    cb->insertItem( TQString() );
     cb->insertItem( TalkerCode::translatedVolume("medium") );
     cb->insertItem( TalkerCode::translatedVolume("loud") );
     cb->insertItem( TalkerCode::translatedVolume("soft") );
 
     cb = m_widget->rateComboBox;
-    cb->insertItem( TQString::null );
+    cb->insertItem( TQString() );
     cb->insertItem( TalkerCode::translatedRate("medium") );
     cb->insertItem( TalkerCode::translatedRate("fast") );
     cb->insertItem( TalkerCode::translatedRate("slow") );
 
     cb = m_widget->synthComboBox;
-    cb->insertItem( TQString::null );
+    cb->insertItem( TQString() );
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
     for(unsigned int i=0; i < offers.count() ; ++i)
         cb->insertItem(offers[i]->name());
@@ -170,7 +170,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked()
     TQString locale;
     TQString language;
     // Blank line so user can select no language.
-    // Note: Don't use TQString::null, which gets displayed at bottom of list, rather than top.
+    // Note: Don't use TQString(), which gets displayed at bottom of list, rather than top.
     TQListViewItem* item = new KListViewItem(langLView, "", "");
     if (m_talkerCode.languageCode().isEmpty()) item->setSelected(true);
     int allLocalesCount = allLocales.count();
@@ -200,7 +200,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked()
     // TODO: This isn't working.  Furthermore, item appears selected but is not.
     langLView->ensureItemVisible(langLView->selectedItem());
     int dlgResult = dlg->exec();
-    language = TQString::null;
+    language = TQString();
     if (dlgResult == TQDialog::Accepted)
     {
         if (langLView->selectedItem())
@@ -274,7 +274,7 @@ void SelectTalkerDlg::applyTalkerCodeToControls()
 void SelectTalkerDlg::applyControlsToTalkerCode()
 {
     if ( m_widget->useDefaultRadioButton->isChecked() )
-        m_talkerCode = TalkerCode(TQString::null, false);
+        m_talkerCode = TalkerCode(TQString(), false);
     else if ( m_widget->useClosestMatchRadioButton->isChecked() )
     {
         // Language already stored in talker code.
@@ -327,11 +327,11 @@ void SelectTalkerDlg::loadTalkers(bool /*runningTalkers*/)
         {
             TQString talkerID = *it;
             config->setGroup("Talker_" + talkerID);
-            TQString talkerCode = config->readEntry("TalkerCode", TQString::null);
+            TQString talkerCode = config->readEntry("TalkerCode", TQString());
             // Parse and normalize the talker code.
             TalkerCode talker = TalkerCode(talkerCode, true);
             m_talkers.append(talker);
-            TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString::null);
+            TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString());
             TQString synthName = TalkerCode::TalkerDesktopEntryNameToName(desktopEntryName);
             // Display in List View using translated strings.
             item = new KListViewItem(lv, item);
diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h
index 799f588..2ac7c30 100644
--- a/kttsd/libkttsd/selecttalkerdlg.h
+++ b/kttsd/libkttsd/selecttalkerdlg.h
@@ -27,7 +27,7 @@
 #ifndef _SELECTTALKERDLG_H_
 #define _SELECTTALKERDLG_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqvaluelist.h>
 
 // KDE includes.
@@ -42,11 +42,12 @@
 class KDE_EXPORT SelectTalkerDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
          * Constructor.
-         * @param parent                The parent for this dialog.
+         * @param tqparent                The tqparent for this dialog.
          * @param name                  Name for this dialog.
          * @param caption               Displayed title for this dialog.
          * @param talkerCode            A suggested starting Talker Code.
@@ -55,10 +56,10 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase
          *                              (which may not yet have been Applied).
          */
         SelectTalkerDlg(
-            TQWidget* parent = 0,
+            TQWidget* tqparent = 0,
             const char* name = "selecttalkerdialog",
             const TQString& caption = i18n("Select Talker"),
-            const TQString& talkerCode = TQString::null,
+            const TQString& talkerCode = TQString(),
             bool runningTalkers = false);
 
         /**
@@ -67,7 +68,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase
         ~SelectTalkerDlg();
 
         /**
-         * Returns the Talker Code user chose.  TQString::null if default Talker chosen.
+         * Returns the Talker Code user chose.  TQString() if default Talker chosen.
          * Note that if user did not choose a specific Talker, this will be a partial Talker Code.
          */
         TQString getSelectedTalkerCode();
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index adcc8a9..7e9ad64 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SelectTalkerWidget</class>
 <author>Gary Cramblitt &lt;garycramblitt@comcast.net&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SelectTalkerWidget</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>useDefaultRadioButton</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <string>When checked, will use the default Talker, which is the topmost Talker listed in the Talkers tab.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>useClosestMatchRadioButton</cstring>
                     </property>
@@ -75,9 +75,9 @@
                         <string>When checked, will use a configured Talker most closely matching the attributes you choose.  Attributes with checks next to them will be preferred over unchecked attributes.  Language is always preferred.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,14 +93,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QGroupBox">
+                        <widget class="TQGroupBox">
                             <property name="name">
                                 <cstring>closestMatchGroupBox</cstring>
                             </property>
@@ -117,7 +117,7 @@
                                 <property name="margin">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3">
+                                <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3">
                                     <property name="name">
                                         <cstring>preferredLabel</cstring>
                                     </property>
@@ -125,22 +125,22 @@
                                         <string>Checked items are preferred over unchecked items.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLayoutWidget" row="0" column="0">
+                                <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>layout11_2</cstring>
+                                        <cstring>tqlayout11_2</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>synthLabel</cstring>
                                             </property>
                                             <property name="text">
                                                 <string>&amp;Synthesizer:</string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>WordBreak|AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -152,7 +152,7 @@
                                                 <cstring>synthComboBox</cstring>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>synthCheckBox</cstring>
                                             </property>
@@ -176,15 +176,15 @@
                                         </widget>
                                     </hbox>
                                 </widget>
-                                <widget class="QLayoutWidget" row="0" column="2">
+                                <widget class="TQLayoutWidget" row="0" column="2">
                                     <property name="name">
-                                        <cstring>layout12</cstring>
+                                        <cstring>tqlayout12</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>genderLabel</cstring>
                                             </property>
@@ -200,7 +200,7 @@
                                                 <cstring>genderComboBox</cstring>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>genderCheckBox</cstring>
                                             </property>
@@ -241,15 +241,15 @@
                                         <enum>Vertical</enum>
                                     </property>
                                 </widget>
-                                <widget class="QLayoutWidget" row="1" column="0">
+                                <widget class="TQLayoutWidget" row="1" column="0">
                                     <property name="name">
-                                        <cstring>layout14</cstring>
+                                        <cstring>tqlayout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>volumeLabel</cstring>
                                             </property>
@@ -265,7 +265,7 @@
                                                 <cstring>volumeComboBox</cstring>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>volumeCheckBox</cstring>
                                             </property>
@@ -289,15 +289,15 @@
                                         </widget>
                                     </hbox>
                                 </widget>
-                                <widget class="QLayoutWidget" row="1" column="2">
+                                <widget class="TQLayoutWidget" row="1" column="2">
                                     <property name="name">
-                                        <cstring>layout13</cstring>
+                                        <cstring>tqlayout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>rateLabel</cstring>
                                             </property>
@@ -313,7 +313,7 @@
                                                 <cstring>rateComboBox</cstring>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>rateCheckBox</cstring>
                                             </property>
@@ -337,15 +337,15 @@
                                         </widget>
                                     </hbox>
                                 </widget>
-                                <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+                                <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                                     <property name="name">
-                                        <cstring>layout10</cstring>
+                                        <cstring>tqlayout10</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>languageLabel</cstring>
                                             </property>
@@ -385,7 +385,7 @@
                                                 <string>Click to select one or more languages.  This filter will be applied to text jobs of those languages.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>languageCheckBox</cstring>
                                             </property>
@@ -413,7 +413,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>useSpecificTalkerRadioButton</cstring>
                     </property>
@@ -424,9 +424,9 @@
                         <string>When checked, will use the specific Talker (if it is still configured), otherwise the Talker most closely matching.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -442,7 +442,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -559,7 +559,7 @@
     <tabstop>useSpecificTalkerRadioButton</tabstop>
     <tabstop>talkersListView</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 91ae8fe..14f0b83 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -34,8 +34,8 @@
 /**
  * Constructor.
  */
-Stretcher::Stretcher(TQObject *parent, const char *name) :
-    TQObject(parent, name)
+Stretcher::Stretcher(TQObject *tqparent, const char *name) :
+    TQObject(tqparent, name)
 {
     m_state = 0;
     m_stretchProc = 0;
@@ -61,7 +61,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
     if (m_stretchProc) return false;
     m_outFilename = outFilename;
     m_stretchProc = new KProcess;
-    TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
+    TQString stretchStr = TQString("%1").tqarg(stretchFactor, 0, 'f', 3);
     *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
     connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
         this, TQT_SLOT(slotProcessExited(KProcess*)));
diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h
index 676b690..e0c7e72 100644
--- a/kttsd/libkttsd/stretcher.h
+++ b/kttsd/libkttsd/stretcher.h
@@ -31,14 +31,15 @@
 
 class KProcess;
 
-class KDE_EXPORT Stretcher : public QObject{
+class KDE_EXPORT Stretcher : public TQObject{
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         /**
          * Constructor.
          */
-        Stretcher(TQObject *parent = 0, const char *name = 0);
+        Stretcher(TQObject *tqparent = 0, const char *name = 0);
 
         /**
          * Destructor.
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 08c89a1..2b3fbcf 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -34,7 +34,7 @@
 /**
  * Constructor.
  */
-TalkerCode::TalkerCode(const TQString &code/*=TQString::null*/, bool normal /*=false*/)
+TalkerCode::TalkerCode(const TQString &code/*=TQString()*/, bool normal /*=false*/)
 {
     if (!code.isEmpty())
         parseTalkerCode(code);
@@ -304,7 +304,7 @@ void TalkerCode::normalize()
 void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 {
     TQString fullLanguageCode;
-    if (talkerCode.contains("\""))
+    if (talkerCode.tqcontains("\""))
     {
         fullLanguageCode = talkerCode.section("lang=", 1, 1);
         fullLanguageCode = fullLanguageCode.section('"', 1, 1);
@@ -487,15 +487,15 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 * Uses KTrader to convert a translated Synth 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.
 */
 /*static*/ TQString TalkerCode::TalkerNameToDesktopEntryName(const TQString& name)
 {
-    if (name.isEmpty()) return TQString::null;
+    if (name.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin");
     for (uint ndx = 0; ndx < offers.count(); ++ndx)
         if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName();
-    return TQString::null;
+    return TQString();
 }
 
 /**
@@ -505,13 +505,13 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 */
 /*static*/ TQString TalkerCode::TalkerDesktopEntryNameToName(const TQString& desktopEntryName)
 {
-    if (desktopEntryName.isEmpty()) return TQString::null;
+    if (desktopEntryName.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
-    TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
+    TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
 
     if (offers.count() == 1)
         return offers[0]->name();
     else
-        return TQString::null;
+        return TQString();
 }
 
diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h
index 70e8ee6..f8cbc16 100644
--- a/kttsd/libkttsd/talkercode.h
+++ b/kttsd/libkttsd/talkercode.h
@@ -26,7 +26,7 @@
 #ifndef _TALKERCODE_H_
 #define _TALKERCODE_H_
 
-// Qt includes.
+// TQt includes.
 #include <tqstring.h>
 #include <kdemacros.h>
 #include "kdeexportfix.h"
@@ -38,7 +38,7 @@ class KDE_EXPORT TalkerCode
         /**
          * Constructor.
          */
-        TalkerCode(const TQString &code=TQString::null, bool normal=false);
+        TalkerCode(const TQString &code=TQString(), bool normal=false);
         /**
          * Copy Constructor.
          */
@@ -167,7 +167,7 @@ class KDE_EXPORT TalkerCode
         * Uses KTrader to convert a translated Synth 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.
         */
         static TQString TalkerNameToDesktopEntryName(const TQString& name);
 
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 1050ec2..155f2aa 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -22,7 +22,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
-// Qt includes.
+// TQt includes.
 #include <tqfile.h>
 
 // KDE includes.
@@ -44,9 +44,9 @@
 /**
  * Constructor.
  */
-TestPlayer::TestPlayer(TQObject *parent, const char *name,
+TestPlayer::TestPlayer(TQObject *tqparent, const char *name,
     const int playerOption, const float audioStretchFactor, const TQString &sinkName) :
-    TQObject(parent, name)
+    TQObject(tqparent, name)
 {
     m_playerOption = playerOption;
     m_audioStretchFactor = audioStretchFactor;
@@ -103,7 +103,7 @@ void TestPlayer::play(const TQString &waveFile)
         m_stretcher = new Stretcher();
         if (m_stretcher->stretch(playFile, tmpFile, m_audioStretchFactor))
         {
-            while (m_stretcher->getState() != Stretcher::ssFinished) qApp->processEvents();
+            while (m_stretcher->getState() != Stretcher::ssFinished) tqApp->processEvents();
             playFile = m_stretcher->getOutFilename();
         }
         delete m_stretcher;
@@ -123,7 +123,7 @@ void TestPlayer::play(const TQString &waveFile)
     // cleaning up the play object.  However, because we've been called from DCOP,
     // this seems to be necessary.  The call to processEvents is problematic because
     // it can cause re-entrancy.
-    while (m_player->playing()) qApp->processEvents();
+    while (m_player->playing()) tqApp->processEvents();
     // kdDebug() << "TestPlayer::play: stopping playback." << endl;
     m_player->stop();
     delete m_player;
@@ -162,7 +162,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
         }
     }
     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/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h
index f3e4e4b..c95c369 100644
--- a/kttsd/libkttsd/testplayer.h
+++ b/kttsd/libkttsd/testplayer.h
@@ -33,16 +33,16 @@ class Stretcher;
 
 // TODO: Make this work asynchronously.
 
-class KDE_EXPORT TestPlayer : public QObject{
+class KDE_EXPORT TestPlayer : public TQObject{
     public:
         /**
          * Constructor.
          * @param playerOption
          * @param audioStretchFactor
          */
-        TestPlayer(TQObject *parent = 0, const char *name = 0,
+        TestPlayer(TQObject *tqparent = 0, const char *name = 0,
             const int playerOption = 0, const float audioStretchFactor = 1.0,
-            const TQString &sinkName = TQString::null);
+            const TQString &sinkName = TQString());
 
         /**
          * Destructor.
diff --git a/kttsd/libkttsd/utils.cpp b/kttsd/libkttsd/utils.cpp
index ed9200b..df24e35 100644
--- a/kttsd/libkttsd/utils.cpp
+++ b/kttsd/libkttsd/utils.cpp
@@ -41,7 +41,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
     if(doc.startsWith("<?xml")) {
         // Look for ?> and strip everything off from there to the start - effectively removing
         // <?xml...?>
-        int xmlStatementEnd = doc.find("?>");
+        int xmlStatementEnd = doc.tqfind("?>");
         if(xmlStatementEnd == -1) {
             kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
             return false;
@@ -51,7 +51,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
     }
     // Take off leading comments, if they exist.
     while(doc.startsWith("<!--") || doc.startsWith(" <!--")) {
-        int commentStatementEnd = doc.find("-->");
+        int commentStatementEnd = doc.tqfind("-->");
         if(commentStatementEnd == -1) {
             kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
             return false;
@@ -61,7 +61,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
     }
     // Take off the doctype statement if it exists.
     while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) {
-        int doctypeStatementEnd = doc.find(">");
+        int doctypeStatementEnd = doc.tqfind(">");
         if(doctypeStatementEnd == -1) {
             kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n";
             return false;
@@ -76,9 +76,9 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa
 /** 
  * Check if an XML document has a certain DOCTYPE.
  * @param xmldoc             The document to check for the doctype.
- * @param name               The doctype name to check for. Pass TQString::null to not check the name.
- * @param publicId           The public ID to check for. Pass TQString::null to not check the ID.
- * @param systemId           The system ID to check for. Pass TQString::null to not check the ID.
+ * @param name               The doctype name to check for. Pass TQString() to not check the name.
+ * @param publicId           The public ID to check for. Pass TQString() to not check the ID.
+ * @param systemId           The system ID to check for. Pass TQString() to not check the ID.
  * @returns                  True if the parameters match the doctype, false otherwise.
 */
 bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const TQString &publicId, const TQString &systemId*/) {
@@ -88,7 +88,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const
     if(doc.startsWith("<?xml")) {
         // Look for ?> and strip everything off from there to the start - effectively removing
         // <?xml...?>
-        int xmlStatementEnd = doc.find("?>");
+        int xmlStatementEnd = doc.tqfind("?>");
         if(xmlStatementEnd == -1) {
             kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n";
             return false;
@@ -99,7 +99,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const
     }
     // Take off leading comments, if they exist.
     while(doc.startsWith("<!--")) {
-        int commentStatementEnd = doc.find("-->");
+        int commentStatementEnd = doc.tqfind("-->");
         if(commentStatementEnd == -1) {
             kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n";
             return false;
diff --git a/kttsd/libkttsd/utils.h b/kttsd/libkttsd/utils.h
index 62c4fc5..61711db 100644
--- a/kttsd/libkttsd/utils.h
+++ b/kttsd/libkttsd/utils.h
@@ -43,9 +43,9 @@ public:
     /** 
      * Check if an XML document has a certain DOCTYPE.
      * @param xmldoc             The document to check for the doctype.
-     * @param name                The doctype name to check for. Pass TQString::null to not check the name.
-     * @param publicId           The public ID to check for. Pass TQString::null to not check the ID.
-     * @param systemId          The system ID to check for. Pass TQString::null to not check the ID.
+     * @param name                The doctype name to check for. Pass TQString() to not check the name.
+     * @param publicId           The public ID to check for. Pass TQString() to not check the ID.
+     * @param systemId          The system ID to check for. Pass TQString() to not check the ID.
      * @returns                         true if the parameters match the doctype, false otherwise.
      */
     static bool hasDoctype(const TQString &xmldoc, const TQString &name/*, const TQString &publicId, const TQString &systemId*/);