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

This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d.

55 files changed, 312 insertions, 312 deletions

diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1
index 379d7f0..4b8743b 100644
--- a/kttsd/debian/man/kttsd.1
+++ b/kttsd/debian/man/kttsd.1
@@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager
 .B  --style  <style>
 sets the application GUI style
 .TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
+.B  --tqgeometry  <tqgeometry>
+sets the client tqgeometry of the main widget
 .TP
 .B  --nofork  
 Don't run in the background.
@@ -131,7 +131,7 @@ set XIM server
 disable XIM
 .TP
 .B  --reverse  
-mirrors the whole layout of widgets
+mirrors the whole tqlayout of widgets
 .SS 
 
 .SH SEE ALSO
diff --git a/kttsd/debian/man/kttsmgr.1 b/kttsd/debian/man/kttsmgr.1
index 547ff14..c01468f 100644
--- a/kttsd/debian/man/kttsmgr.1
+++ b/kttsd/debian/man/kttsmgr.1
@@ -61,8 +61,8 @@ Waits for a WM_NET compatible windowmanager
 .B  --style  <style>
 sets the application GUI style
 .TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
+.B  --tqgeometry  <tqgeometry>
+sets the client tqgeometry of the main widget
 .TP
 .B  --nofork  
 Don't run in the background.
@@ -130,7 +130,7 @@ set XIM server
 disable XIM
 .TP
 .B  --reverse  
-mirrors the whole layout of widgets
+mirrors the whole tqlayout of widgets
 .SS 
 
 .SH SEE ALSO
diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index 2752d5b..f33d771 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 using namespace std;
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index c3a3703..812a81d 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqradiobutton.h>
@@ -62,11 +62,11 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args
     // kdDebug() << "SbdConf::SbdConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "SbdConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new SbdConfWidget(this, "SbdConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Determine if tdeutils Regular Expression Editor is installed.
     m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index 1b57c98..e7158dc 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -35,7 +35,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -74,7 +74,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -87,7 +87,7 @@
                     <property name="text">
                         <string>&amp;Sentence boundary regular expression:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout17_2</cstring>
+                <cstring>tqlayout17_2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -131,7 +131,7 @@
                     <property name="text">
                         <string>&amp;Replacement sentence boundary:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -168,7 +168,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -181,7 +181,7 @@
                             <property name="text">
                                 <string>&amp;Language is:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -199,7 +199,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -213,7 +213,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -221,7 +221,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -265,7 +265,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp
index 98eec0d..107e6b3 100644
--- a/kttsd/filters/sbd/sbdproc.cpp
+++ b/kttsd/filters/sbd/sbdproc.cpp
@@ -306,7 +306,7 @@ TQString SbdThread::endSentence()
     return s;
 }
 
