#include "LaTeX.h" // TeXErrors
-#include "support/BoostFormat.h"
+#include "support/convert.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/systemcall.h"
+#include <boost/format.hpp>
+
#include <fstream>
-using lyx::support::atoi;
-using lyx::support::ChangeExtension;
-using lyx::support::OnlyFilename;
+using lyx::support::changeExtension;
+using lyx::support::onlyFilename;
using lyx::support::split;
using lyx::support::Systemcall;
using std::getline;
-
+using std::string;
using std::ifstream;
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);
string token;
int retval = 0;
- string const tmp = OnlyFilename(ChangeExtension(file, ".log"));
+ string const tmp = onlyFilename(changeExtension(file, ".log"));
#if USE_BOOST_FORMAT
boost::format msg(_("ChkTeX warning id # %1$d"));
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;