Remove unneeded mutable keywords

[lyx.git] / src / support / Systemcall.cpp

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index d87f5902ece51906a2cdc73d2d11d2f8c1710f25..467f04bd8409db36c1f5fc60780082eb964bab1a 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -71,14 +71,14 @@ public:
 
        void warning(QString const &, QString const &) {}
        void toggleWarning(QString const &, QString const &, QString const &) {}
-       void error(QString const &, QString const &) {}
+       void error(QString const &, QString const &, QString const &) {}
        void information(QString const &, QString const &) {}
        int prompt(docstring const &, docstring const &, int default_but, int,
                   docstring const &, docstring const &) { return default_but; }
 };
 
 
-static ProgressInterface* progress_instance = 0;
+static ProgressInterface * progress_instance = 0;
 
 void ProgressInterface::setInstance(ProgressInterface* p)
 {
@@ -86,7 +86,7 @@ void ProgressInterface::setInstance(ProgressInterface* p)
 }
 
 
-ProgressInterface* ProgressInterface::instance()
+ProgressInterface * ProgressInterface::instance()
 {
        if (!progress_instance) {
                static ProgressDummy dummy;
@@ -103,13 +103,8 @@ ProgressInterface* ProgressInterface::instance()
 int Systemcall::startscript(Starttype how, string const & what,
                            std::string const & path, bool /*process_events*/)
 {
-       string const python_call = "python -tt";
-       string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)));
-
-       if (prefixIs(what, python_call))
-               command += os::python() + what.substr(python_call.length());
-       else
-               command += what;
+       string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)))
+                      + commandPrep(what);
 
        if (how == DontWait) {
                switch (os::shell()) {
@@ -240,29 +235,45 @@ string const parsecmd(string const & incmd, string & infile, string & outfile,
 int Systemcall::startscript(Starttype how, string const & what,
                            string const & path, bool process_events)
 {
-       lyxerr << "\nRunning: " << what << endl;
+       string const what_ss = commandPrep(what);
+       LYXERR(Debug::INFO,"Running: " << what_ss);
 
        string infile;
        string outfile;
        string errfile;
        QString const cmd = QString::fromLocal8Bit(
-                       parsecmd(what, infile, outfile, errfile).c_str());
+                       parsecmd(what_ss, infile, outfile, errfile).c_str());
 
        SystemcallPrivate d(infile, outfile, errfile);
 
-
-       d.startProcess(cmd, path);
+#ifdef Q_OS_WIN32
+       // QProcess::startDetached cannot provide environment variables. When the
+       // environment variables are set using the latexEnvCmdPrefix and the process
+       // is started with QProcess::startDetached, a console window is shown every 
+       // time a viewer is started. To avoid this, we fall back on Windows to the 
+       // original implementation that creates a QProcess object.
+       d.startProcess(cmd, path, false);
        if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
                LYXERR0("Systemcall: '" << cmd << "' did not start!");
                LYXERR0("error " << d.errorMessage());
                return 10;
        }
-
        if (how == DontWait) {
-               QProcess* released = d.releaseProcess();
-               (void) released; // TODO who deletes it?
+               d.releaseProcess();
+               return 0;
+       }
+#else
+       d.startProcess(cmd, path, how == DontWait);
+       if (how == DontWait && d.state == SystemcallPrivate::Running)
                return 0;
+
+       if (d.state == SystemcallPrivate::Error
+                       || !d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
+               LYXERR0("Systemcall: '" << cmd << "' did not start!");
+               LYXERR0("error " << d.errorMessage());
+               return 10;
        }
+#endif
 
        if (!d.waitWhile(SystemcallPrivate::Running, process_events,
                         os::timeout_min() * 60 * 1000)) {
@@ -349,10 +360,18 @@ SystemcallPrivate::SystemcallPrivate(std::string const & sf,
 }
 
 
-void SystemcallPrivate::startProcess(QString const & cmd, string const & path)
+void SystemcallPrivate::startProcess(QString const & cmd, string const & path, bool detached)
 {
        cmd_ = cmd;
-       if (process_) {
+       if (detached) {
+               state = SystemcallPrivate::Running;
+               if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path)) + cmd_)) {
+                       state = SystemcallPrivate::Error;
+                       return;
+               }
+               QProcess* released = releaseProcess();
+               delete released;
+       } else if (process_) {
                state = SystemcallPrivate::Starting;
                process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_);
        }