From 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:40:41 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 ksayit/KTTSD_Lib/kttsdlib.cpp          |  2 +-
 ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp | 10 +++++-----
 ksayit/KTTSD_Lib/kttsdlibsetupimpl.h   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ksayit/KTTSD_Lib')

diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index a3a0269..ff2e023 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -30,7 +30,7 @@
 KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl)
  : TQObject(parent, name), m_Appl(Appl)
 {
-    KGlobal::locale()->insertCatalogue("libKTTSD");
+    TDEGlobal::locale()->insertCatalogue("libKTTSD");
     m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker");
     connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)),
         this, TQT_SLOT(slotTextFinished(const uint)) );
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
index 86f5c14..b0bc36c 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
@@ -54,18 +54,18 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
     }
 
     // invoke the Control Center Module
-    KProcess *kcmproc = new KProcess();
-    connect(kcmproc, TQT_SIGNAL(processExited(KProcess*)),
-                    this, TQT_SLOT(slotKCMProcessExited(KProcess*)) );
+    TDEProcess *kcmproc = new TDEProcess();
+    connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)),
+                    this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) );
     (*kcmproc) << "kcmshell";
     (*kcmproc) << "kcmkttsd";
-    kcmproc->start(KProcess::NotifyOnExit);
+    kcmproc->start(TDEProcess::NotifyOnExit);
 
     kcm_Button->setEnabled(false);
 }
 
 
-void KTTSDlibSetupImpl::slotKCMProcessExited(KProcess *p)
+void KTTSDlibSetupImpl::slotKCMProcessExited(TDEProcess *p)
 {
     kdDebug(100200) << "slotKCMProcessExited()" << endl;
     kcm_Button->setEnabled(true);
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
index 6b5e253..c2b4add 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
@@ -41,7 +41,7 @@ private slots:
 
 	/** Called when the Control Center Module was closed.
 	 */
-	void slotKCMProcessExited(KProcess *p);
+	void slotKCMProcessExited(TDEProcess *p);
 };
 
 #endif
-- 
cgit v1.2.1