diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /tdm/kfrontend/sakdlg.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend/sakdlg.cc')
| -rw-r--r-- | tdm/kfrontend/sakdlg.cc | 20 |
1 files changed, 10 insertions, 10 deletions
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; |