Fix my breakage. Sorry guys.

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index d63ce35b994b8740e7c0e4f18b2fe36d1bde831a..4ccd0cb57c01dbdb9d2795e4744e7c678cf53e0b 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -22,7 +22,7 @@
 #include "DepTable.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
@@ -84,7 +84,7 @@ namespace {
 
 string runMessage(unsigned int count)
 {
-       return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
+       return bformat(_("Waiting for LaTeX run number %1$d"), count);
 }
 
 } // anon namespace
@@ -384,11 +384,7 @@ int LaTeX::run(TeXErrors & terr)
 
 int LaTeX::startscript()
 {
-#ifndef __EMX__
-       string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";
-#else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null"
-       string tmp = cmd + ' ' + file + " > nul";
-#endif
+       string tmp = cmd + ' ' + QuoteName(file) + " > " + os::nulldev();
        Systemcall one;
        return one.startscript(Systemcall::Wait, tmp);
 }
@@ -416,7 +412,7 @@ LaTeX::scanAuxFiles(string const & file)
        result.push_back(scanAuxFile(file));
 
        for (int i = 1; i < 1000; ++i) {
-               string file2 = ChangeExtension(file, "") + '.' + tostr(i)
+               string file2 = ChangeExtension(file, "") + '.' + convert<string>(i)
                        + ".aux";
                FileInfo fi(file2);
                if (!fi.exist())