From 0dd840ea93b773e0ae509a5c10602023364164fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= 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 ++-- kdesktop/lockeng.cc | 24 ++++++++++++------------ kdesktop/lockeng.h | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kdesktop') 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 diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index a8c98cf35..4f13dfa14 100644 --- a/kdesktop/lockeng.cc +++ b/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 ); } diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index 0643e82c7..ec0a7bf52 100644 --- a/kdesktop/lockeng.h +++ b/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; }; -- cgit v1.2.1