* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 37edc5dde3852d249f3d201a8cee183063f9ef07..0cea5a852f7819faf05e088bafebad38f39494b1 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -431,7 +431,7 @@ bool Converters::convert(Buffer const * buffer,
                                res = one.startscript(type, command);
 
                        if (!real_outfile.empty()) {
-                               Mover const & mover = movers(conv.to);
+                               Mover const & mover = getMover(conv.to);
                                if (!mover.rename(outfile, real_outfile))
                                        res = -1;
                                else
@@ -451,7 +451,7 @@ bool Converters::convert(Buffer const * buffer,
                                        " < " + quoteName(infile2 + ".out") +
                                        " > " + quoteName(logfile);
                                one.startscript(Systemcall::Wait, command2);
-                               if (!scanLog(*buffer, command, FileName(makeAbsPath(logfile, path)), errorList))
+                               if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
                                        return false;
                        }
 
@@ -483,7 +483,7 @@ bool Converters::convert(Buffer const * buffer,
                                            token_base, from_base);
                        string const to = subst(conv.result_dir,
                                          token_base, to_base);
-                       Mover const & mover = movers(conv.from);
+                       Mover const & mover = getMover(conv.from);
                        if (!mover.rename(FileName(from), FileName(to))) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(_("Could not move a temporary directory from %1$s to %2$s."),
@@ -525,7 +525,7 @@ bool Converters::move(string const & fmt,
                        lyxerr[Debug::FILES] << "moving " << from2
                                             << " to " << to2 << endl;
 
-                       Mover const & mover = movers(fmt);
+                       Mover const & mover = getMover(fmt);
                        bool const moved = copy
                                ? mover.copy(*it, FileName(to2))
                                : mover.rename(*it, FileName(to2));
@@ -697,12 +697,4 @@ Converters::getPath(string const & from, string const & to)
                          formats.getNumber(to));
 }
 
-
-/// The global instance
-Converters converters;
-
-// The global copy after reading lyxrc.defaults
-Converters system_converters;
-
-
 } // namespace lyx