-// Parses a node of the SSML tree and recursively parses its children.
+// Parses a node of the SSML tree and recursively parses its tqchildren.
 // Returns the filtered text with each sentence a complete ssml tree.
 TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re )
 {
@@ -441,7 +441,7 @@ TQString SbdThread::parseSsml( const TQString& inputText, const TQString& re )
     // This flag is used to close out a previous sentence.
     m_sentenceStarted = false;
 
-    // Get the root element (speak) and recursively process its children.
+    // Get the root element (speak) and recursively process its tqchildren.
     TQDomElement docElem = doc.documentElement();
     TQDomNode n = docElem.firstChild();
     TQString ssml = parseSsmlNode( docElem, re );
diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h
index d49f72c..0c1e7aa 100644
--- a/kttsd/filters/sbd/sbdproc.h
+++ b/kttsd/filters/sbd/sbdproc.h
@@ -204,7 +204,7 @@ class SbdThread: public TQObject, public TQThread
         TQString startSentence();
         // Ends a sentence and appends a Tab.
         TQString endSentence();
-        // Parses a node of the SSML tree and recursively parses its children.
+        // Parses a node of the SSML tree and recursively parses its tqchildren.
         // Returns the filtered text with each sentence a complete ssml tree.
         TQString parseSsmlNode( TQDomNode& n, const TQString& re );
 
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index 8c61932..d672bbd 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -21,7 +21,7 @@
             <verstretch>255</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -33,7 +33,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,7 +63,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -128,7 +128,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -136,7 +136,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -157,7 +157,7 @@
                             <property name="text">
                                 <string>&amp;Replace with:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -179,7 +179,7 @@
                             <property name="text">
                                 <string>&amp;Match:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -190,7 +190,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index cad745e..4d4ea72 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqdom.h>
 #include <tqfile.h>
@@ -67,11 +67,11 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons
     // kdDebug() << "StringReplacerConf::StringReplacerConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "StringReplacerConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
     m_widget->substLView->setSortColumn(-1);
 
     connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index d18b541..73c5954 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -23,7 +23,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="text">
                                 <string>Lan&amp;guage is:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -126,7 +126,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -170,7 +170,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -243,7 +243,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout24</cstring>
+                <cstring>tqlayout24</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -303,7 +303,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout23</cstring>
+                        <cstring>tqlayout23</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -427,7 +427,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h
index f3efb90..0fffbc9 100644
--- a/kttsd/filters/stringreplacer/stringreplacerproc.h
+++ b/kttsd/filters/stringreplacer/stringreplacerproc.h
@@ -27,7 +27,7 @@
 
 // TQt includes.
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvaluelist.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index 805e7df..2e539f1 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -24,7 +24,7 @@
 // TQt includes.
 #include <tqstring.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes.
 #include <klocale.h>
@@ -55,11 +55,11 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const
     // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Determine if tdeutils Regular Expression Editor is installed.
     m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index a6a2dfa..1969489 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -23,7 +23,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="text">
                                 <string>Te&amp;xt contains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
                             <property name="text">
                                 <string>Application &amp;ID contains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -126,7 +126,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -167,7 +167,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout19_2</cstring>
+                <cstring>tqlayout19_2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -228,7 +228,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index 41a24d2..c143f21 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -23,7 +23,7 @@
 
 // TQt includes.
 #include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes.
 #include <klocale.h>
@@ -49,11 +49,11 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons
     // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl;
 
     // Create configuration widget.
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "XmlTransformerConfWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Set up defaults.
     defaults();
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 471446b..63a83c3 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -22,7 +22,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -72,7 +72,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string>&amp;XSLT file:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -107,7 +107,7 @@
                     <property name="text">
                         <string>xsltproc &amp;executable:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -135,7 +135,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -169,7 +169,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -182,7 +182,7 @@
                             <property name="text">
                                 <string>&amp;Root element is:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
                             <property name="text">
                                 <string>or DOC&amp;TYPE is:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -217,7 +217,7 @@
                             <property name="text">
                                 <string>and Application &amp;ID contains:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index 8fa9e4b..dcd9e74 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -373,13 +373,13 @@ void XmlTransformerProc::slotProcessExited(KProcess*)
 
 void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/)
 {
-    // TQString buf = TQString::fromLatin1(buffer, buflen);
+    // TQString buf = TQString::tqfromLatin1(buffer, buflen);
     // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl;
 }
 
 void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl;
 }
 
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index ae48c61..4769c21 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>351</width>
                             <height>21</height>
@@ -94,7 +94,7 @@
                     <property name="text">
                         <string>&amp;Synthesizer:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
                     <property name="text">
                         <string>Show All</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -199,7 +199,7 @@
                     <property name="text">
                         <string>&amp;Language:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 79a18c0..c81feea 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -28,7 +28,7 @@
 #include <tqtabwidget.h>
 #include <tqcheckbox.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqslider.h>
 #include <tqlabel.h>
@@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
     m_suppressConfigChanged = false;
 
     // Add the KTTS Manager widget
-    TQGridLayout *layout = new TQGridLayout(this, 0, 0);
+    TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0);
     m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw");
     // m_kttsmgrw = new KCMKttsMgrWidget(this);
-    layout->addWidget(m_kttsmgrw, 0, 0);
+    tqlayout->addWidget(m_kttsmgrw, 0, 0);
 
     // Give buttons icons.
     // Talkers tab.
@@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
-        TQString("DesktopEntryName == '%1'").arg(name));
+        TQString("DesktopEntryName == '%1'").tqarg(name));
 
     if (offers.count() == 1)
     {
@@ -1144,7 +1144,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName)
 
     // Find the plugin.
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").arg(plugInName));
+        TQString("DesktopEntryName == '%1'").tqarg(plugInName));
 
     if (offers.count() == 1)
     {
@@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter()
         true,
         true);
     m_configDlg->setInitialSize(TQSize(600, 450), false);
-    m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint());
+    m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint());
     m_loadedFilterPlugIn->show();
     m_configDlg->setMainWidget(m_loadedFilterPlugIn);
     m_configDlg->setHelp("configure-filter", "kttsd");
