diff options
Diffstat (limited to 'kttsd/kttsd')
-rw-r--r-- | kttsd/kttsd/kttsd.cpp | 2 | ||||
-rw-r--r-- | kttsd/kttsd/speechdata.cpp | 2 | ||||
-rw-r--r-- | kttsd/kttsd/ssmlconvert.cpp | 10 | ||||
-rw-r--r-- | kttsd/kttsd/ssmlconvert.h | 6 | ||||
-rw-r--r-- | kttsd/kttsd/talkermgr.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index ce7757e..91c132b 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -103,7 +103,7 @@ bool KTTSD::initializeTalkerMgr() // desktop language, but if that fails, fallback to English. if (load < 0) { - TQString languageCode = KGlobal::locale()->language(); + TQString languageCode = TDEGlobal::locale()->language(); if (m_talkerMgr->autoconfigureTalker(languageCode, m_speechData->config)) load = m_talkerMgr->loadPlugIns(m_speechData->config); else diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index acf9d61..c5e658f 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -74,7 +74,7 @@ SpeechData::SpeechData(){ bool SpeechData::readConfig(){ // Load configuration delete config; - //config = KGlobal::config(); + //config = TDEGlobal::config(); config = new KConfig("kttsdrc"); // Set the group general for the configuration of KTTSD itself (no plug ins) diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 2ffe852..2bae1e7 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -231,7 +231,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) // outFile.unlink(); // only activate this if necessary. /// Spawn an xsltproc process to apply our stylesheet to our SSML file. - m_xsltProc = new KProcess; + m_xsltProc = new TDEProcess; *m_xsltProc << "xsltproc"; *m_xsltProc << "-o" << m_outFilename << "--novalid" << m_xsltFilename << m_inFilename; @@ -239,9 +239,9 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) // kdDebug() << "SSMLConvert::transform: executing command: " << // m_xsltProc->args() << endl; - connect(m_xsltProc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*))); - if (!m_xsltProc->start(KProcess::NotifyOnExit, KProcess::NoCommunication)) + connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*))); + if (!m_xsltProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { kdDebug() << "SSMLConvert::transform: Error starting xsltproc" << endl; return false; @@ -250,7 +250,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) return true; } -void SSMLConvert::slotProcessExited(KProcess* /*proc*/) +void SSMLConvert::slotProcessExited(TDEProcess* /*proc*/) { m_xsltProc->deleteLater(); m_xsltProc = 0; diff --git a/kttsd/kttsd/ssmlconvert.h b/kttsd/kttsd/ssmlconvert.h index 3e02d1c..4fffd55 100644 --- a/kttsd/kttsd/ssmlconvert.h +++ b/kttsd/kttsd/ssmlconvert.h @@ -34,7 +34,7 @@ #include <tqobject.h> #include <tqstringlist.h> -class KProcess; +class TDEProcess; class TQString; class SSMLConvert : public TQObject { @@ -110,11 +110,11 @@ signals: void transformFinished(); private slots: - void slotProcessExited(KProcess* proc); + void slotProcessExited(TDEProcess* proc); private: /// The XSLT processor. - KProcess *m_xsltProc; + TDEProcess *m_xsltProc; /// Current talkers. TQStringList m_talkers; // Current state. diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index d9583fe..d544ad3 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -295,7 +295,7 @@ bool TalkerMgr::supportsMarkup(const TQString& talker, const uint /*markupType*/ if (matchingTalker.isEmpty()) matchingTalker = userDefaultTalker(); PlugInProc* plugin = talkerToPlugin(matchingTalker); return ( plugin->getSsmlXsltFilename() != - KGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl"); + TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl"); } bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config) |