From 0dd840ea93b773e0ae509a5c10602023364164fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 9 Mar 2013 17:18:55 +0100
Subject: Fix unintended rename of SAKProcess*

---
 kdesktop/lock/lockprocess.cc | 10 +++++-----
 kdesktop/lock/sakdlg.cc      | 18 +++++++++---------
 kdesktop/lock/sakdlg.h       |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kdesktop/lock')

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 288541ff9..aaa3998af 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1833,11 +1833,11 @@ bool LockProcess::checkPass()
 
         if (trinity_desktop_lock_use_sak) {
             // Verify SAK operational status
-            TDEProcess* checkSATDEProcess = new TDEProcess;
-            *checkSATDEProcess << "tdmtsak" << "check";
-            checkSATDEProcess->start(TDEProcess::Block, TDEProcess::NoCommunication);
-            int retcode = checkSATDEProcess->exitStatus();
-            delete checkSATDEProcess;
+            TDEProcess* checkSAKProcess = new TDEProcess;
+            *checkSAKProcess << "tdmtsak" << "check";
+            checkSAKProcess->start(TDEProcess::Block, TDEProcess::NoCommunication);
+            int retcode = checkSAKProcess->exitStatus();
+            delete checkSAKProcess;
             if (retcode != 0) {
                 trinity_desktop_lock_use_sak = false;
             }
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 5fca73e24..b16433b6d 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -104,24 +104,24 @@ SAKDlg::SAKDlg(LockProcess *parent)
     installEventFilter(this);
     setFixedSize( sizeHint() );
 
-    mSATDEProcess = new TDEProcess;
-    *mSATDEProcess << "tdmtsak";
-    connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
-    mSATDEProcess->start();
+    mSAKProcess = new TDEProcess;
+    *mSAKProcess << "tdmtsak";
+    connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+    mSAKProcess->start();
 }
 
-void SAKDlg::slotSATDEProcessExited()
+void SAKDlg::slotSAKProcessExited()
 {
-    int retcode = mSATDEProcess->exitStatus();
+    int retcode = mSAKProcess->exitStatus();
     if (retcode != 0) trinity_desktop_lock_use_sak = false;
     hide();
 }
 
 SAKDlg::~SAKDlg()
 {
-    if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
-        mSATDEProcess->kill(SIGTERM);
-        delete mSATDEProcess;
+    if ((mSAKProcess) && (mSAKProcess->isRunning())) {
+        mSAKProcess->kill(SIGTERM);
+        delete mSAKProcess;
     }
     hide();
 }
diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index 7bc8d1fab..5810b8771 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -37,7 +37,7 @@ public:
     void closeDialogForced();
 
 private slots:
-    void slotSATDEProcessExited();
+    void slotSAKProcessExited();
 
 protected slots:
     virtual void reject();
@@ -51,7 +51,7 @@ private:
     TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
-    TDEProcess*   mSATDEProcess;
+    TDEProcess*   mSAKProcess;
 };
 
 #endif
-- 
cgit v1.2.1