@@ -2221,7 +2221,7 @@ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryNa
 {
     if (desktopEntryName.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
-        TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
+        TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
 
     if (offers.count() == 1)
         return offers[0]->name();
@@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
     else
     {
         if (event == "default")
-            eventName = i18n("All other %1 events").arg(eventSrcName);
+            eventName = i18n("All other %1 events").tqarg(eventSrcName);
         else
             eventName = NotifyEvent::getEventName(eventSrc, event);
     }
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 766a1a2..b5c7a6b 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -83,7 +83,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -92,7 +92,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout5</cstring>
+                            <cstring>tqlayout5</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -108,7 +108,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -133,7 +133,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout5_2</cstring>
+                            <cstring>tqlayout5_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -149,7 +149,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -286,7 +286,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
-                            <cstring>layout9</cstring>
+                            <cstring>tqlayout9</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -407,7 +407,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -495,7 +495,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="0">
                                 <property name="name">
-                                    <cstring>layout21</cstring>
+                                    <cstring>tqlayout21</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -535,7 +535,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout28</cstring>
+                                    <cstring>tqlayout28</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -576,7 +576,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>152</width>
                                                 <height>20</height>
@@ -690,7 +690,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="0">
                                 <property name="name">
-                                    <cstring>layout19_2</cstring>
+                                    <cstring>tqlayout19_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -753,7 +753,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout17</cstring>
+                            <cstring>tqlayout17</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -780,7 +780,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -818,7 +818,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout14</cstring>
+                            <cstring>tqlayout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -848,7 +848,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9_2</cstring>
+                                    <cstring>tqlayout9_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -975,7 +975,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -988,7 +988,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>layout18</cstring>
+                            <cstring>tqlayout18</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1018,7 +1018,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout16</cstring>
+                                    <cstring>tqlayout16</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1053,7 +1053,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>11</height>
@@ -1079,7 +1079,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout15</cstring>
+                            <cstring>tqlayout15</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -1229,7 +1229,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>180</height>
@@ -1251,7 +1251,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout12</cstring>
+                            <cstring>tqlayout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1291,7 +1291,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout13</cstring>
+                            <cstring>tqlayout13</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1391,7 +1391,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -1408,7 +1408,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>90</width>
                                 <height>20</height>
@@ -1439,7 +1439,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>layout8</cstring>
+                                    <cstring>tqlayout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1482,7 +1482,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
-                                    <cstring>layout8_2_2</cstring>
+                                    <cstring>tqlayout8_2_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1582,7 +1582,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>layout21</cstring>
+                                    <cstring>tqlayout21</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1613,7 +1613,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout8_2</cstring>
+                                            <cstring>tqlayout8_2</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 0d9fe60..44226b7 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -61,10 +61,10 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ
         if ( !relativePath.isEmpty() )
         {
             KConfig* config = new KConfig(relativePath, true, false, "data");
-            config->setGroup( TQString::fromLatin1("!Global!") );
-            TQString icon = config->readEntry(TQString::fromLatin1("IconName"),
-                TQString::fromLatin1("misc"));
-            TQString description = config->readEntry( TQString::fromLatin1("Comment"),
+            config->setGroup( TQString::tqfromLatin1("!Global!") );
+            TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"),
+                TQString::tqfromLatin1("misc"));
+            TQString description = config->readEntry( TQString::tqfromLatin1("Comment"),
                 i18n("No description available") );
             delete config;
             int index = relativePath.find( '/' );
@@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
     eventsListView->clear();
     TQListViewItem* item = 0;
     TQString eventSrc = m_eventSrcNames[index];
-    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
     TQStringList eventNames = config->groupList();
     uint eventNamesCount = eventNames.count();
@@ -99,8 +99,8 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
         if ( eventName != "!Global!" )
         {
             config->setGroup( eventName );
-            TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ),
-                config->readEntry( TQString::fromLatin1( "Name" )));
+            TQString eventDesc = config->readEntry( TQString::tqfromLatin1( "Comment" ),
+                config->readEntry( TQString::tqfromLatin1( "Name" )));
             if ( !item )
                 item = new KListViewItem( eventsListView, eventDesc, eventName );
             else
@@ -110,7 +110,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
     delete config;
     eventsListView->sort();
     item = eventsListView->lastChild();
-    TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText());
+    TQString eventDesc = i18n("All other %1 events").tqarg(eventSrcComboBox->currentText());
     if ( !item )
         item = new KListViewItem( eventsListView, eventDesc, "default" );
     else
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);
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 7ed6ab2..2d6477e 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -20,7 +20,7 @@
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqpushbutton.h>
 #include <tqobjectlist.h>
 #include <tqwhatsthis.h>
@@ -163,7 +163,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
     hbox3->setSpacing(6);
 
     // Do not let button box stretch vertically.
-    m_buttonBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    m_buttonBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 
     // All the buttons with "job_" at start of their names will be enabled/disabled when a job is
     // selected in the Job List View.
