Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

8 files changed, 17 insertions, 17 deletions

diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp
index e98435c..b4f8a1d 100644
--- a/kttsd/libkttsd/filterconf.cpp
+++ b/kttsd/libkttsd/filterconf.cpp
@@ -46,7 +46,7 @@ KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(p
     // kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl;
     TQString systemPath(getenv("PATH"));
     // kdDebug() << "Path is " << systemPath << endl;
-    KGlobal::locale()->insertCatalogue("kttsd");
+    TDEGlobal::locale()->insertCatalogue("kttsd");
     m_path = TQStringList::split(":", systemPath);
 }
 
diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp
index ce68916..0674057 100644
--- a/kttsd/libkttsd/pluginconf.cpp
+++ b/kttsd/libkttsd/pluginconf.cpp
@@ -38,7 +38,7 @@
 */
 PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){
     kdDebug() << "PlugInConf::PlugInConf: Running" << endl;
-    KGlobal::locale()->insertCatalogue("kttsd");
+    TDEGlobal::locale()->insertCatalogue("kttsd");
     TQString systemPath(getenv("PATH"));
     // kdDebug() << "Path is " << systemPath << endl;
     m_path = TQStringList::split(":", systemPath);
@@ -187,7 +187,7 @@ TQString PlugInConf::splitLanguageCode(const TQString& languageCode, TQString& c
     TQString locale = languageCode;
     TQString langCode;
     TQString charSet;
-    KGlobal::locale()->splitLocale(locale, langCode, countryCode, charSet);
+    TDEGlobal::locale()->splitLocale(locale, langCode, countryCode, charSet);
     return langCode;
 }
 
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index bcd79fd..53ab839 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -135,7 +135,7 @@ bool PlugInProc::supportsSynth() { return false; }
 */
 TQString PlugInProc::getSsmlXsltFilename()
 {
-    return KGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl";
+    return TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl";
 }
 
 /**
diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h
index 9d70b55..0467302 100644
--- a/kttsd/libkttsd/pluginproc.h
+++ b/kttsd/libkttsd/pluginproc.h
@@ -112,7 +112,7 @@
 * If @ref supportsAsync returns False, KTTSD will run the plugin in a separate
 * TQThread.  As a consequence, the plugin must not make use of the KDE Library,
 * when @ref sayText or @ref synthText is called,
-* with the exception of KProcess and family (KProcIO, KShellProcess).
+* with the exception of TDEProcess and family (KProcIO, KShellProcess).
 * This restriction comes about because the KDE Libraries make use of the
 * main TQt event loop, which unfortunately, runs only in the main thread.
 * This restriction will likely be lifted in TQt 4 and later.
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index c06c3ff..4c73290 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -166,7 +166,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked()
     langLView->addColumn(i18n("Language"));
     langLView->addColumn(i18n("Code"));
     langLView->setSelectionMode(TQListView::Single);
-    TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha();
+    TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha();
     TQString locale;
     TQString language;
     // Blank line so user can select no language.
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 91ae8fe..ccb621d 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -60,12 +60,12 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
 {
     if (m_stretchProc) return false;
     m_outFilename = outFilename;
-    m_stretchProc = new KProcess;
+    m_stretchProc = new TDEProcess;
     TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
     *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
-    connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
-        this, TQT_SLOT(slotProcessExited(KProcess*)));
-    if (!m_stretchProc->start(KProcess::NotifyOnExit, KProcess::NoCommunication))
+    connect(m_stretchProc, TQT_SIGNAL(processExited(TDEProcess*)),
+        this, TQT_SLOT(slotProcessExited(TDEProcess*)));
+    if (!m_stretchProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication))
     {
         kdDebug() << "Stretcher::stretch: Error starting audio stretcher process.  Is sox installed?" << endl;
         return false;
@@ -74,7 +74,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
     return true;
 }
 
-void Stretcher::slotProcessExited(KProcess*)
+void Stretcher::slotProcessExited(TDEProcess*)
 {
     m_stretchProc->deleteLater();
     m_stretchProc = 0;
diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h
index c6b4ca9..ca4e1a7 100644
--- a/kttsd/libkttsd/stretcher.h
+++ b/kttsd/libkttsd/stretcher.h
@@ -29,7 +29,7 @@
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 
-class KProcess;
+class TDEProcess;
 
 class KDE_EXPORT Stretcher : public TQObject{
     Q_OBJECT
@@ -82,14 +82,14 @@ class KDE_EXPORT Stretcher : public TQObject{
         void stretchFinished();
 
     private slots:
-        void slotProcessExited(KProcess* proc);
+        void slotProcessExited(TDEProcess* proc);
 
     private:
         // Stretcher state.
         int m_state;
 
         // Sox process.
-        KProcess* m_stretchProc;
+        TDEProcess* m_stretchProc;
 
         // Output file name.
         TQString m_outFilename;
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index c0d26ed..25b674e 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -182,7 +182,7 @@ void TalkerCode::normalize()
     TQString language = lang;
     if (language.left(1) == "*") language = language.mid(1);
     TQString charSet;
-    KGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet);
+    TDEGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet);
 }
 
 /**
@@ -218,11 +218,11 @@ void TalkerCode::normalize()
     else
     {
         splitFullLanguageCode(languageCode, twoAlpha, countryCode);
-        language = KGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
+        language = TDEGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
     }
     if (!countryCode.isEmpty())
     {
-        TQString countryName = KGlobal::locale()->twoAlphaToCountryName(countryCode);
+        TQString countryName = TDEGlobal::locale()->twoAlphaToCountryName(countryCode);
         // Some abbreviations to save screen space.
         if (countryName == i18n("full country name", "United States of America"))
             countryName = i18n("abbreviated country name", "USA");