don't draw invisible things...

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 0250142766ff8247a749af0b4e2f2ef2c8e01553..8ab0ff809ba948e222a7ed4b68804d84e3ee9e35 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -18,21 +18,22 @@
 
 #include "converter.h"
 #include "lyxrc.h"
-#include "support/syscall.h"
-#include "support/path.h"
-#include "support/filetools.h"
 #include "buffer.h"
 #include "bufferview_funcs.h"
 #include "LaTeX.h"
 #include "LyXView.h"
-#include "lyx_gui_misc.h"
 #include "lyx_cb.h" // ShowMessage()
-#include "support/lyxfunctional.h"
-#include "frontends/Alert.h"
 #include "gettext.h"
 #include "BufferView.h"
 #include "debug.h"
 
+#include "frontends/Alert.h"
+
+#include "support/filetools.h"
+#include "support/lyxfunctional.h"
+#include "support/path.h"
+#include "support/systemcall.h"
+
 using std::vector;
 using std::queue;
 using std::endl;
@@ -195,8 +196,8 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        ShowMessage(buffer, _("Executing command:"), command);
 
        Path p(OnlyPath(filename));
-       Systemcalls one;
-       int const res = one.startscript(Systemcalls::SystemDontWait, command);
+       Systemcall one;
+       int const res = one.startscript(Systemcall::DontWait, command);
 
        if (res) {
                Alert::alert(_("Cannot view file"),
@@ -644,12 +645,12 @@ bool Converters::convert(Buffer const * buffer,
                        if (buffer)
                                ShowMessage(buffer, _("Executing command:"), command);
 
-                       Systemcalls::Starttype type = (dummy)
-                               ? Systemcalls::SystemDontWait : Systemcalls::System;
-                       Systemcalls one;
+                       Systemcall::Starttype type = (dummy)
+                               ? Systemcall::DontWait : Systemcall::Wait;
+                       Systemcall one;
                        int res;
                        if (conv.original_dir && buffer) {
-                               Path p(buffer->filepath);
+                               Path p(buffer->filePath());
                                res = one.startscript(type, command);
                        } else
                                res = one.startscript(type, command);
@@ -659,7 +660,7 @@ bool Converters::convert(Buffer const * buffer,
                                string const command2 = conv.parselog +
                                        " < " + QuoteName(infile2 + ".out") +
                                        " > " + QuoteName(logfile);
-                               one.startscript(Systemcalls::System, command2);
+                               one.startscript(Systemcall::Wait, command2);
                                if (!scanLog(buffer, command, logfile))
                                        return false;
                        }
@@ -851,7 +852,7 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command)
 
        // do the LaTex run(s)
        TeXErrors terr;
-       LaTeX latex(command, name, buffer->filepath);
+       LaTeX latex(command, name, buffer->filePath());
        int result = latex.run(terr,
                               bv ? bv->owner()->getLyXFunc() : 0);