diff options
Diffstat (limited to 'kalarm/lib/shellprocess.cpp')
| -rw-r--r-- | kalarm/lib/shellprocess.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 209f1aad8..09daf91db 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), - mStatus(INACTIVE), + mtqStatus(INACTIVE), mStdinExit(false) { } @@ -52,7 +52,7 @@ bool ShellProcess::start(Communication comm) { if (!authorised()) { - mStatus = UNAUTHORISED; + mtqStatus = 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)) { - mStatus = START_FAIL; + mtqStatus = START_FAIL; return false; } - mStatus = RUNNING; + mtqStatus = RUNNING; return true; } @@ -76,11 +76,11 @@ void ShellProcess::slotExited(KProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); - mStatus = SUCCESS; + mtqStatus = SUCCESS; if (!proc->normalExit()) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n"; - mStatus = DIED; + mtqStatus = 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"; - mStatus = NOT_FOUND; + mtqStatus = NOT_FOUND; } } emit shellExited(this); @@ -140,7 +140,7 @@ void ShellProcess::stdinExit() */ TQString ShellProcess::errorMessage() const { - switch (mStatus) + switch (mtqStatus) { case UNAUTHORISED: return i18n("Failed to execute command (shell access not authorized):"); @@ -153,7 +153,7 @@ TQString ShellProcess::errorMessage() const case RUNNING: case SUCCESS: default: - return TQString::null; + return TQString(); } } @@ -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 device - && !S_ISBLK(fileinfo.st_mode) // and it's not a block device + && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice + && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice #ifdef S_ISSOCK && !S_ISSOCK(fileinfo.st_mode) // and it's not a socket #endif |