X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChktex.cpp;h=816837a025c4967611cb2bf6ae0bef29d9ea7f84;hb=5c03cb340c2214a3142f254622b0efaaa654ec44;hp=02271e308c603d381c83b089acb81423f30d8853;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git diff --git a/src/Chktex.cpp b/src/Chktex.cpp index 02271e308c..816837a025 100644 --- a/src/Chktex.cpp +++ b/src/Chktex.cpp @@ -21,8 +21,6 @@ #include "support/lstrings.h" #include "support/Systemcall.h" -#include - using namespace std; using namespace lyx::support; @@ -58,11 +56,7 @@ int Chktex::scanLogFile(TeXErrors & terr) // or whether makeAbsPath(onlyFileName()) is a noop here FileName const tmp(makeAbsPath(onlyFileName(changeExtension(file, ".log")))); -#if USE_BOOST_FORMAT - boost::basic_format 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 @@ -81,13 +75,7 @@ int Chktex::scanLogFile(TeXErrors & terr) int const lineno = convert(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; }