From f138d74fe16092003b06f5bde9663841929cde7f Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 22:17:08 +0000 Subject: TQt4 port kdeaccessibility This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kttsd/plugins/freetts/freettsconf.cpp | 32 ++++++++++++++-------------- kttsd/plugins/freetts/freettsconf.h | 9 ++++---- kttsd/plugins/freetts/freettsconfigwidget.ui | 24 ++++++++++----------- kttsd/plugins/freetts/freettsproc.cpp | 16 +++++++------- kttsd/plugins/freetts/freettsproc.h | 5 +++-- 5 files changed, 44 insertions(+), 42 deletions(-) (limited to 'kttsd/plugins/freetts') 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 #include #include @@ -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() "" "" "") - .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 @@ FreeTTSConfWidget Gary Cramblitt <garycramblitt@comcast.net> - + FreeTTSConfWidget @@ -38,14 +38,14 @@ Expanding - + 20 16 - + freettsConfigurationBox @@ -76,7 +76,7 @@ 6 - + voicesPathBox @@ -90,7 +90,7 @@ 6 - + freettsPathLabel @@ -108,7 +108,7 @@ AutoText - + AlignVCenter|AlignRight @@ -130,7 +130,7 @@ - + selectVoiceBox @@ -146,9 +146,9 @@ - + - layout10 + tqlayout10 @@ -164,14 +164,14 @@ Expanding - + 410 20 - + freettsTest @@ -191,7 +191,7 @@ kurlrequester.h kurlrequester.h - + kurlrequester.h klineedit.h 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. -TQStringList argsToQStringList(const TQValueList list) +TQStringList argsToTQStringList(const TQValueList list) { TQStringList newList; TQValueList::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 -- cgit v1.2.1