X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChktex.C;h=bb9258c207d60c570e0e835bbe7b4454f31f827c;hb=3c851f1f7951f3a24b57826f3e580e4318b5e6c4;hp=33e9d2e683e116b70a0e238d35f56e36b161c61d;hpb=f228e412032ef6e82121168863f4313fc82e440d;p=lyx.git

diff --git a/src/Chktex.C b/src/Chktex.C
index 33e9d2e683..bb9258c207 100644
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -11,26 +11,27 @@
 #include <config.h>
 
 #include "Chktex.h"
-#include "LaTeX.h" // TeXErrors
-#include "lyxlex.h"
-#include "debug.h"
 #include "gettext.h"
 
-#include "support/FileInfo.h"
+#include "LaTeX.h" // TeXErrors
+
+#include "support/convert.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
-#include "support/path.h"
 #include "support/systemcall.h"
 
-#include "support/BoostFormat.h"
+#include <boost/format.hpp>
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::ChangeExtension;
+using lyx::support::OnlyFilename;
+using lyx::support::split;
+using lyx::support::Systemcall;
 
-using std::ifstream;
 using std::getline;
+using std::string;
+using std::ifstream;
 
 
 Chktex::Chktex(string const & chktex, string const & f, string const & p)
@@ -63,7 +64,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
 	string const tmp = OnlyFilename(ChangeExtension(file, ".log"));
 
 #if USE_BOOST_FORMAT
-	boost::format msg(STRCONV(_("ChkTeX warning id # %1$d")));
+	boost::format msg(_("ChkTeX warning id # %1$d"));
 #else
 	string const msg(_("ChkTeX warning id # "));
 #endif
@@ -80,11 +81,11 @@ int Chktex::scanLogFile(TeXErrors & terr)
 		token = split(token, warno, ':');
 		token = split(token, warning, ':');
 
-		int const lineno = atoi(line);
+		int const lineno = convert<int>(line);
 
 #if USE_BOOST_FORMAT
 		msg % warno;
-		terr.insertError(lineno, STRCONV(msg.str()), warning);
+		terr.insertError(lineno, msg.str(), warning);
 		msg.clear();
 #else
 		terr.insertError(lineno, msg + warno, warning);