From f46912a1a50c5ca06eb713e43e170f5ac47bb680 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:10 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d.
---
 kttsd/plugins/epos/eposconf.cpp      | 22 +++++++++++-----------
 kttsd/plugins/epos/eposconfwidget.ui | 34 +++++++++++++++++-----------------
 kttsd/plugins/epos/eposproc.cpp      | 12 ++++++------
 3 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'kttsd/plugins/epos')

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;
 }
 
-- 
cgit v1.2.1