@@ -274,7 +274,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
 
     // Create a label for current sentence.
     TQLabel* currentSentenceLabel = new TQLabel(sentenceVBox);
-    currentSentenceLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+    currentSentenceLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
     currentSentenceLabel->setText(i18n("Current Sentence"));
 
     // Create a box to contain the current sentence.
@@ -506,7 +506,7 @@ void KttsJobMgrPart::slot_job_change_talker()
 void KttsJobMgrPart::slot_speak_clipboard()
 {
     // Get the clipboard object.
-    TQClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = kapp->tqclipboard();
 
 
     // Copy text from the clipboard.
@@ -518,7 +518,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
         {
             if (supportsMarkup(NULL, KSpeech::mtHtml))
             {
-                TQByteArray d = data->encodedData("text/html");
+                TQByteArray d = data->tqencodedData("text/html");
                 text = TQString(d);
             }
         }
@@ -526,7 +526,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
         {
             if (supportsMarkup(NULL, KSpeech::mtSsml))
             {
-                TQByteArray d = data->encodedData("text/ssml");
+                TQByteArray d = data->tqencodedData("text/ssml");
                 text = TQString(d);
             }
         }
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index f633a11..da9001b 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -148,14 +148,14 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent)
 
     KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(parentWidget());
 
-    TQRect r(kttsMgrTray->geometry());
+    TQRect r(kttsMgrTray->tqgeometry());
     if ( !r.isValid() )
         return;
 
     TQString status = "<qt><b>KTTSMgr</b> - ";
     status += i18n("<qt>Text-to-Speech Manager");
     status += "<br/><br/>";
-    status += kttsMgrTray->getStatus();
+    status += kttsMgrTray->gettqStatus();
     status += "</qt>";
 
     tip(r, status);
@@ -257,7 +257,7 @@ TQString KttsMgrTray::stateToStr(int state)
     }
 }
 
-TQString KttsMgrTray::getStatus()
+TQString KttsMgrTray::gettqStatus()
 {
     if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running");
     uint jobCount = getTextJobCount();
@@ -273,7 +273,7 @@ TQString KttsMgrTray::getStatus()
             int sentenceCount = getTextCount(job);
             uint seq = moveRelTextSentence(0, job);
             status += i18n(", current job %1 at sentence %2 of %3 sentences"
-                ).arg(stateToStr(jobState)).arg(seq).arg(sentenceCount);
+                ).tqarg(stateToStr(jobState)).tqarg(seq).tqarg(sentenceCount);
         }
     }
     return status;
diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h
index 92245da..a2a99df 100644
--- a/kttsd/kttsmgr/kttsmgr.h
+++ b/kttsd/kttsmgr/kttsmgr.h
@@ -55,7 +55,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee
         ~KttsMgrTray();
 
         void setExitWhenFinishedSpeaking();
-        TQString getStatus();
+        TQString gettqStatus();
 
     protected:
         // ASYNC textStarted(const TQCString& appId, uint jobNum);
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index bd2fbd1..a226675 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -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/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index 317113f..bcd79fd 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -17,7 +17,7 @@
 
 // TQt includes. 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // KDE includes.
 #include <kdebug.h>
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index be55d45..6a0541b 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -127,7 +127,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>layout11_2</cstring>
+                                        <cstring>tqlayout11_2</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -140,7 +140,7 @@
                                             <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">
@@ -178,7 +178,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="2">
                                     <property name="name">
-                                        <cstring>layout12</cstring>
+                                        <cstring>tqlayout12</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -243,7 +243,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="0">
                                     <property name="name">
-                                        <cstring>layout14</cstring>
+                                        <cstring>tqlayout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -291,7 +291,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="2">
                                     <property name="name">
-                                        <cstring>layout13</cstring>
+                                        <cstring>tqlayout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -339,7 +339,7 @@
                                 </widget>
                                 <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">
@@ -426,7 +426,7 @@
                 </widget>
                 <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>
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 91ae8fe..6af8baf 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -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/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index c0d26ed..53be627 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -507,7 +507,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 {
     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();
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 06d97cf..f83a7e4 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -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/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index 23edec2..531dd16 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -432,10 +432,10 @@ TQStringList AlsaPlayer::getPluginList( const TQCString& /*classname*/ )
                 infoName += snd_pcm_info_get_name(pcminfo);
                 infoName += ")";
                 if (0 == devCnt) {
-                    TQString pcmName = TQString("default:%1").arg(card);
+                    TQString pcmName = TQString("default:%1").tqarg(card);
                     result.append(pcmName + infoName);
                 }
-                TQString pcmName = TQString("plughw:%1,%2").arg(card).arg(device);
+                TQString pcmName = TQString("plughw:%1,%2").tqarg(card).tqarg(device);
                 result.append(pcmName + infoName);
             }
             snd_ctl_close(handle);
