Fix unintended rename of SAKProcess*

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;
             }

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();
 }

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

kdesktop/lockeng.cc

@@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
     : TQWidget(),
       KScreensaverIface(),
       mBlankOnly(false),
-      mSATDEProcess(NULL),
+      mSAKProcess(NULL),
       mTerminationRequested(false)
 {
     struct sigaction act;
@@ -86,9 +86,9 @@ SaverEngine::SaverEngine()
     connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
                         TQT_SLOT(lockProcessExited()));
 
-    mSATDEProcess = new TDEProcess;
-    *mSATDEProcess << "tdmtsak";
-    connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+    mSAKProcess = new TDEProcess;
+    *mSAKProcess << "tdmtsak";
+    connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
 
     TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
 
@@ -134,7 +134,7 @@ void SaverEngine::lock()
     bool ok = true;
     if (mState != Saving)
     {
-        mSATDEProcess->kill(SIGTERM);
+        mSAKProcess->kill(SIGTERM);
         ok = startLockProcess( ForceLock );
         // It takes a while for kdesktop_lock to start and lock the screen.
         // Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
@@ -179,7 +179,7 @@ void SaverEngine::save()
 {
     if (mState == Waiting)
     {
-        mSATDEProcess->kill(SIGTERM);
+        mSAKProcess->kill(SIGTERM);
         startLockProcess( DefaultLock );
     }
 }
@@ -276,18 +276,18 @@ void SaverEngine::enableExports()
 void SaverEngine::handleSecureDialog()
 {
     // Wait for SAK press
-    if (!mSATDEProcess->isRunning()) mSATDEProcess->start();
+    if (!mSAKProcess->isRunning()) mSAKProcess->start();
 }
 
-void SaverEngine::slotSATDEProcessExited()
+void SaverEngine::slotSAKProcessExited()
 {
-    int retcode = mSATDEProcess->exitStatus();
-    if ((retcode != 0) && (mSATDEProcess->normalExit())) {
+    int retcode = mSAKProcess->exitStatus();
+    if ((retcode != 0) && (mSAKProcess->normalExit())) {
         trinity_lockeng_sak_available = FALSE;
         printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d).  Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
     }
 
-    if ((mSATDEProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
+    if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
         bool ok = true;
         if (mState == Waiting)
         {
@@ -525,7 +525,7 @@ void SaverEngine::idleTimeout()
     // disable X screensaver
     XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
     XSetScreenSaver(tqt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures);
-    mSATDEProcess->kill(SIGTERM);
+    mSAKProcess->kill(SIGTERM);
     startLockProcess( DefaultLock );
 }
 

kdesktop/lockeng.h

@@ -89,7 +89,7 @@ protected slots:
 
 private slots:
     void handleSecureDialog();
-    void slotSATDEProcessExited();
+    void slotSAKProcessExited();
 
     /**
      * Enable wallpaper exports
@@ -123,7 +123,7 @@ protected:
     TQValueVector< DCOPClientTransaction* > mLockTransactions;
 
 private:
-    TDEProcess*   mSATDEProcess;
+    TDEProcess*   mSAKProcess;
     bool        mTerminationRequested;
 };
 

tdm/kfrontend/sakdlg.cc

@@ -125,17 +125,17 @@ SAKDlg::SAKDlg(TQWidget *parent)
 
     installEventFilter(this);
 
-    mSATDEProcess = new TDEProcess;
-    *mSATDEProcess << "tdmtsak" << "dm";
-    connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
-    mSATDEProcess->start();
+    mSAKProcess = new TDEProcess;
+    *mSAKProcess << "tdmtsak" << "dm";
+    connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+    mSAKProcess->start();
 
     TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
 }
 
-void SAKDlg::slotSATDEProcessExited()
+void SAKDlg::slotSAKProcessExited()
 {
-    int retcode = mSATDEProcess->exitStatus();
+    int retcode = mSAKProcess->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") {
-		mSATDEProcess->kill();
+		mSAKProcess->kill();
 	}
 	if (!closingDown) {
 		TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
@@ -221,9 +221,9 @@ void SAKDlg::handleInputPipe(void) {
 
 SAKDlg::~SAKDlg()
 {
-    if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
-        mSATDEProcess->kill(SIGTERM);
-        delete mSATDEProcess;
+    if ((mSAKProcess) && (mSAKProcess->isRunning())) {
+        mSAKProcess->kill(SIGTERM);
+        delete mSAKProcess;
     }
     if (mPipe_fd != -1) {
         closingDown = true;

tdm/kfrontend/sakdlg.h

@@ -37,7 +37,7 @@ public:
     void closeDialogForced();
 
 private slots:
-    void slotSATDEProcessExited();
+    void slotSAKProcessExited();
     void handleInputPipe();
 
 protected slots:
@@ -52,7 +52,7 @@ private:
     TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
-    TDEProcess*   mSATDEProcess;
+    TDEProcess*   mSAKProcess;
     int         mPipe_fd;
     TQString mPipeFilename;