using support::makeRelPath;
using support::onlyFilename;
using support::onlyPath;
-using support::Path;
using support::prefixIs;
using support::quoteName;
using support::removeExtension;
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;
// 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();
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()
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);
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));
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
if (!mover.rename(outfile, real_outfile))
res = -1;
else
- lyxerr[Debug::FILES]
+ LYXERR(Debug::FILES)
<< "renaming file " << outfile
<< " to " << real_outfile
<< endl;
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);