@@ -1496,7 +1496,7 @@ void AlsaPlayer::header(int /*rtype*/, const char* /*name*/)
     else if (hwdata.channels == 2)
         channels = "Stereo";
     else
-        channels = TQString("Channels %1").arg(hwdata.channels);
+        channels = TQString("Channels %1").tqarg(hwdata.channels);
     DBG("Format: %s, Rate %d Hz, %s",
         snd_pcm_format_description(hwdata.format),
         hwdata.rate,
diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp
index efc1916..bfd62d0 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.cpp
+++ b/kttsd/players/gstplayer/gstreamerplayer.cpp
@@ -189,12 +189,12 @@ bool GStreamerPlayer::requireVersion(uint major, uint minor, uint micro)
     }
 
     gst_version(&gmajor, &gminor, &gmicro);
-    // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
+    // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
     if (gmajor > major) return true;
     if (gminor > minor) return true;
     if (gmicro >= micro) return true;
-    kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
-    kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").arg(major).arg(minor).arg(micro) << endl;
+    kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
+    kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").tqarg(major).tqarg(minor).tqarg(micro) << endl;
     return false;
 }
 
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9cbba40..9045f14 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -16,11 +16,11 @@
  ***************************************************************************/
 
 // TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // KDE includes.
 #include <kdialog.h>
@@ -48,11 +48,11 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
     m_commandProc = 0;
     m_progressDlg = 0;
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "CommandConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new CommandConfWidget(this, "CommandConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Build codec list and fill combobox.
     m_codecList = PlugInProc::buildCodecList();
@@ -127,12 +127,12 @@ TQString CommandConf::getTalkerCode()
                 "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                 "<prosody volume=\"%4\" rate=\"%5\" />"
                 "<kttsd synthesizer=\"%6\" />")
-                .arg(m_languageCode)
-                .arg("fixed")
-                .arg("neutral")
-                .arg("medium")
-                .arg("medium")
-                .arg("Command");
+                .tqarg(m_languageCode)
+                .tqarg("fixed")
+                .tqarg("neutral")
+                .tqarg("medium")
+                .tqarg("medium")
+                .tqarg("Command");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 75ce080..8db709c 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -74,7 +74,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="5" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -101,7 +101,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>201</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index ddc8a8c..d1eb223 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvaluestack.h>
 
 // KDE includes.
@@ -382,13 +382,13 @@ void CommandProc::slotProcessExited(KProcess*)
 
 void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
 }
 
 void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index 6ad86e5..a755ac8 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -27,8 +27,8 @@
 // TQt includes.
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <textcodec.h>
-#include <layout.h>
+#include <tqtextcodec.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 
 // KDE includes.
@@ -55,11 +55,11 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar
     m_eposProc = 0;
     m_progressDlg = 0;
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "EposConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new EposConfWidget(this, "EposConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     // Build codec list and fill combobox.
     m_codecList = PlugInProc::buildCodecList();
@@ -194,12 +194,12 @@ TQString EposConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .arg(m_languageCode)
-                    .arg("fixed")
-                    .arg("neutral")
-                    .arg("medium")
-                    .arg(rate)
-                    .arg("Epos TTS Synthesis System");
+                    .tqarg(m_languageCode)
+                    .tqarg("fixed")
+                    .tqarg("neutral")
+                    .tqarg("medium")
+                    .tqarg(rate)
+                    .tqarg("Epos TTS Synthesis System");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index c66a081..1c5c0d8 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -67,7 +67,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout17</cstring>
+                        <cstring>tqlayout17</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout14</cstring>
+                                <cstring>tqlayout14</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -174,7 +174,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout15</cstring>
+                                <cstring>tqlayout15</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -246,7 +246,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout16</cstring>
+                                <cstring>tqlayout16</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -316,7 +316,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -324,7 +324,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -345,7 +345,7 @@
                                     <property name="text">
                                         <string>Epos server executable path:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -370,7 +370,7 @@
                                     <property name="text">
                                         <string>Epos client executable path:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -384,7 +384,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -445,7 +445,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>layout14</cstring>
+                                <cstring>tqlayout14</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -453,7 +453,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget" row="0" column="1">
                                     <property name="name">
-                                        <cstring>layout13</cstring>
+                                        <cstring>tqlayout13</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -479,7 +479,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>layout12</cstring>
+                                        <cstring>tqlayout12</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -500,7 +500,7 @@
                                             <property name="text">
                                                 <string>Epos server:</string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -525,7 +525,7 @@
                                             <property name="text">
                                                 <string>Epos client:</string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -543,7 +543,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -559,7 +559,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>410</width>
                                     <height>20</height>
diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index ab26e92..670a1c4 100644
--- a/kttsd/plugins/epos/eposproc.cpp
+++ b/kttsd/plugins/epos/eposproc.cpp
@@ -28,7 +28,7 @@
 // TQt includes.
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 // KDE includes.
@@ -210,7 +210,7 @@ void EposProc::synth(
     *m_eposProc << eposClientExePath;
     // Language.
     if (!eposLanguage.isEmpty())
-        *m_eposProc << TQString("--language=%1").arg(eposLanguage);
+        *m_eposProc << TQString("--language=%1").tqarg(eposLanguage);
     // Rate (speed).
     // Map 50% to 200% onto 0 to 1000.
     // slider = alpha * (log(percent)-log(50))
@@ -221,10 +221,10 @@ void EposProc::synth(
     slider = slider - 500;
     // Map -500 to 500 onto 45 to -45 then shift to 130 to 40 (85 midpoint).
     float stretchValue = (-float(slider) * 45.0 / 500.0) + 85.0;
-    TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3);
+    TQString timeMsg = TQString("--init_t=%1").tqarg(stretchValue, 0, 'f', 3);
     *m_eposProc << timeMsg;
     // Pitch.  Map 50% to 200% onto 50 to 200.  easy.
-    TQString pitchMsg = TQString("--init_f=%1").arg(pitch);
+    TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch);
     *m_eposProc << pitchMsg;
     // Output file.
     if (!suggestedFilename.isEmpty()) 
@@ -326,13 +326,13 @@ void EposProc::slotProcessExited(KProcess*)
 
 void EposProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl;
 }
 
 void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "EposProc::slotReceivedStderr: Received error from Epos: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index ebe2c3f..f2126b0 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -25,7 +25,7 @@
 #include <math.h>
 
 // TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -33,7 +33,7 @@
 #include <tqdir.h>
 #include <tqslider.h>
 #include <tqdom.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // KDE includes.
 #include <kdialog.h>
@@ -65,11 +65,11 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt
     m_progressDlg = 0;
     m_supportsSSML = FestivalIntProc::ssUnknown;
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "FestivalIntConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
 
     m_widget->festivalPath->setMode(KFile::File | KFile::ExistingOnly);
     m_widget->festivalPath->setFilter("*");
@@ -229,12 +229,12 @@ TQString FestivalIntConf::getTalkerCode()
             "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
             "<prosody volume=\"%4\" rate=\"%5\" />"
             "<kttsd synthesizer=\"%6\" />")
-            .arg(voiceTemp.languageCode)
-            .arg(voiceTemp.code)
-            .arg(voiceTemp.gender)
-            .arg(volume)
-            .arg(rate)
-            .arg("Festival Interactive");
+            .tqarg(voiceTemp.languageCode)
+            .tqarg(voiceTemp.code)
+            .tqarg(voiceTemp.gender)
+            .tqarg(volume)
+            .tqarg(rate)
+            .tqarg("Festival Interactive");
     return normalTalkerCode;
 }
 
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 76a570f..470ec7d 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -94,7 +94,7 @@
                             <property name="text">
                                 <string>&amp;Festival executable:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -143,7 +143,7 @@
                             <property name="text">
                                 <string>&amp;Select voice:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -182,7 +182,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -190,7 +190,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout8</cstring>
+                                <cstring>tqlayout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -266,7 +266,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout9</cstring>
+                                <cstring>tqlayout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -369,7 +369,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -471,7 +471,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -498,7 +498,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>101</width>
                                     <height>20</height>
@@ -520,7 +520,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index a6de02e..6e3a9f3 100644
--- a/kttsd/plugins/festivalint/festivalintproc.cpp
+++ b/kttsd/plugins/festivalint/festivalintproc.cpp
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqthread.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // KDE includes.
 #include <kdebug.h>
@@ -268,11 +268,11 @@ void FestivalIntProc::synth(
             slider = slider - 500;
             // Map -500 to 500 onto 0.15 to -0.15.
             float stretchValue = -float(slider) * 0.15 / 500.0;
-            timeMsg = TQString("(set! hts_duration_stretch %1)").arg(
+            timeMsg = TQString("(set! hts_duration_stretch %1)").tqarg(
                     stretchValue, 0, 'f', 3);
         }
         else
-            timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg(
+            timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg(
                 1.0/(float(time)/100.0), 0, 'f', 2);
         sendToFestival(timeMsg);
         m_runningTime = time;
@@ -292,7 +292,7 @@ void FestivalIntProc::synth(
         }
         TQString pitchMsg = TQString(
             "(set! int_lr_params '((target_f0_mean %1) (target_f0_std 14)"
-            "(model_f0_mean 170) (model_f0_std 34)))").arg(pitchValue, 0, 10);
+            "(model_f0_mean 170) (model_f0_std 34)))").tqarg(pitchValue, 0, 10);
         sendToFestival(pitchMsg);
         m_runningPitch = pitch;
     }
