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

---
 tdm/kfrontend/sakdlg.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tdm/kfrontend/sakdlg.cc')

diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index b81a1cafa..dfa65a945 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -125,17 +125,17 @@ SAKDlg::SAKDlg(TQWidget *parent)
 
     installEventFilter(this);
 
-    mSAKProcess = new KProcess;
-    *mSAKProcess << "tdmtsak" << "dm";
-    connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
-    mSAKProcess->start();
+    mSATDEProcess = new TDEProcess;
+    *mSATDEProcess << "tdmtsak" << "dm";
+    connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+    mSATDEProcess->start();
 
     TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
 }
 
-void SAKDlg::slotSAKProcessExited()
+void SAKDlg::slotSATDEProcessExited()
 {
-    int retcode = mSAKProcess->exitStatus();
+    int retcode = mSATDEProcess->exitStatus();
     if (retcode != 0) trinity_desktop_lock_use_sak = false;
     closingDown = true;
     hide();
@@ -207,7 +207,7 @@ void SAKDlg::handleInputPipe(void) {
 	inputcommand = inputcommand.replace('\n', "");
 	TQStringList commandList = TQStringList::split('\t', inputcommand, false);
 	if ((*(commandList.at(0))) == "CLOSE") {
-		mSAKProcess->kill();
+		mSATDEProcess->kill();
 	}
 	if (!closingDown) {
 		TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
@@ -221,9 +221,9 @@ void SAKDlg::handleInputPipe(void) {
 
 SAKDlg::~SAKDlg()
 {
-    if ((mSAKProcess) && (mSAKProcess->isRunning())) {
-        mSAKProcess->kill(SIGTERM);
-        delete mSAKProcess;
+    if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
+        mSATDEProcess->kill(SIGTERM);
+        delete mSATDEProcess;
     }
     if (mPipe_fd != -1) {
         closingDown = true;
-- 
cgit v1.2.1