diff options
Diffstat (limited to 'kttsd/plugins')
35 files changed, 430 insertions, 418 deletions
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 5d46fe9..5c4605f 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqcheckbox.h> #include <tqfile.h> @@ -41,18 +41,18 @@ #include "commandconf.h" /** Constructor */ -CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +CommandConf::CommandConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "CommandConf::CommandConf: Running" << endl; 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 (Qt::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(); @@ -121,21 +121,21 @@ TQString CommandConf::getTalkerCode() { // Must contain either text or file parameter, or StdIn checkbox must be checked, // otherwise, does nothing! - if ((url.contains("%t") > 0) || (url.contains("%f") > 0) || m_widget->stdInButton->isChecked()) + if ((url.tqcontains("%t") > 0) || (url.tqcontains("%f") > 0) || m_widget->stdInButton->isChecked()) { return TQString( "<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::null; + return TQString(); } void CommandConf::slotCommandTest_clicked() @@ -203,7 +203,7 @@ void CommandConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h index b3889b9..4607718 100644 --- a/kttsd/plugins/command/commandconf.h +++ b/kttsd/plugins/command/commandconf.h @@ -18,7 +18,7 @@ #ifndef _COMMANDCONF_H_ #define _COMMANDCONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> @@ -35,11 +35,12 @@ class CommandProc; class KProgressDialog; class CommandConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - CommandConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + CommandConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~CommandConf(); @@ -71,7 +72,7 @@ class CommandConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -89,7 +90,7 @@ class CommandConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui index b0b749c..7a45b20 100644 --- a/kttsd/plugins/command/commandconfwidget.ui +++ b/kttsd/plugins/command/commandconfwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CommandConfWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CommandConfWidget</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>confiurationBox</cstring> </property> @@ -53,7 +53,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>urlLabel</cstring> </property> @@ -72,15 +72,15 @@ <string>This field specifies both the command used for speaking texts and its parameters. If you want to pass the text as a parameter, write %t at the place where the text should be inserted. To pass a file of the text, write %f. To synthesize only and let KTTSD play the synthesized text, write %w for the generated audio file.</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>stdInButton</cstring> </property> @@ -101,14 +101,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>201</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>commandTestButton</cstring> </property> @@ -118,15 +118,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -163,7 +163,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>explanationLabel</cstring> </property> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -214,10 +214,10 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>configurationChanged()</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index 77d63f3..8f8c500 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqstring.h> #include <tqvaluelist.h> @@ -39,8 +39,8 @@ #include "commandproc.moc" /** Constructor */ -CommandProc::CommandProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : - PlugInProc( parent, name ) +CommandProc::CommandProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInProc( tqparent, name ) { kdDebug() << "CommandProc::CommandProc: Running" << endl; m_commandProc = 0; @@ -72,8 +72,8 @@ bool CommandProc::init(KConfig *config, const TQString &configGroup){ m_stdin = config->readBoolEntry("StdIn", true); m_language = config->readEntry("LanguageCode", "en"); - // Support separate synthesis if the TTS command contains %w macro. - m_supportsSynth = (m_ttsCommand.contains("%w")); + // Support separate synthesis if the TTS command tqcontains %w macro. + m_supportsSynth = (m_ttsCommand.tqcontains("%w")); TQString codecString = config->readEntry("Codec", "Local"); m_codec = codecNameToCodec(codecString); @@ -89,7 +89,7 @@ bool CommandProc::init(KConfig *config, const TQString &configGroup){ */ void CommandProc::sayText(const TQString &text) { - synth(text, TQString::null, + synth(text, TQString(), m_ttsCommand, m_stdin, m_codec, m_language); } @@ -127,9 +127,9 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile if (m_commandProc->isRunning()) m_commandProc->kill(); delete m_commandProc; m_commandProc = 0; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); if (!m_textFilename.isNull()) TQFile::remove(m_textFilename); - m_textFilename = TQString::null; + m_textFilename = TQString(); } TQString command = userCmd; TQString text = inputText.stripWhiteSpace(); @@ -147,7 +147,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile TQString escText = KShellProcess::quote(text); // 1.c) create a temporary file for the text, if %f macro is used. - if (command.contains("%f")) + if (command.tqcontains("%f")) { KTempFile tempFile(locateLocal("tmp", "commandplugin-"), ".txt"); TQTextStream* fs = tempFile.textStream(); @@ -156,13 +156,13 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile *fs << endl; m_textFilename = tempFile.file()->name(); tempFile.close(); - } else m_textFilename = TQString::null; + } else m_textFilename = TQString(); // 2. replace variables with values TQValueStack<bool> stack; bool issinglequote=false; bool isdoublequote=false; - int noreplace=0; + int notqreplace=0; TQRegExp re_noquote("(\"|'|\\\\|`|\\$\\(|\\$\\{|\\(|\\{|\\)|\\}|%%|%t|%f|%l|%w)"); TQRegExp re_singlequote("('|%%|%t|%f|%l|%w)"); TQRegExp re_doublequote("(\"|\\\\|`|\\$\\(|\\$\\{|%%|%t|%f|%l|%w)"); @@ -178,18 +178,18 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile { // assert(isdoublequote == false) stack.push(isdoublequote); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace++; + notqreplace++; i++; } else if (command[i]=='$') { stack.push(isdoublequote); isdoublequote = false; - if ((noreplace > 0) || (command[i+1]=='{')) + if ((notqreplace > 0) || (command[i+1]=='{')) // count nested braces when within ${...} - noreplace++; + notqreplace++; i+=2; } else if ((command[i]==')') || (command[i]=='}')) @@ -199,9 +199,9 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile isdoublequote = stack.pop(); else qWarning("Parse error."); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace--; + notqreplace--; i++; } else if (command[i]=='\'') @@ -219,7 +219,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile else if (command[i]=='`') { // Replace all `...` with safer $(...) - command.replace (i, 1, "$("); + command.tqreplace (i, 1, "$("); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); for ( int i2=re_backticks.search(command,i+2); i2!=-1; @@ -228,7 +228,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile { if (command[i2] == '`') { - command.replace (i2, 1, ")"); + command.tqreplace (i2, 1, ")"); i2=command.length(); // leave loop } else @@ -239,7 +239,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile } // Leave i unchanged! We need to process "$(" } - else if (noreplace == 0) // do not replace macros within ${...} + else if (notqreplace == 0) // do not replace macros within ${...} { TQString match, v; @@ -269,7 +269,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile else if (issinglequote) v="'"+v+"'"; - command.replace (i, match.length(), v); + command.tqreplace (i, match.length(), v); i+=v.length(); } else @@ -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; } @@ -420,9 +420,9 @@ void CommandProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); if (!m_textFilename.isNull()) TQFile::remove(m_textFilename); - m_textFilename = TQString::null; + m_textFilename = TQString(); } } diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h index c1880be..0faf1f4 100644 --- a/kttsd/plugins/command/commandproc.h +++ b/kttsd/plugins/command/commandproc.h @@ -18,7 +18,7 @@ #ifndef _COMMANDPROC_H_ #define _COMMANDPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> // KTTS includes. @@ -28,11 +28,12 @@ class KProcess; class TQTextCodec; class CommandProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - CommandProc( TQObject* parent = 0, const char* name = 0, + CommandProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 8b5ccf0..b3cd27d 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqapplication.h> #include <tqtextcodec.h> @@ -48,18 +48,18 @@ #include "eposconf.moc" /** Constructor */ -EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +EposConf::EposConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "EposConf::EposConf: Running" << endl; 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 (Qt::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,15 +194,15 @@ 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::null; + return TQString(); } void EposConf::slotEposTest_clicked() @@ -275,7 +275,7 @@ void EposConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h index 08cb611..667d445 100644 --- a/kttsd/plugins/epos/eposconf.h +++ b/kttsd/plugins/epos/eposconf.h @@ -24,7 +24,7 @@ #ifndef _EPOSCONF_H_ #define _EPOSCONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> // KDE includes. @@ -42,11 +42,12 @@ class EposProc; class KProgressDialog; class EposConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - EposConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~EposConf(); @@ -78,7 +79,7 @@ class EposConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -96,7 +97,7 @@ class EposConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui index 23e47da..3cc032e 100644 --- a/kttsd/plugins/epos/eposconfwidget.ui +++ b/kttsd/plugins/epos/eposconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EposConfWidget</class> <author>Gary Cramblitt</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EposConfWidget</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>eposConfigurationBox</cstring> </property> @@ -65,15 +65,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -110,23 +110,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -148,7 +148,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -172,9 +172,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> @@ -244,15 +244,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -281,7 +281,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast".</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -314,23 +314,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposServerPathLabel</cstring> </property> @@ -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"> @@ -355,7 +355,7 @@ <string>If the Epos server program will be found due to your PATH environment variable, simply enter "epos", otherwise enter the full path to the Epos server executable program.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposClientPathLabel</cstring> </property> @@ -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"> @@ -382,9 +382,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -432,7 +432,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>advancedGroupBox</cstring> </property> @@ -443,23 +443,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eposServerOptions</cstring> </property> @@ -467,7 +467,7 @@ <string>Optional. Enter any server command line options here. To see available options, enter "epos -h" in a terminal. Do not use "-o".</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eposClientOptions</cstring> </property> @@ -477,15 +477,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposServerOptionsLabel</cstring> </property> @@ -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"> @@ -510,7 +510,7 @@ <string>Optional. Enter any server command line options here. To see available options, enter "epos -h" in a terminal. Do not use "-o".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposClientOptionsLabel</cstring> </property> @@ -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"> @@ -541,9 +541,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -559,14 +559,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>eposTest</cstring> </property> @@ -595,7 +595,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index e5fd664..ae7973c 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -25,7 +25,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqtextcodec.h> @@ -43,8 +43,8 @@ #include "eposproc.moc" /** Constructor */ -EposProc::EposProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +EposProc::EposProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ kdDebug() << "EposProc::EposProc: Running" << endl; m_state = psIdle; m_waitingStop = false; @@ -72,11 +72,11 @@ bool EposProc::init(KConfig* config, const TQString& configGroup) config->setGroup(configGroup); m_eposServerExePath = config->readEntry("EposServerExePath", "epos"); m_eposClientExePath = config->readEntry("EposClientExePath", "say"); - m_eposLanguage = config->readEntry("Language", TQString::null); + m_eposLanguage = config->readEntry("Language", TQString()); m_time = config->readNumEntry("time", 100); m_pitch = config->readNumEntry("pitch", 100); - m_eposServerOptions = config->readEntry("EposServerOptions", TQString::null); - m_eposClientOptions = config->readEntry("EposClientOptions", TQString::null); + m_eposServerOptions = config->readEntry("EposServerOptions", TQString()); + m_eposClientOptions = config->readEntry("EposClientOptions", TQString()); kdDebug() << "EposProc::init: path to epos server: " << m_eposServerExePath << endl; kdDebug() << "EposProc::init: path to epos client: " << m_eposClientExePath << endl; @@ -109,7 +109,7 @@ bool EposProc::init(KConfig* config, const TQString& configGroup) */ void EposProc::sayText(const TQString &text) { - synth(text, TQString::null, m_eposServerExePath, m_eposClientExePath, + synth(text, TQString(), m_eposServerExePath, m_eposClientExePath, m_eposServerOptions, m_eposClientOptions, m_codec, m_eposLanguage, m_time, m_pitch); } @@ -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; } @@ -365,7 +365,7 @@ void EposProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/epos/eposproc.h b/kttsd/plugins/epos/eposproc.h index b12783a..0689481 100644 --- a/kttsd/plugins/epos/eposproc.h +++ b/kttsd/plugins/epos/eposproc.h @@ -25,7 +25,7 @@ #ifndef _EPOSPROC_H_ #define _EPOSPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqmutex.h> @@ -36,13 +36,14 @@ class KProcess; class TQTextCodec; class EposProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - EposProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index 8464ad7..54542ab 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqstring.h> @@ -57,19 +57,19 @@ #include "festivalintconf.moc" /** Constructor */ -FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +FestivalIntConf::FestivalIntConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "FestivalIntConf::FestivalIntConf: Running" << endl; m_festProc = 0; 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 (Qt::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("*"); @@ -210,11 +210,11 @@ void FestivalIntConf::setDesiredLanguage(const TQString &lang) TQString FestivalIntConf::getTalkerCode() { - if (!m_widget->selectVoiceCombo->isEnabled()) return TQString::null; + if (!m_widget->selectVoiceCombo->isEnabled()) return TQString(); TQString exePath = realFilePath(m_widget->festivalPath->url()); - if (exePath.isEmpty()) return TQString::null; - if (getLocation(exePath).isEmpty()) return TQString::null; - if (m_voiceList.count() == 0) return TQString::null; + if (exePath.isEmpty()) return TQString(); + if (getLocation(exePath).isEmpty()) return TQString(); + if (m_voiceList.count() == 0) return TQString(); TQString normalTalkerCode; voiceStruct voiceTemp = m_voiceList[m_widget->selectVoiceCombo->currentItem()]; // Determine volume attribute. soft < 75% <= medium <= 125% < loud. @@ -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; } @@ -485,7 +485,7 @@ void FestivalIntConf::scanVoices() for (uint index=0; index < voicesCount; ++index) { TQDomNode voiceNode = voices.item(index); - TQString voiceCode = readXmlString(voiceNode, "code", TQString::null); + TQString voiceCode = readXmlString(voiceNode, "code", TQString()); // kdDebug() << "FestivalIntConf::scanVoices: Comparing code " << code << " to " << voiceCode << endl; if (voiceCode == code) { @@ -621,7 +621,7 @@ void FestivalIntConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h index 5282394..3379719 100644 --- a/kttsd/plugins/festivalint/festivalintconf.h +++ b/kttsd/plugins/festivalint/festivalintconf.h @@ -24,7 +24,7 @@ #ifndef _FESTIVALINTCONF_H_ #define _FESTIVALINTCONF_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqvaluelist.h> @@ -55,11 +55,12 @@ typedef struct voiceStruct{ } voice; class FestivalIntConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FestivalIntConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FestivalIntConf(); @@ -90,7 +91,7 @@ class FestivalIntConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -108,7 +109,7 @@ class FestivalIntConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui index f8b33fb..36f65bd 100644 --- a/kttsd/plugins/festivalint/festivalintconfwidget.ui +++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FestivalIntConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FestivalIntConfWidget</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>festivalConfigurationBox</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>voicesPathBox</cstring> </property> @@ -79,7 +79,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>festivalPathLabel</cstring> </property> @@ -94,7 +94,7 @@ <property name="text"> <string>&Festival executable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -122,7 +122,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>selectVoiceBox</cstring> </property> @@ -136,14 +136,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>selectVoiceLabel</cstring> </property> <property name="text"> <string>&Select voice:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -180,23 +180,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -218,7 +218,7 @@ <string>Sets the volume (loudness) of speech. Slide the slider to the left to lower the volume; to the right to increase volume. Anything less than 75 percent is considered "soft", and anything greater than 125 percent is considered "loud".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -240,7 +240,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -264,9 +264,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -367,15 +367,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -407,7 +407,7 @@ <string>Sets the volume (loudness) of speech. Slide the slider to the left to lower the volume; to the right to increase volume. Anything less than 75 percent is considered "soft", and anything greater than 125 percent is considered "loud".</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -436,7 +436,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -469,15 +469,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>preloadCheckBox</cstring> </property> @@ -498,14 +498,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>testButton</cstring> </property> @@ -518,15 +518,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -583,7 +583,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index e48f2c4..2b4aea3 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqthread.h> @@ -43,8 +43,8 @@ #include "festivalintproc.moc" /** Constructor */ -FestivalIntProc::FestivalIntProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +FestivalIntProc::FestivalIntProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ // kdDebug() << "FestivalIntProc::FestivalIntProc: Running" << endl; m_ready = true; m_writingStdin = false; @@ -113,7 +113,7 @@ bool FestivalIntProc::init(KConfig *config, const TQString &configGroup) */ void FestivalIntProc::sayText(const TQString &text) { - synth(m_festivalExePath, text, TQString::null, m_voiceCode, m_time, m_pitch, m_volume, + synth(m_festivalExePath, text, TQString(), m_voiceCode, m_time, m_pitch, m_volume, m_languageCode, m_codec); } @@ -144,7 +144,7 @@ bool FestivalIntProc::queryVoices(const TQString &festivalExePath) // kdDebug() << "FestivalIntProc::queryVoices: Running" << endl; if (m_state != psIdle && m_waitingQueryVoices && m_waitingStop) return false; // Start Festival if not already running. - startEngine(festivalExePath, TQString::null, m_languageCode, m_codec); + startEngine(festivalExePath, TQString(), m_languageCode, m_codec); // Set state, waiting for voice codes list from Festival. m_waitingQueryVoices = true; // Voice rab_diphone is needed in order to support SSML. @@ -196,7 +196,7 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin if (!m_festProc->isRunning()) { // kdDebug() << "FestivalIntProc::startEngine: Starting Festival process" << endl; - m_runningVoiceCode = TQString::null; + m_runningVoiceCode = TQString(); m_runningTime = 100; m_runningPitch = 100; m_ready = false; @@ -257,7 +257,7 @@ void FestivalIntProc::synth( // If we just started Festival, or rate changed, tell festival. if (m_runningTime != time) { TQString timeMsg; - if (voiceCode.contains("_hts") > 0) + if (voiceCode.tqcontains("_hts") > 0) { // Map 50% to 200% onto 0 to 1000. // slider = alpha * (log(percent)-log(50)) @@ -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; } @@ -304,14 +304,14 @@ void FestivalIntProc::synth( int len = saidText.length(); while (len > c_tooLong) { - len = saidText.findRev(", ", len - (c_tooLong * 2 / 3), true); + len = saidText.tqfindRev(", ", len - (c_tooLong * 2 / 3), true); if (len != -1) { TQString c = saidText.mid(len+2, 1); if (c != c.upper()) { - saidText.replace(len, 2, ". "); - saidText.replace(len+2, 1, c.upper()); + saidText.tqreplace(len, 2, ". "); + saidText.tqreplace(len+2, 1, c.upper()); kdDebug() << "FestivalIntProc::synth: Splitting long sentence at " << len << endl; // kdDebug() << saidText << endl; } @@ -319,17 +319,17 @@ void FestivalIntProc::synth( } // Encode quotation characters. - saidText.replace("\\\"", "#!#!"); - saidText.replace("\"", "\\\""); - saidText.replace("#!#!", "\\\""); + saidText.tqreplace("\\\"", "#!#!"); + saidText.tqreplace("\"", "\\\""); + saidText.tqreplace("#!#!", "\\\""); // Remove certain comment characters. - saidText.replace("--", ""); + saidText.tqreplace("--", ""); // Ok, let's rock. if (synthFilename.isNull()) { m_state = psSaying; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); // kdDebug() << "FestivalIntProc::synth: Saying text: '" << saidText << "' using Festival plug in with voice " // << voiceCode << endl; saidText = "(SayText \"" + saidText + "\")"; @@ -500,9 +500,9 @@ 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 promptSeen = (buf.tqcontains("festival>") > 0); bool emitQueryVoicesFinished = false; TQStringList voiceCodesList; if (m_waitingQueryVoices && m_outputQueue.isEmpty()) @@ -515,7 +515,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) } else { if (buf.left(1) == "(") { - int rightParen = buf.find(')'); + int rightParen = buf.tqfind(')'); if (rightParen > 0) { m_waitingQueryVoices = false; @@ -562,14 +562,14 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) if (emitQueryVoicesFinished) { // kdDebug() << "FestivalIntProc::slotReceivedStdout: emitting queryVoicesFinished" << endl; - m_supportsSSML = (voiceCodesList.contains("rab_diphone")) ? ssYes : ssNo; + m_supportsSSML = (voiceCodesList.tqcontains("rab_diphone")) ? ssYes : ssNo; emit queryVoicesFinished(voiceCodesList); } } 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; } @@ -620,7 +620,7 @@ void FestivalIntProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h index 4425245..e70127f 100644 --- a/kttsd/plugins/festivalint/festivalintproc.h +++ b/kttsd/plugins/festivalint/festivalintproc.h @@ -34,7 +34,8 @@ class TQTextCodec; class FestivalIntProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum SupportsSSML { @@ -46,7 +47,7 @@ class FestivalIntProc : public PlugInProc{ /** * Constructor */ - FestivalIntProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 0dfb6d1..060e45c 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqfile.h> #include <tqapplication.h> @@ -42,18 +42,18 @@ #include "fliteconf.moc" /** Constructor */ -FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +FliteConf::FliteConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "FliteConf::FliteConf: Running" << endl; 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 (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new FliteConfWidget(this, "FliteConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); defaults(); @@ -74,7 +74,7 @@ void FliteConf::load(KConfig *config, const TQString &configGroup){ // kdDebug() << "FliteConf::load: Loading configuration for language " << langGroup << " with plug in " << "Festival Lite (flite)" << endl; config->setGroup(configGroup); - TQString fliteExe = config->readEntry("FliteExePath", TQString::null); + TQString fliteExe = config->readEntry("FliteExePath", TQString()); if (fliteExe.isEmpty()) { config->setGroup("Flite"); @@ -115,15 +115,15 @@ 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::null; + return TQString(); } void FliteConf::slotFliteTest_clicked() @@ -187,7 +187,7 @@ void FliteConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h index 6d5ff06..75e3b89 100644 --- a/kttsd/plugins/flite/fliteconf.h +++ b/kttsd/plugins/flite/fliteconf.h @@ -24,7 +24,7 @@ #ifndef _FLITECONF_H_ #define _FLITECONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> // KDE includes. @@ -41,11 +41,12 @@ class FliteProc; class KProgressDialog; class FliteConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FliteConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FliteConf(); @@ -77,7 +78,7 @@ class FliteConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -95,7 +96,7 @@ class FliteConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui index 839970e..1e8e0be 100644 --- a/kttsd/plugins/flite/fliteconfwidget.ui +++ b/kttsd/plugins/flite/fliteconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FliteConfWidget</class> <author>Gary Cramblitt</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FliteConfWidget</cstring> </property> @@ -41,14 +41,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>fliteConfigurationBox</cstring> </property> @@ -82,7 +82,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>flitePathBox</cstring> </property> @@ -96,7 +96,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flitePathLabel</cstring> </property> @@ -111,7 +111,7 @@ <property name="text"> <string>&Flite executable path:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -142,7 +142,7 @@ </widget> </hbox> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>fliteTest</cstring> </property> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>221</width> <height>20</height> @@ -177,7 +177,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index 55cb0fa..b71efef 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> @@ -36,8 +36,8 @@ #include "fliteproc.moc" /** Constructor */ -FliteProc::FliteProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +FliteProc::FliteProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ kdDebug() << "FliteProc::FliteProc: Running" << endl; m_state = psIdle; m_waitingStop = false; @@ -73,7 +73,7 @@ bool FliteProc::init(KConfig* config, const TQString& configGroup){ */ void FliteProc::sayText(const TQString &text) { - synth(text, TQString::null, m_fliteExePath); + synth(text, TQString(), m_fliteExePath); } /** @@ -129,11 +129,11 @@ void FliteProc::synth( // Encode quotation characters. TQString saidText = text; /* - saidText.replace("\\\"", "#!#!"); - saidText.replace("\"", "\\\""); - saidText.replace("#!#!", "\\\""); + saidText.tqreplace("\\\"", "#!#!"); + saidText.tqreplace("\"", "\\\""); + saidText.tqreplace("#!#!", "\\\""); // Remove certain comment characters. - saidText.replace("--", ""); + saidText.tqreplace("--", ""); saidText = "\"" + saidText + "\""; */ saidText += "\n"; @@ -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; } @@ -256,7 +256,7 @@ void FliteProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/flite/fliteproc.h b/kttsd/plugins/flite/fliteproc.h index a956d5c..6b44e45 100644 --- a/kttsd/plugins/flite/fliteproc.h +++ b/kttsd/plugins/flite/fliteproc.h @@ -24,7 +24,7 @@ #ifndef _FLITEPROC_H_ #define _FLITEPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqmutex.h> @@ -34,13 +34,14 @@ class KProcess; class FliteProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - FliteProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 05c1fab..1da6f44 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqstring.h> @@ -40,18 +40,18 @@ #include "freettsconfigwidget.h" /** Constructor */ -FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList&/*args*/) : - PlugInConf( parent, name ) { +FreeTTSConf::FreeTTSConf( TQWidget* tqparent, const char* name, const TQStringList&/*args*/) : + PlugInConf( tqparent, name ) { // kdDebug() << "FreeTTSConf::FreeTTSConf: Running" << endl; 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 (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); defaults(); @@ -72,11 +72,11 @@ void FreeTTSConf::load(KConfig *config, const TQString &configGroup) { // kdDebug() << "FreeTTSConf::load: Running" << endl; config->setGroup(configGroup); - TQString freeTTSJar = config->readEntry("FreeTTSJarPath", TQString::null); + TQString freeTTSJar = config->readEntry("FreeTTSJarPath", TQString()); if (freeTTSJar.isEmpty()) { config->setGroup("FreeTTS"); - freeTTSJar = config->readEntry("FreeTTSJarPath", TQString::null); + freeTTSJar = config->readEntry("FreeTTSJarPath", TQString()); } if (freeTTSJar.isEmpty()) freeTTSJar = getLocation("freetts.jar"); @@ -119,15 +119,15 @@ 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::null; + return TQString(); } // TQString FreeTTSConf::getLocation(const TQString &name) { @@ -216,7 +216,7 @@ void FreeTTSConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h index cc39b59..62e2e7a 100644 --- a/kttsd/plugins/freetts/freettsconf.h +++ b/kttsd/plugins/freetts/freettsconf.h @@ -32,11 +32,12 @@ class TQStringList; class KProgressDialog; class FreeTTSConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FreeTTSConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FreeTTSConf(); @@ -65,7 +66,7 @@ class FreeTTSConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -83,7 +84,7 @@ class FreeTTSConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui index 1d95751..7952692 100644 --- a/kttsd/plugins/freetts/freettsconfigwidget.ui +++ b/kttsd/plugins/freetts/freettsconfigwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FreeTTSConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FreeTTSConfWidget</cstring> </property> @@ -38,14 +38,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>freettsConfigurationBox</cstring> </property> @@ -76,7 +76,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>voicesPathBox</cstring> </property> @@ -90,7 +90,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>freettsPathLabel</cstring> </property> @@ -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"> @@ -130,7 +130,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>selectVoiceBox</cstring> </property> @@ -146,9 +146,9 @@ </property> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -164,14 +164,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>freettsTest</cstring> </property> @@ -191,7 +191,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index 9c038af..c3de342 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -27,8 +27,8 @@ #include "freettsproc.h" /** Constructor */ -FreeTTSProc::FreeTTSProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : - PlugInProc( parent, name ) { +FreeTTSProc::FreeTTSProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInProc( tqparent, name ) { kdDebug() << "Running: FreeTTSProc::FreeTTSProc" << endl; m_state = psIdle; m_waitingStop = false; @@ -61,7 +61,7 @@ bool FreeTTSProc::init(KConfig *config, const TQString &configGroup) { * If the plugin supports asynchronous operation, it should return immediately. */ void FreeTTSProc::sayText(const TQString &text) { - synth(text, TQString::null, m_freettsJarPath); + synth(text, TQString(), m_freettsJarPath); } /** @@ -80,7 +80,7 @@ void FreeTTSProc::synthText(const TQString& text, const TQString& suggestedFilen } // A little helper function because KDE 3.2 kdDebug() does not support TQValueList<TQCString>. -TQStringList argsToQStringList(const TQValueList<TQCString> list) +TQStringList argsToTQStringList(const TQValueList<TQCString> list) { TQStringList newList; TQValueList<TQCString>::ConstIterator it = list.begin(); @@ -143,7 +143,7 @@ void FreeTTSProc::synth( if (!m_freettsProc->start(KProcess::NotifyOnExit, KProcess::All)) { kdDebug() << "FreeTTSProc::synth: Error starting FreeTTS process. Is freetts.jar in the PATH?" << endl; m_state = psIdle; - kdDebug() << "KProcess args: " << argsToQStringList(m_freettsProc->args()) << endl; + kdDebug() << "KProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl; return; } kdDebug()<< "FreeTTSProc:synth: FreeTTS initialized" << endl; @@ -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; } @@ -242,7 +242,7 @@ pluginState FreeTTSProc::getState() { void FreeTTSProc::ackFinished() { if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h index 7dbc3b5..15ad5f5 100644 --- a/kttsd/plugins/freetts/freettsproc.h +++ b/kttsd/plugins/freetts/freettsproc.h @@ -27,13 +27,14 @@ class KProcess; class FreeTTSProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - FreeTTSProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl b/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl index 5a81c8f..afa9b43 100644 --- a/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl +++ b/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl @@ -113,7 +113,7 @@ </xsl:variable> <!-- Look for first period and space and extract corresponding substring from original. --> <xsl:choose> - <xsl:when test="contains($tmp, '. ')"> + <xsl:when test="tqcontains($tmp, '. ')"> <xsl:value-of select="substring($paragraph, 1, string-length(substring-before($tmp, '. '))+2)"/> </xsl:when> <xsl:otherwise> diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 0249aea..1d4a2cc 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqgroupbox.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)); } } } @@ -203,11 +203,11 @@ class HadifixConfPrivate { }; /** Constructor */ -HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : - PlugInConf( parent, name ){ +HadifixConf::HadifixConf( TQWidget* tqparent, const char* name, const TQStringList &) : + PlugInConf( tqparent, name ){ // kdDebug() << "HadifixConf::HadifixConf: Running" << endl; - TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); - layout->setAlignment (Qt::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,15 +284,15 @@ 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::null; + return TQString(); } void HadifixConf::voiceButton_clicked () { @@ -393,7 +393,7 @@ void HadifixConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(d->waveFile); TQFile::remove(d->waveFile); - d->waveFile = TQString::null; + d->waveFile = TQString(); if (d->progressDlg) d->progressDlg->close(); } diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h index 4ef96a6..7eb7b30 100644 --- a/kttsd/plugins/hadifix/hadifixconf.h +++ b/kttsd/plugins/hadifix/hadifixconf.h @@ -11,11 +11,12 @@ class HadifixProc; class HadifixConfPrivate; class HadifixConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - HadifixConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixConf(); @@ -44,7 +45,7 @@ class HadifixConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -62,7 +63,7 @@ class HadifixConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui index 302c1de..8a61bff 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>HadifixConfigUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HadifixConfigUI</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -56,7 +56,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>basicOptions</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>voiceLabel</cstring> </property> @@ -135,7 +135,7 @@ <string>&Select...</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -188,7 +188,7 @@ <string>Adjusts the volume of speech. Slide to left for softer speech; to the right for louder.</string> </property> </widget> - <widget class="QSlider" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -223,7 +223,7 @@ <string>Adjusts the volume of speech. Slide to left for softer speech; to the right for louder.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -276,7 +276,7 @@ <string>Adjusts the speed of speech. Slide to left for slower speech; to the right for faster.</string> </property> </widget> - <widget class="QSlider" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -305,7 +305,7 @@ <string>Adjusts the speed of speech. Slide to left for slower speech; to the right for faster.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -355,7 +355,7 @@ <string>Adjusts the pitch (tone) of speech. Slide to left for lower speech; to the right for higher.</string> </property> </widget> - <widget class="QSlider" row="3" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -383,7 +383,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>advancedOptions</cstring> </property> @@ -408,7 +408,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>hadifixBinLabel</cstring> </property> @@ -438,7 +438,7 @@ <string>If the txt2pho program is in your PATH environment variable, simply enter "txt2pho", otherwise specify the full path to the txt2pho executable program.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mbrolaBinLabel</cstring> </property> @@ -468,15 +468,15 @@ <string>If the Mbrola program is in your PATH environment variable, simply enter "mbrola", otherwise specify the full path to the Mbrola executable program.</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <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"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -525,7 +525,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>20</height> @@ -596,84 +596,84 @@ </connection> <connection> <sender>voiceCombo</sender> - <signal>activated(const QString&)</signal> + <signal>activated(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>volumeBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>timeBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>frequencyBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>hadifixURL</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>mbrolaURL</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> </connections> <includes> - <include location="global" impldecl="in declaration">qradiobutton.h</include> - <include location="global" impldecl="in declaration">qpixmap.h</include> + <include location="global" impldecl="in declaration">tqradiobutton.h</include> + <include location="global" impldecl="in declaration">tqpixmap.h</include> <include location="global" impldecl="in declaration">kurl.h</include> - <include location="global" impldecl="in declaration">qmap.h</include> + <include location="global" impldecl="in declaration">tqmap.h</include> <include location="global" impldecl="in implementation">kglobal.h</include> - <include location="global" impldecl="in implementation">qstringlist.h</include> + <include location="global" impldecl="in implementation">tqstringlist.h</include> <include location="global" impldecl="in implementation">math.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> </includes> <forwards> - <forward>class QStringList;</forward> + <forward>class TQStringList;</forward> </forwards> <variables> - <variable>QMap<QString,int> maleVoices;</variable> - <variable>QMap<int,QString> defaultVoices;</variable> + <variable>TQMap<TQString,int> maleVoices;</variable> + <variable>TQMap<int,TQString> defaultVoices;</variable> <variable>QPixmap female;</variable> <variable>QPixmap male;</variable> - <variable>QMap<QString,int> femaleVoices;</variable> + <variable>TQMap<TQString,int> femaleVoices;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>changed(bool)</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected" specifier="non virtual">volumeBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">timeBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">frequencyBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">volumeSlider_valueChanged( int sliderValue )</slot> <slot access="protected" specifier="non virtual">timeSlider_valueChanged( int sliderValue )</slot> <slot access="protected" specifier="non virtual">frequencySlider_valueChanged( int sliderValue )</slot> - <slot access="protected">changed( const QString & )</slot> -</slots> + <slot access="protected">changed( const TQString & )</slot> +</Q_SLOTS> <functions> <function access="protected" specifier="non virtual" returnType="int">percentToSlider( int percentValue )</function> <function access="protected" specifier="non virtual" returnType="int">sliderToPercent( int sliderValue )</function> <function access="private" specifier="non virtual">init()</function> - <function specifier="non virtual">addVoice( const QString &filename, bool isMale )</function> - <function specifier="non virtual">addVoice( const QString &filename, bool isMale, const QString &displayname )</function> - <function specifier="non virtual">setVoice( const QString &filename, bool isMale )</function> - <function specifier="non virtual" returnType="QString">getVoiceFilename()</function> + <function specifier="non virtual">addVoice( const TQString &filename, bool isMale )</function> + <function specifier="non virtual">addVoice( const TQString &filename, bool isMale, const TQString &displayname )</function> + <function specifier="non virtual">setVoice( const TQString &filename, bool isMale )</function> + <function specifier="non virtual" returnType="TQString">getVoiceFilename()</function> <function specifier="non virtual" returnType="bool">isMaleVoice()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui.h b/kttsd/plugins/hadifix/hadifixconfigui.ui.h index 7c21c54..cc6632c 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui.h +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ @@ -53,14 +53,14 @@ void HadifixConfigUI::init () { void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) { if (isMale) { - if (!maleVoices.contains(filename)) { + if (!maleVoices.tqcontains(filename)) { int id = voiceCombo->count(); maleVoices.insert (filename, id); voiceCombo->insertItem (male, filename, id); } } else { - if (!femaleVoices.contains(filename)) { + if (!femaleVoices.tqcontains(filename)) { int id = voiceCombo->count(); femaleVoices.insert (filename, id); voiceCombo->insertItem (female, filename, id); @@ -93,7 +93,7 @@ TQString HadifixConfigUI::getVoiceFilename() { int curr = voiceCombo->currentItem(); TQString filename = voiceCombo->text(curr); - if (defaultVoices.contains(curr)) + if (defaultVoices.tqcontains(curr)) filename = defaultVoices[curr]; return filename; @@ -103,7 +103,7 @@ bool HadifixConfigUI::isMaleVoice() { int curr = voiceCombo->currentItem(); TQString filename = getVoiceFilename(); - if (maleVoices.contains(filename)) + if (maleVoices.tqcontains(filename)) return maleVoices[filename] == curr; else return false; diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 598eb21..3e4b4ee 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -35,7 +35,7 @@ class HadifixProcPrivate { hadifixProc = 0; waitingStop = false; state = psIdle; - synthFilename = TQString::null; + synthFilename = TQString(); gender = false; volume = 100; time = 100; @@ -49,9 +49,9 @@ class HadifixProcPrivate { void load(KConfig *config, const TQString &configGroup) { config->setGroup(configGroup); - hadifix = config->readEntry ("hadifixExec", TQString::null); - mbrola = config->readEntry ("mbrolaExec", TQString::null); - voice = config->readEntry ("voice", TQString::null); + hadifix = config->readEntry ("hadifixExec", TQString()); + mbrola = config->readEntry ("mbrolaExec", TQString()); + voice = config->readEntry ("voice", TQString()); gender = config->readBoolEntry("gender", false); volume = config->readNumEntry ("volume", 100); time = config->readNumEntry ("time", 100); @@ -75,8 +75,8 @@ class HadifixProcPrivate { }; /** Constructor */ -HadifixProc::HadifixProc( TQObject* parent, const char* name, const TQStringList &) : - PlugInProc( parent, name ){ +HadifixProc::HadifixProc( TQObject* tqparent, const char* name, const TQStringList &) : + PlugInProc( tqparent, name ){ // kdDebug() << "HadifixProc::HadifixProc: Running" << endl; d = 0; } @@ -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); @@ -285,7 +285,7 @@ void HadifixProc::ackFinished() if (d->state == psFinished) { d->state = psIdle; - d->synthFilename = TQString::null; + d->synthFilename = TQString(); } } @@ -364,8 +364,8 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString connect(&proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), &speech, TQT_SLOT(receivedStderr(KProcess *, char *, int))); - speech.stdOut = TQString::null; - speech.stdErr = TQString::null; + speech.stdOut = TQString(); + speech.stdErr = TQString(); proc.start (KProcess::Block, KProcess::AllOutput); VoiceGender result; @@ -377,9 +377,9 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString else { if (output != 0) *output = speech.stdOut; - if (speech.stdOut.contains("female", false)) + if (speech.stdOut.tqcontains("female", false)) result = FemaleGender; - else if (speech.stdOut.contains("male", false)) + else if (speech.stdOut.tqcontains("male", false)) result = MaleGender; else result = NoGender; @@ -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/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h index 01b7c5d..4fbf03b 100644 --- a/kttsd/plugins/hadifix/hadifixproc.h +++ b/kttsd/plugins/hadifix/hadifixproc.h @@ -26,7 +26,8 @@ class KProcess; class HadifixProcPrivate; class HadifixProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum VoiceGender { @@ -37,7 +38,7 @@ class HadifixProc : public PlugInProc{ }; /** Constructor */ - HadifixProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixProc(); diff --git a/kttsd/plugins/hadifix/initialconfig.h b/kttsd/plugins/hadifix/initialconfig.h index 02e920c..62ff659 100644 --- a/kttsd/plugins/hadifix/initialconfig.h +++ b/kttsd/plugins/hadifix/initialconfig.h @@ -71,7 +71,7 @@ TQString findExecutable (const TQStringList &names, const TQString &possiblePath } // Both tries failed, so the user has to locate the executable. - return TQString::null; + return TQString(); } /** Tries to find the voice files by looking onto the hard disk. */ @@ -100,7 +100,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { // 2b) search near the hadifix data path info.setFile(hadifixDataPath + "../../mbrola"); TQString mbrolaPath = info.dirPath (true) + "/mbrola"; - if (!list.contains(mbrolaPath)) + if (!list.tqcontains(mbrolaPath)) list += mbrolaPath; // 2c) broaden the search by adding subdirs (with a depth of 2) @@ -114,7 +114,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { TQStringList result; TQStringList::iterator it; for (it = list.begin(); it != list.end(); ++it) { - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Files); TQStringList files = baseDir.entryList(); @@ -148,7 +148,7 @@ TQStringList findSubdirs (const TQStringList &baseDirs) { TQStringList::ConstIterator itEnd = baseDirs.constEnd(); for (it = baseDirs.constBegin(); it != itEnd; ++it) { // a) get a list of directory names - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); TQStringList list = baseDir.entryList(); diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui index 6c038f7..3c9a5fa 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui +++ b/kttsd/plugins/hadifix/voicefileui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>VoiceFileWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>VoiceFileWidget</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>voiceFileLabel</cstring> </property> @@ -44,7 +44,7 @@ <enum>Plain</enum> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>genderOption</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>femaleOption</cstring> </property> @@ -69,7 +69,7 @@ <string>Female</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>maleOption</cstring> </property> @@ -106,10 +106,10 @@ <variables> <variable access="public">QString mbrola;</variable> </variables> -<slots> +<Q_SLOTS> <slot>genderButton_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h index 16e65e5..dfd177d 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui.h +++ b/kttsd/plugins/hadifix/voicefileui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -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")); } } |