@@ -500,7 +500,7 @@ void FestivalIntProc::slotProcessExited(KProcess*)
 
 void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     // kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl;
     bool promptSeen = (buf.contains("festival>") > 0);
     bool emitQueryVoicesFinished = false;
@@ -569,7 +569,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 
 void FestivalIntProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "FestivalIntProc::slotReceivedStderr: Received error from Festival: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index a205511..076fcb0 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -22,7 +22,7 @@
  ******************************************************************************/
 
 // TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfile.h>
 #include <tqapplication.h>
 
@@ -49,11 +49,11 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*
     m_fliteProc = 0;
     m_progressDlg = 0;
     
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
         KDialog::spacingHint(), "FliteConfigWidgetLayout");
-    layout->setAlignment (TQt::AlignTop);
+    tqlayout->tqsetAlignment (TQt::AlignTop);
     m_widget = new FliteConfWidget(this, "FliteConfigWidget");
-    layout->addWidget(m_widget);
+    tqlayout->addWidget(m_widget);
     
     defaults();
     
@@ -115,12 +115,12 @@ TQString FliteConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .arg(m_languageCode)
-                    .arg("fixed")
-                    .arg("neutral")
-                    .arg("medium")
-                    .arg("medium")
-                    .arg("Festival Lite (flite)");
+                    .tqarg(m_languageCode)
+                    .tqarg("fixed")
+                    .tqarg("neutral")
+                    .tqarg("medium")
+                    .tqarg("medium")
+                    .tqarg("Festival Lite (flite)");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 8efcbb1..21d2471 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -41,7 +41,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
@@ -111,7 +111,7 @@
                             <property name="text">
                                 <string>&amp;Flite executable path:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>221</width>
                             <height>20</height>
diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp
index 3f0df60..238cf26 100644
--- a/kttsd/plugins/flite/fliteproc.cpp
+++ b/kttsd/plugins/flite/fliteproc.cpp
@@ -218,13 +218,13 @@ void FliteProc::slotProcessExited(KProcess*)
 
 void FliteProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl;
 }
 
 void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
 {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     kdDebug() << "FliteProc::slotReceivedStderr: Received error from Flite: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index cdded33..87f12b4 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // TQt includes. 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -47,11 +47,11 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList
 	m_freettsProc = 0;
         m_progressDlg = 0;
 	
-	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
 								KDialog::spacingHint(), "FreeTTSConfigWidgetLayout");
-	layout->setAlignment (TQt::AlignTop);
+	tqlayout->tqsetAlignment (TQt::AlignTop);
 	m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget");
-	layout->addWidget(m_widget);
+	tqlayout->addWidget(m_widget);
 		
 	defaults();
 	
@@ -119,12 +119,12 @@ TQString FreeTTSConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .arg(m_languageCode)
-                    .arg("fixed")
-                    .arg("neutral")
-                    .arg("medium")
-                    .arg("medium")
-                    .arg("FreeTTS");
+                    .tqarg(m_languageCode)
+                    .tqarg("fixed")
+                    .tqarg("neutral")
+                    .tqarg("medium")
+                    .tqarg("medium")
+                    .tqarg("FreeTTS");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index e93f3ba..0fd8f62 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -38,7 +38,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -108,7 +108,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -148,7 +148,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>410</width>
                                     <height>20</height>
diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index c7b2200..e99cd73 100644
--- a/kttsd/plugins/freetts/freettsproc.cpp
+++ b/kttsd/plugins/freetts/freettsproc.cpp
@@ -206,12 +206,12 @@ void FreeTTSProc::slotProcessExited(KProcess*) {
 }
 
 void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) {
-	TQString buf = TQString::fromLatin1(buffer, buflen);
+	TQString buf = TQString::tqfromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
 }
 
 void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
-	TQString buf = TQString::fromLatin1(buffer, buflen);
+	TQString buf = TQString::tqfromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl;
 }
 
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 3a577de..798455c 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 // TQt includes. 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqstring.h>
@@ -92,15 +92,15 @@ class HadifixConfPrivate {
             TQString name = TQFileInfo(*it).fileName();
             gender = HadifixProc::determineGender(defaultMbrolaExec, *it);
             if (gender == HadifixProc::MaleGender)
-                configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name));
+                configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").tqarg(name));
             else if (gender == HadifixProc::FemaleGender)
