From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kalarm/lib/shellprocess.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kalarm/lib/shellprocess.h') diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index a4ff79889..fd303bea0 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -61,7 +61,7 @@ class ShellProcess : public KShellProcess * @li NOT_FOUND - the command was either not found or not executable. * @li START_FAIL - the command couldn't be started for other reasons. */ - enum Status { + enum tqStatus { INACTIVE, // start() has not yet been called to run the command RUNNING, // command is currently running SUCCESS, // command appears to have exited successfully @@ -80,11 +80,11 @@ class ShellProcess : public KShellProcess */ bool start(Communication comm = NoCommunication); /** Returns the current status of the shell process. */ - Status status() const { return mStatus; } + tqStatus status() const { return mtqStatus; } /** Returns whether the command was run successfully. * @return True if the command has been run and appears to have exited successfully. */ - bool normalExit() const { return mStatus == SUCCESS; } + bool normalExit() const { return mtqStatus == SUCCESS; } /** Returns the command configured to be run. */ const TQString& command() const { return mCommand; } /** Returns the error message corresponding to the command exit status. @@ -132,7 +132,7 @@ class ShellProcess : public KShellProcess static bool mAuthorised; // true if shell commands are authorised TQString mCommand; // copy of command to be executed TQValueList mStdinQueue; // queued strings to send to STDIN - Status mStatus; // current execution status + tqStatus mtqStatus; // current execution status bool mStdinExit; // exit once STDIN queue has been written }; -- cgit v1.2.1