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* --- tdm/kfrontend/sakdlg.cc | 20 ++++++++++---------- tdm/kfrontend/sakdlg.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tdm/kfrontend') diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index d9f1a1e40..b68418e15 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/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; diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h index a3ccad96e..cb4dcec05 100644 --- a/tdm/kfrontend/sakdlg.h +++ b/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; -- cgit v1.2.1