-                configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
+                configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
             else {
                if (name == "de1")
-                   configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
+                   configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
                else {
-                   configWidget->addVoice(*it, true,  i18n("Unknown voice \"%1\"").arg(name));
-                   configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(name));
+                   configWidget->addVoice(*it, true,  i18n("Unknown voice \"%1\"").tqarg(name));
+                   configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name));
                }
             }
          }
@@ -206,8 +206,8 @@ class HadifixConfPrivate {
 HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : 
    PlugInConf( parent, name ){
    // kdDebug() << "HadifixConf::HadifixConf: Running" << endl;
-   TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
-   layout->setAlignment (TQt::AlignTop); 
+   TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
+   tqlayout->tqsetAlignment (TQt::AlignTop); 
 
    d = new HadifixConfPrivate();
    d->configWidget = new HadifixConfigUI (this, "configWidget");
@@ -224,7 +224,7 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList
    d->initializeCharacterCodes();
    d->initializeVoices();
    d->setDefaults();
-   layout->addWidget (d->configWidget);
+   tqlayout->addWidget (d->configWidget);
 }
 
 /** Destructor */
@@ -284,12 +284,12 @@ TQString HadifixConf::getTalkerCode()
                     "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
                     "<prosody volume=\"%4\" rate=\"%5\" />"
                     "<kttsd synthesizer=\"%6\" />")
-                    .arg(d->languageCode)
-                    .arg(voiceCode)
-                    .arg(gender)
-                    .arg(volume)
-                    .arg(rate)
-                    .arg("Hadifix");
+                    .tqarg(d->languageCode)
+                    .tqarg(voiceCode)
+                    .tqarg(gender)
+                    .tqarg(volume)
+                    .tqarg(rate)
+                    .tqarg("Hadifix");
         }
     }
     return TQString();
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 8a686c2..a280945 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -470,7 +470,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -525,7 +525,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>240</width>
                             <height>20</height>
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 64a4200..4c3f85f 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -18,7 +18,7 @@
  
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
@@ -184,9 +184,9 @@ void HadifixProc::synth(TQString text,
 
    TQString mbrolaCommand = d->hadifixProc->quote(mbrola);
    mbrolaCommand += " -e"; //Ignore fatal errors on unkown diphone
-   mbrolaCommand += TQString(" -v %1").arg(volume/100.0); // volume ratio
-   mbrolaCommand += TQString(" -f %1").arg(pitch/100.0);  // freqency ratio
-   mbrolaCommand += TQString(" -t %1").arg(1/(time/100.0));   // time ratio
+   mbrolaCommand += TQString(" -v %1").tqarg(volume/100.0); // volume ratio
+   mbrolaCommand += TQString(" -f %1").tqarg(pitch/100.0);  // freqency ratio
+   mbrolaCommand += TQString(" -t %1").tqarg(1/(time/100.0));   // time ratio
    mbrolaCommand += " " + d->hadifixProc->quote(voice);
    mbrolaCommand += " - " + d->hadifixProc->quote(waveFilename);
 
@@ -389,11 +389,11 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
 }
 
 void HadifixProc::receivedStdout (KProcess *, char *buffer, int buflen) {
-   stdOut += TQString::fromLatin1(buffer, buflen);
+   stdOut += TQString::tqfromLatin1(buffer, buflen);
 }
 
 void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
-   stdErr += TQString::fromLatin1(buffer, buflen);
+   stdErr += TQString::tqfromLatin1(buffer, buflen);
 }
 
 /**
diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h
index 1d0033e..dfd177d 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui.h
+++ b/kttsd/plugins/hadifix/voicefileui.ui.h
@@ -24,12 +24,12 @@ void VoiceFileWidget::genderButton_clicked()
     }
     else if (gender == HadifixProc::NoGender) {
        KMessageBox::sorry (this,
-                    i18n("The gender of the voice file %1 could not be detected.").arg(voiceFileURL->url()),
+                    i18n("The gender of the voice file %1 could not be detected.").tqarg(voiceFileURL->url()),
                     i18n("Trying to Determine the Gender - Hadifix Plug In"));
     }
     else {
        KMessageBox::detailedSorry (this,
-                    i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()),
+                    i18n("The file %1 does not seem to be a voice file.").tqarg(voiceFileURL->url()),
                     details, i18n("Trying to Determine the Gender - Hadifix Plug In"));
     }
 }