diff options
| author | Timothy Pearson <[email protected]> | 2011-12-15 15:50:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-15 15:50:21 -0600 |
| commit | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch) | |
| tree | 89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /kalarm/lib/shellprocess.cpp | |
| parent | 1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff) | |
| download | tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kalarm/lib/shellprocess.cpp')
| -rw-r--r-- | kalarm/lib/shellprocess.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 09daf91db..b3df822e8 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -40,7 +40,7 @@ bool ShellProcess::mAuthorised = false; ShellProcess::ShellProcess(const TQString& command) : KShellProcess(shellName()), mCommand(command), - mtqStatus(INACTIVE), + mStatus(INACTIVE), mStdinExit(false) { } @@ -52,7 +52,7 @@ bool ShellProcess::start(Communication comm) { if (!authorised()) { - mtqStatus = UNAUTHORISED; + mStatus = UNAUTHORISED; return false; } KShellProcess::operator<<(mCommand); @@ -60,10 +60,10 @@ bool ShellProcess::start(Communication comm) connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) { - mtqStatus = START_FAIL; + mStatus = START_FAIL; return false; } - mtqStatus = RUNNING; + mStatus = RUNNING; return true; } @@ -76,11 +76,11 @@ void ShellProcess::slotExited(KProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); - mtqStatus = SUCCESS; + mStatus = SUCCESS; if (!proc->normalExit()) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n"; - mtqStatus = DIED; + mStatus = DIED; } else { @@ -90,7 +90,7 @@ void ShellProcess::slotExited(KProcess* proc) || mShellName == "ksh" && status == 127) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable\n"; - mtqStatus = NOT_FOUND; + mStatus = NOT_FOUND; } } emit shellExited(this); @@ -140,7 +140,7 @@ void ShellProcess::stdinExit() */ TQString ShellProcess::errorMessage() const { - switch (mtqStatus) + switch (mStatus) { case UNAUTHORISED: return i18n("Failed to execute command (shell access not authorized):"); @@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath() struct stat fileinfo; if (stat(envshell.data(), &fileinfo) != -1 // ensure file exists && !S_ISDIR(fileinfo.st_mode) // and it's not a directory - && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice - && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice + && !S_ISCHR(fileinfo.st_mode) // and it's not a character device + && !S_ISBLK(fileinfo.st_mode) // and it's not a block device #ifdef S_ISSOCK && !S_ISSOCK(fileinfo.st_mode) // and it's not a socket #endif |