summaryrefslogtreecommitdiffstats
path: root/kttsd/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:44:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:44:52 -0600
commit23aecb275d6085b7a15a38da0180edf156c8ea9d (patch)
tree1acc5451905a1fdd8b967d901399226fe72d8d03 /kttsd/plugins
parent2d8b424e2324165d85cb4694a58464c6d7022f45 (diff)
downloadtdeaccessibility-23aecb275d6085b7a15a38da0180edf156c8ea9d.tar.gz
tdeaccessibility-23aecb275d6085b7a15a38da0180edf156c8ea9d.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kttsd/plugins')
-rw-r--r--kttsd/plugins/command/commandconf.cpp22
-rw-r--r--kttsd/plugins/command/commandconfwidget.ui8
-rw-r--r--kttsd/plugins/command/commandproc.cpp6
-rw-r--r--kttsd/plugins/epos/eposconf.cpp22
-rw-r--r--kttsd/plugins/epos/eposconfwidget.ui34
-rw-r--r--kttsd/plugins/epos/eposproc.cpp12
-rw-r--r--kttsd/plugins/festivalint/festivalintconf.cpp22
-rw-r--r--kttsd/plugins/festivalint/festivalintconfwidget.ui18
-rw-r--r--kttsd/plugins/festivalint/festivalintproc.cpp12
-rw-r--r--kttsd/plugins/flite/fliteconf.cpp20
-rw-r--r--kttsd/plugins/flite/fliteconfwidget.ui6
-rw-r--r--kttsd/plugins/flite/fliteproc.cpp4
-rw-r--r--kttsd/plugins/freetts/freettsconf.cpp20
-rw-r--r--kttsd/plugins/freetts/freettsconfigwidget.ui8
-rw-r--r--kttsd/plugins/freetts/freettsproc.cpp4
-rw-r--r--kttsd/plugins/hadifix/hadifixconf.cpp30
-rw-r--r--kttsd/plugins/hadifix/hadifixconfigui.ui4
-rw-r--r--kttsd/plugins/hadifix/hadifixproc.cpp12
-rw-r--r--kttsd/plugins/hadifix/voicefileui.ui.h4
19 files changed, 134 insertions, 134 deletions
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9045f14..9cbba40 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -16,11 +16,11 @@
***************************************************************************/
// TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqfile.h>
#include <tqapplication.h>
-#include <tqtextcodec.h>
+#include <textcodec.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new CommandConfWidget(this, "CommandConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->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\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("Command");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("Command");
}
}
return TQString();
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 8db709c..75ce080 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>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index d1eb223..ddc8a8c 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 <tqtextcodec.h>
+#include <textcodec.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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
}
void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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 a755ac8..6ad86e5 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 <tqtextcodec.h>
-#include <tqlayout.h>
+#include <textcodec.h>
+#include <layout.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "EposConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new EposConfWidget(this, "EposConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->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\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg(rate)
- .tqarg("Epos TTS Synthesis System");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg(rate)
+ .arg("Epos TTS Synthesis System");
}
}
return TQString();
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 1c5c0d8..c66a081 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>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -120,7 +120,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -174,7 +174,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -246,7 +246,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -324,7 +324,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -345,7 +345,7 @@
<property name="text">
<string>Epos server executable path:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<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="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -384,7 +384,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -445,7 +445,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<grid>
<property name="name">
@@ -453,7 +453,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -479,7 +479,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -500,7 +500,7 @@
<property name="text">
<string>Epos server:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
@@ -525,7 +525,7 @@
<property name="text">
<string>Epos client:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<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>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -559,7 +559,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index 670a1c4..ab26e92 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 <tqtextcodec.h>
+#include <textcodec.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").tqarg(eposLanguage);
+ *m_eposProc << TQString("--language=%1").arg(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").tqarg(stretchValue, 0, 'f', 3);
+ TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3);
*m_eposProc << timeMsg;
// Pitch. Map 50% to 200% onto 50 to 200. easy.
- TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch);
+ TQString pitchMsg = TQString("--init_f=%1").arg(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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl;
}
void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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 f2126b0..ebe2c3f 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -25,7 +25,7 @@
#include <math.h>
// TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -33,7 +33,7 @@
#include <tqdir.h>
#include <tqslider.h>
#include <tqdom.h>
-#include <tqtextcodec.h>
+#include <textcodec.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FestivalIntConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->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\" />")
- .tqarg(voiceTemp.languageCode)
- .tqarg(voiceTemp.code)
- .tqarg(voiceTemp.gender)
- .tqarg(volume)
- .tqarg(rate)
- .tqarg("Festival Interactive");
+ .arg(voiceTemp.languageCode)
+ .arg(voiceTemp.code)
+ .arg(voiceTemp.gender)
+ .arg(volume)
+ .arg(rate)
+ .arg("Festival Interactive");
return normalTalkerCode;
}
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 470ec7d..76a570f 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="tqalignment">
+ <property name="alignment">
<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="tqalignment">
+ <property name="alignment">
<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>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -190,7 +190,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -266,7 +266,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -369,7 +369,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -471,7 +471,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -498,7 +498,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -520,7 +520,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index 6e3a9f3..a6de02e 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 <tqtextcodec.h>
+#include <textcodec.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)").tqarg(
+ timeMsg = TQString("(set! hts_duration_stretch %1)").arg(
stretchValue, 0, 'f', 3);
}
else
- timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg(
+ timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg(
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)))").tqarg(pitchValue, 0, 10);
+ "(model_f0_mean 170) (model_f0_std 34)))").arg(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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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 076fcb0..a205511 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -22,7 +22,7 @@
******************************************************************************/
// TQt includes.
-#include <tqlayout.h>
+#include <layout.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FliteConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FliteConfWidget(this, "FliteConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->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\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("Festival Lite (flite)");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("Festival Lite (flite)");
}
}
return TQString();
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 21d2471..8efcbb1 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="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
@@ -111,7 +111,7 @@
<property name="text">
<string>&amp;Flite executable path:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp
index 238cf26..3f0df60 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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl;
}
void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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 87f12b4..cdded33 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
// TQt includes.
-#include <tqlayout.h>
+#include <layout.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FreeTTSConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->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\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("FreeTTS");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("FreeTTS");
}
}
return TQString();
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index 0fd8f62..e93f3ba 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="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -108,7 +108,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<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>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index e99cd73..c7b2200 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::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
}
void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(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 798455c..3a577de 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -15,7 +15,7 @@
***************************************************************************/
// TQt includes.
-#include <tqlayout.h>
+#include <layout.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\"").tqarg(name));
+ configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name));
else if (gender == HadifixProc::FemaleGender)
- configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
else {
if (name == "de1")
- configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
else {
- configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").tqarg(name));
- configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").arg(name));
+ configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(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 *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
+ layout->setAlignment (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();
- tqlayout->addWidget (d->configWidget);
+ layout->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\" />")
- .tqarg(d->languageCode)
- .tqarg(voiceCode)
- .tqarg(gender)
- .tqarg(volume)
- .tqarg(rate)
- .tqarg("Hadifix");
+ .arg(d->languageCode)
+ .arg(voiceCode)
+ .arg(gender)
+ .arg(volume)
+ .arg(rate)
+ .arg("Hadifix");
}
}
return TQString();
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index a280945..8a686c2 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>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -525,7 +525,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>20</height>
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 4c3f85f..64a4200 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -18,7 +18,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.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").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 += 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 += " " + 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::tqfromLatin1(buffer, buflen);
+ stdOut += TQString::fromLatin1(buffer, buflen);
}
void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
- stdErr += TQString::tqfromLatin1(buffer, buflen);
+ stdErr += TQString::fromLatin1(buffer, buflen);
}
/**
diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h
index dfd177d..1d0033e 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.").tqarg(voiceFileURL->url()),
+ i18n("The gender of the voice file %1 could not be detected.").arg(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.").tqarg(voiceFileURL->url()),
+ i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()),
details, i18n("Trying to Determine the Gender - Hadifix Plug In"));
}
}