CMake: fix merged build, seems GCC could not handle the namespaces correctly

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

diff --git a/src/support/SystemcallPrivate.h b/src/support/SystemcallPrivate.h
index 93918ac71213a946e26b6fcd7aea0710380bd7b8..820beac4f0f2d196d59981f0d83a56390032212b 100644 (file)
--- a/src/support/SystemcallPrivate.h
+++ b/src/support/SystemcallPrivate.h
@@ -13,29 +13,54 @@
 #define SYSTEMCALLPRIVATE_H
 
 #include <QObject>
+#include <QProcess>
 
-class QProcess;
+#include <string>
 
 namespace lyx {
 namespace support {
 
+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 
  * stdout/stderr have not been redirected.
  */
-class ConOut : public QObject
+class SystemcallPrivate : public QObject
 {
        Q_OBJECT
 public:
-       ConOut(QProcess * proc);
-       ~ConOut();
+       SystemcallPrivate(std::string const & outfile);
+       ~SystemcallPrivate();
 
        /// Should the standard output be displayed?
-       void showout() { showout_ = true; }
+       void setShowOut(bool val) { showout_ = val; }
 
        /// Should the standard error be displayed?
-       void showerr() { showerr_ = true; }
+       void setShowErr(bool val) { showerr_ = val; }
+
+       enum State {
+               Starting,
+               Running,
+               Finished,
+               Error
+       };
+       State state;
+
+       bool waitWhile(State, bool processEvents, int timeout = -1);
+       void startProcess(const QString& cmd);
+       
+       int exitCode();
+
+       QString errorMessage() const;
+       QString exitStatusMessage() const;
+
+       void flush();
+
+       QProcess* releaseProcess();
+       
+       static void killProcess(QProcess * p);
 
 private:
        /// Pointer to the process to monitor.
@@ -44,6 +69,8 @@ private:
        size_t outindex_;
        /// Index to the standard error buffer.
        size_t errindex_;
+       ///
+       std::string outfile;
        /// Size of buffers.
        static size_t const bufsize_ = 200;
        /// Standard output buffer.
@@ -54,10 +81,23 @@ private:
        bool showout_;
        /// 
        bool showerr_;
+       bool process_events;
+       QString cmd_;
+
+       void waitAndProcessEvents();
+       void processEvents();
+
+       void killProcess();
 
 public Q_SLOTS:
        void stdOut();
        void stdErr();
+       void processError(QProcess::ProcessError);
+       void processStarted();
+       void processFinished(int, QProcess::ExitStatus status);
+
+Q_SIGNALS:
+
 };
 
 } // namespace support