More requires --> required, for C++2a.

[lyx.git] / src / support / SystemcallPrivate.h

diff --git a/src/support/SystemcallPrivate.h b/src/support/SystemcallPrivate.h
index 6534d07faac0854043f79aab3c58c69517310ddd..6ab479f73c329fd5b68a786b9cd6a608c478e9a2 100644 (file)
--- a/src/support/SystemcallPrivate.h
+++ b/src/support/SystemcallPrivate.h
@@ -24,7 +24,7 @@ class Systemcall;
 
 /**
  * Outputs to the console terminal the line buffered standard output and
- * error of a spawned process when there is a controlling terminal and 
+ * error of a spawned process when there is a controlling terminal and
  * stdout/stderr have not been redirected.
  */
 class SystemcallPrivate : public QObject
@@ -40,22 +40,27 @@ public:
                Starting,
                Running,
                Finished,
-               Error
+               Error,
+               Killed
        };
        State state;
 
        bool waitWhile(State, bool processEvents, int timeout = -1);
-       void startProcess(QString const & cmd, std::string const & path, bool detach);
-       
+       void startProcess(QString const & cmd, std::string const & path,
+                         std::string const & lpath, bool detach);
+
        int exitCode();
 
        QString errorMessage() const;
        QString exitStatusMessage() const;
 
        QProcess* releaseProcess();
-       
+
        static void killProcess(QProcess * p);
 
+       // when true, kill any running script ASAP
+       static bool kill_script;
+
 
 public Q_SLOTS:
        void stdOut();
@@ -92,8 +97,11 @@ private:
 
        void waitAndProcessEvents();
        void processEvents();
-       void killProcess();     
+       void killProcess();
 
+       /// returns false if we killed the process
+       /// actually returns Systemcall::ReturnValue
+       bool waitAndCheck();
 };
 
 } // namespace support