diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
commit | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch) | |
tree | 322767e10a0d28887f54f3cefe6399098713dc82 /kttsd/filters | |
parent | 11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff) | |
download | tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/filters')
-rw-r--r-- | kttsd/filters/sbd/sbdconf.cpp | 18 | ||||
-rw-r--r-- | kttsd/filters/stringreplacer/stringreplacerconf.cpp | 22 | ||||
-rw-r--r-- | kttsd/filters/stringreplacer/stringreplacerproc.cpp | 2 | ||||
-rw-r--r-- | kttsd/filters/talkerchooser/talkerchooserconf.cpp | 4 | ||||
-rw-r--r-- | kttsd/filters/xmltransformer/xmltransformerproc.cpp | 24 | ||||
-rw-r--r-- | kttsd/filters/xmltransformer/xmltransformerproc.h | 10 |
6 files changed, 40 insertions, 40 deletions
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 69d048c..0a7ddb9 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -132,7 +132,7 @@ void SbdConf::load(KConfig* config, const TQString& configGroup){ for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) { if (!language.isEmpty()) language += ","; - language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); + language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); } m_widget->languageLineEdit->setText(language); m_widget->appIdLineEdit->setText( @@ -239,7 +239,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); langLView->setSelectionMode(TQListView::Extended); - TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha(); + TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha(); TQString locale; TQString languageCode; TQString countryCode; @@ -252,10 +252,10 @@ void SbdConf::slotLanguageBrowseButton_clicked() for (int ndx=0; ndx < allLocalesCount; ++ndx) { locale = allLocales[ndx]; - KGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet); - language = KGlobal::locale()->twoAlphaToLanguageName(languageCode); + TDEGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet); + language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode); if (!countryCode.isEmpty()) language += - " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; + " (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; TQListViewItem* item = new KListViewItem(langLView, language, locale); if (m_languageCodeList.contains(locale)) item->setSelected(true); } @@ -294,7 +294,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) { if (!language.isEmpty()) language += ","; - language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); + language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); } m_widget->languageLineEdit->setText(language); configChanged(); @@ -302,8 +302,8 @@ void SbdConf::slotLanguageBrowseButton_clicked() void SbdConf::slotLoadButton_clicked() { - // TQString dataDir = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/"; - TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/sbd/").last(); + // TQString dataDir = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/"; + TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/sbd/").last(); TQString filename = KFileDialog::getOpenFileName( dataDir, "*rc|SBD Config (*rc)", @@ -319,7 +319,7 @@ void SbdConf::slotLoadButton_clicked() void SbdConf::slotSaveButton_clicked() { TQString filename = KFileDialog::getSaveFileName( - KGlobal::dirs()->saveLocation( "data" ,"kttsd/sbd/", false ), + TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/sbd/", false ), "*rc|SBD Config (*rc)", m_widget, "sbd_savefile"); diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 03ab590..21a4c51 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -192,7 +192,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx ) { if (!language.isEmpty()) language += ","; - language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); + language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); } m_widget->languageLineEdit->setText(language); @@ -260,7 +260,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) void StringReplacerConf::save(KConfig* config, const TQString& configGroup){ // kdDebug() << "StringReplacerConf::save: Running" << endl; TQString wordsFilename = - KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", true ); + TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", true ); if ( wordsFilename.isEmpty() ) { kdDebug() << "StringReplacerConf::save: no save location" << endl; @@ -406,7 +406,7 @@ TQString StringReplacerConf::userPlugInName() { TQString language; if (m_languageCodeList.count() == 1) - language = KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[0]); + language = TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[0]); if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages"); if (!language.isEmpty()) @@ -424,7 +424,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); langLView->setSelectionMode(TQListView::Extended); - TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha(); + TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha(); TQString locale; TQString languageCode; TQString countryCode; @@ -437,10 +437,10 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() for (int ndx=0; ndx < allLocalesCount; ++ndx) { locale = allLocales[ndx]; - KGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet); - language = KGlobal::locale()->twoAlphaToLanguageName(languageCode); + TDEGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet); + language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode); if (!countryCode.isEmpty()) language += - " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; + " (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; item = new KListViewItem(langLView, language, locale); if (m_languageCodeList.contains(locale)) item->setSelected(true); } @@ -479,7 +479,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) { if (!language.isEmpty()) language += ","; - language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); + language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]); } TQString s1 = m_widget->languageLineEdit->text(); m_widget->languageLineEdit->setText(language); @@ -688,8 +688,8 @@ void StringReplacerConf::slotMatchButton_clicked() void StringReplacerConf::slotLoadButton_clicked() { - // TQString dataDir = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/"; - TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/stringreplacer/").last(); + // TQString dataDir = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/"; + TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/stringreplacer/").last(); TQString filename = KFileDialog::getOpenFileName( dataDir, "*.xml|String Replacer Word List (*.xml)", @@ -707,7 +707,7 @@ void StringReplacerConf::slotLoadButton_clicked() void StringReplacerConf::slotSaveButton_clicked() { TQString filename = KFileDialog::getSaveFileName( - KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ), + TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ), "*.xml|String Replacer Word List (*.xml)", m_widget, "stringreplacer_savefile"); diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index f3628f1..5d4d818 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -71,7 +71,7 @@ StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, cons bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ // kdDebug() << "StringReplacerProc::init: Running" << endl; TQString wordsFilename = - KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ); + TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ); if ( wordsFilename.isEmpty() ) return false; wordsFilename += configGroup; config->setGroup( configGroup ); diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 8fc504a..f62e185 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -232,7 +232,7 @@ void TalkerChooserConf::slotTalkerButton_clicked() void TalkerChooserConf::slotLoadButton_clicked() { - TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/talkerchooser/").last(); + TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/talkerchooser/").last(); TQString filename = KFileDialog::getOpenFileName( dataDir, "*rc|Talker Chooser Config (*rc)", @@ -248,7 +248,7 @@ void TalkerChooserConf::slotLoadButton_clicked() void TalkerChooserConf::slotSaveButton_clicked() { TQString filename = KFileDialog::getSaveFileName( - KGlobal::dirs()->saveLocation( "data" ,"kttsd/talkerchooser/", false ), + TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/talkerchooser/", false ), "*rc|Talker Chooser Config (*rc)", m_widget, "talkerchooser_savefile"); diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index c1821db..c513c5d 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -241,7 +241,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) // outFile.unlink(); // only activate this if necessary. /// Spawn an xsltproc process to apply our stylesheet to input file. - m_xsltProc = new KProcess; + m_xsltProc = new TDEProcess; *m_xsltProc << m_xsltprocPath; *m_xsltProc << "-o" << m_outFilename << "--novalid" << m_xsltFilePath << m_inFilename; @@ -250,14 +250,14 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) // m_xsltProc->args() << endl; m_state = fsFiltering; - connect(m_xsltProc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*))); - connect(m_xsltProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int))); - connect(m_xsltProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int))); - if (!m_xsltProc->start(KProcess::NotifyOnExit, - static_cast<KProcess::Communication>(KProcess::Stdout | KProcess::Stderr))) + connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_xsltProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_xsltProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + if (!m_xsltProc->start(TDEProcess::NotifyOnExit, + static_cast<TDEProcess::Communication>(TDEProcess::Stdout | TDEProcess::Stderr))) { kdDebug() << "XmlTransformerProc::convert: Error starting xsltproc" << endl; m_state = fsIdle; @@ -365,19 +365,19 @@ void XmlTransformerProc::processOutput() */ /*virtual*/ bool XmlTransformerProc::wasModified() { return m_wasModified; } -void XmlTransformerProc::slotProcessExited(KProcess*) +void XmlTransformerProc::slotProcessExited(TDEProcess*) { // kdDebug() << "XmlTransformerProc::slotProcessExited: xsltproc has exited." << endl; processOutput(); } -void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/) +void XmlTransformerProc::slotReceivedStdout(TDEProcess*, char* /*buffer*/, int /*buflen*/) { // TQString buf = TQString::fromLatin1(buffer, buflen); // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl; } -void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) +void XmlTransformerProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen) { TQString buf = TQString::fromLatin1(buffer, buflen); kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl; diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index 8d92e69..a7c5ccc 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -31,7 +31,7 @@ // KTTS includes. #include "filterproc.h" -class KProcess; +class TDEProcess; class XmlTransformerProc : virtual public KttsFilterProc { @@ -132,9 +132,9 @@ public: virtual bool wasModified(); private slots: - void slotProcessExited(KProcess*); - void slotReceivedStdout(KProcess* proc, char* buffer, int buflen); - void slotReceivedStderr(KProcess* proc, char* buffer, int buflen); + void slotProcessExited(TDEProcess*); + void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen); + void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen); private: // Process output when xsltproc exits. @@ -151,7 +151,7 @@ private: // Processing state. int m_state; // xsltproc process. - KProcess* m_xsltProc; + TDEProcess* m_xsltProc; // Input and Output filenames. TQString m_inFilename; TQString m_outFilename; |