Restore the version number position on the splash screen

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 7d8bb710ebc89cbba18a78e50f1be800a61e85d8..4fc2022eb4a25a5b6a65403f4423f2699ff8c186 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -49,7 +49,6 @@ using support::makeAbsPath;
 using support::makeRelPath;
 using support::onlyFilename;
 using support::onlyPath;
-using support::Path;
 using support::prefixIs;
 using support::quoteName;
 using support::removeExtension;
@@ -317,7 +316,7 @@ bool Converters::convert(Buffer const * buffer,
                                quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) +
                                ' ' +
                                quoteName(to_ext + ':' + to_file.toFilesystemEncoding());
-                       lyxerr[Debug::FILES]
+                       LYXERR(Debug::FILES)
                                << "No converter defined! "
                                   "I use convertDefault.py:\n\t"
                                << command << endl;
@@ -348,8 +347,10 @@ bool Converters::convert(Buffer const * buffer,
        // This has the added benefit that all other files that may be
        // generated by the converter are deleted when LyX closes and do not
        // clutter the real working directory.
-       string path = onlyPath(from_file.absFilename());
-       Path p(path);
+       string const path(onlyPath(from_file.absFilename()));
+       // Prevent the compiler from optimizing away p
+       FileName pp(path);
+       support::Path p(pp);
 
        // empty the error list before any new conversion takes place.
        errorList.clear();
@@ -364,7 +365,7 @@ bool Converters::convert(Buffer const * buffer,
                Converter const & conv = converterlist_[*cit];
                bool dummy = conv.To->dummy() && conv.to != "program";
                if (!dummy)
-                       lyxerr[Debug::FILES] << "Converting from  "
+                       LYXERR(Debug::FILES) << "Converting from  "
                               << conv.from << " to " << conv.to << endl;
                infile = outfile;
                outfile = FileName(conv.result_dir.empty()
@@ -385,22 +386,25 @@ bool Converters::convert(Buffer const * buffer,
                if (conv.latex) {
                        run_latex = true;
                        string const command = subst(conv.command, token_from, "");
-                       lyxerr[Debug::FILES] << "Running " << command << endl;
+                       LYXERR(Debug::FILES) << "Running " << command << endl;
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
                } else {
                        if (conv.need_aux && !run_latex
                            && !latex_command_.empty()) {
-                               lyxerr[Debug::FILES]
+                               LYXERR(Debug::FILES)
                                        << "Running " << latex_command_
                                        << " to update aux file"<<  endl;
                                runLaTeX(*buffer, latex_command_, runparams, errorList);
                        }
 
+                       // FIXME UNICODE
                        string const infile2 = (conv.original_dir)
-                               ? infile.absFilename() : makeRelPath(infile.absFilename(), path);
+                               ? infile.absFilename() : to_utf8(makeRelPath(from_utf8(infile.absFilename()),
+                                                                            from_utf8(path)));
                        string const outfile2 = (conv.original_dir)
-                               ? outfile.absFilename() : makeRelPath(outfile.absFilename(), path);
+                               ? outfile.absFilename() : to_utf8(makeRelPath(from_utf8(outfile.absFilename()),
+                                                                             from_utf8(path)));
 
                        string command = conv.command;
                        command = subst(command, token_from, quoteName(infile2));
@@ -418,7 +422,7 @@ bool Converters::convert(Buffer const * buffer,
                                command = add_options(command,
                                                      dvipdfm_options(buffer->params()));
 
-                       lyxerr[Debug::FILES] << "Calling " << command << endl;
+                       LYXERR(Debug::FILES) << "Calling " << command << endl;
                        if (buffer)
                                buffer->message(_("Executing command: ")
                                + from_utf8(command));
@@ -428,7 +432,8 @@ bool Converters::convert(Buffer const * buffer,
                        Systemcall one;
                        int res;
                        if (conv.original_dir) {
-                               Path p(buffer->filePath());
+                               FileName path(buffer->filePath());
+                               support::Path p(path);
                                res = one.startscript(type,
                                        to_filesystem8bit(from_utf8(command)));
                        } else
@@ -440,7 +445,7 @@ bool Converters::convert(Buffer const * buffer,
                                if (!mover.rename(outfile, real_outfile))
                                        res = -1;
                                else
-                                       lyxerr[Debug::FILES]
+                                       LYXERR(Debug::FILES)
                                                << "renaming file " << outfile
                                                << " to " << real_outfile
                                                << endl;
@@ -528,7 +533,7 @@ bool Converters::move(string const & fmt,
                        string const to2 = changeExtension(
                                to_base + file2.substr(base.length()),
                                to_extension);
-                       lyxerr[Debug::FILES] << "moving " << from2
+                       LYXERR(Debug::FILES) << "moving " << from2
                                             << " to " << to2 << endl;
 
                        Mover const & mover = getMover(fmt);