Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 085ed5fb2f50104a87cd01c08ed8aa6039a8f5ba..32afe035e67c28da44836546645933fce4f80ecc 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -30,7 +30,6 @@
 #include "support/FileZipListDir.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Path.h"
@@ -287,7 +286,7 @@ bool Converters::convert(Buffer const * buffer,
                                formats.extension(from_format);
                        string const to_ext = formats.extension(to_format);
                        string const command =
-                               support::os::python() + ' ' +
+                               os::python() + ' ' +
                                quoteName(libFileSearch("scripts", "convertDefault.py").toFilesystemEncoding()) +
                                ' ' +
                                quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
@@ -325,7 +324,7 @@ bool Converters::convert(Buffer const * buffer,
        string const path(onlyPath(from_file.absFilename()));
        // Prevent the compiler from optimizing away p
        FileName pp(path);
-       support::PathChanger p(pp);
+       PathChanger p(pp);
 
        // empty the error list before any new conversion takes place.
        errorList.clear();