Account for old versions of Pygments

[lyx.git] / src / Chktex.cpp

diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 2af1ed0487a20bdf118fd9b112a1e07bed8c52bf..816837a025c4967611cb2bf6ae0bef29d9ea7f84 100644 (file)
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -11,42 +11,31 @@
 #include <config.h>
 
 #include "Chktex.h"
-#include "gettext.h"
 
 #include "LaTeX.h" // TeXErrors
 
 #include "support/convert.h"
 #include "support/docstream.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 
-#include <boost/format.hpp>
-
-using std::getline;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::changeExtension;
-using support::FileName;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::split;
-using support::Systemcall;
-
 
 Chktex::Chktex(string const & chktex, string const & f, string const & p)
                : cmd(chktex), file(f), path(p)
-{
-}
+{}
 
 
 int Chktex::run(TeXErrors &terr)
 {
        // run bibtex
-       string log = onlyFilename(changeExtension(file, ".log"));
+       string log = onlyFileName(changeExtension(file, ".log"));
        string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
        Systemcall one;
        int result = one.startscript(Systemcall::Wait, tmp);
@@ -63,19 +52,15 @@ int Chktex::scanLogFile(TeXErrors & terr)
 {
        int retval = 0;
 
-       // FIXME: Find out whether onlyFilename() is really needed,
-       // or whether makeAbsPath(onlyFilename()) is a noop here
-       FileName const tmp(makeAbsPath(onlyFilename(changeExtension(file, ".log"))));
+       // FIXME: Find out whether onlyFileName() is really needed,
+       // or whether makeAbsPath(onlyFileName()) is a noop here
+       FileName const tmp(makeAbsPath(onlyFileName(changeExtension(file, ".log"))));
 
-#if USE_BOOST_FORMAT
-       boost::basic_format<char_type> msg(_("ChkTeX warning id # %1$d"));
-#else
-       docstring const msg(_("ChkTeX warning id # "));
-#endif
+       docstring const msg(_("ChkTeX warning id # %1$s"));
        docstring token;
        // FIXME UNICODE
        // We have no idea what the encoding of the error file is
-       idocfstream ifs(tmp.toFilesystemEncoding().c_str());
+       ifdocstream ifs(tmp.toFilesystemEncoding().c_str());
        while (getline(ifs, token)) {
                docstring srcfile;
                docstring line;
@@ -90,13 +75,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
 
                int const lineno = convert<int>(line);
 
-#if USE_BOOST_FORMAT
-               msg % warno;
-               terr.insertError(lineno, msg.str(), warning);
-               msg.clear();
-#else
-               terr.insertError(lineno, msg + warno, warning);
-#endif
+               terr.insertError(lineno, bformat(msg, warno), warning);
 
                ++retval;
        }