TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems...

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

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index ed1e857b072e8f8210ff9c1ea10437b1ac060e34..98d8d125dea618b29523f795670bb042f8b410d3 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -61,6 +61,15 @@ public:
        void appendMessage(QString const &) {}
        void appendError(QString const &) {}
        void clearMessages() {}
+       void lyxerrFlush() {}
+
+       void lyxerrConnect() {}
+       void lyxerrDisconnect() {}
+
+       void warning(QString const &, QString const &) {}
+       void toggleWarning(QString const &, QString const &, QString const &) {}
+       void error(QString const &, QString const &) {}
+       void information(QString const &, QString const &) {}
 };
 
 
@@ -266,9 +275,9 @@ void SystemcallPrivate::startProcess(const QString& cmd)
 
 void SystemcallPrivate::processEvents()
 {
-       //if(process_events) {
-               QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-       //}
+       if(process_events) {
+               QCoreApplication::processEvents(/*QEventLoop::ExcludeUserInputEvents*/);
+       }
 }
 
 
@@ -343,12 +352,19 @@ void SystemcallPrivate::flush()
                // If the output has been redirected, we write it all at once.
                // Even if we are not running in a terminal, the output could go
                // to some log file, for example ~/.xsession-errors on *nix.
-               if (!os::is_terminal(os::STDOUT) && outfile.empty())
-                       cout << fromqstr(QString::fromLocal8Bit(
-                                               proc_->readAllStandardOutput().data()));
-               if (!os::is_terminal(os::STDERR))
-                       cerr << fromqstr(QString::fromLocal8Bit(
-                                               proc_->readAllStandardError().data()));
+               
+               QString data = QString::fromLocal8Bit(proc_->readAllStandardOutput().data());
+               if (showout_) 
+                       ProgressInterface::instance()->appendMessage(data);
+               if (!os::is_terminal(os::STDOUT) && outfile.empty()) 
+                       cout << fromqstr(data);
+               
+               data = QString::fromLocal8Bit(proc_->readAllStandardError().data());
+               if (showerr_) 
+                       ProgressInterface::instance()->appendError(data);
+               if (!os::is_terminal(os::STDERR)) 
+                       cerr << fromqstr(data);                 
+               
        }
 }
 
@@ -363,15 +379,13 @@ void SystemcallPrivate::stdOut()
                        if (c == '\n' || outindex_ + 1 == bufsize_) {
                                outdata_[outindex_] = '\0';
                                outindex_ = 0;
-                               if (showout_)
+                               if (showout_) {
                                        cout << outdata_;
+                                       ProgressInterface::instance()->appendMessage(QString::fromLocal8Bit(outdata_));         
+                               }
                        }
                }
        }
-       const QString data = QString::fromLocal8Bit(outdata_);
-       if (!data.isEmpty())
-               ProgressInterface::instance()->appendMessage(data);
-       processEvents();
 }
 
 
@@ -385,29 +399,31 @@ void SystemcallPrivate::stdErr()
                        if (c == '\n' || errindex_ + 1 == bufsize_) {
                                errdata_[errindex_] = '\0';
                                errindex_ = 0;
-                               if (showerr_)
+                               if (showerr_) {
                                        cerr << errdata_;
+                                       ProgressInterface::instance()->appendError(QString::fromLocal8Bit(errdata_));
+                               }
                        }
                }
        }
-       const QString data = QString::fromLocal8Bit(errdata_);
-       if (!data.isEmpty())
-               ProgressInterface::instance()->appendError(data);
-       processEvents();
 }
 
 
 void SystemcallPrivate::processStarted()
 {
-       state = Running;
-       ProgressInterface::instance()->processStarted(cmd_);
+       if (state != Running) {
+               state = Running;
+               ProgressInterface::instance()->processStarted(cmd_);
+       }
 }
 
 
 void SystemcallPrivate::processFinished(int, QProcess::ExitStatus)
 {
-       state = Finished;
-       ProgressInterface::instance()->processFinished(cmd_);
+       if (state != Finished) {
+               state = Finished;
+               ProgressInterface::instance()->processFinished(cmd_);
+       }
 }