X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChktex.C;h=8e315bd9bdd0bd2a4a555d6afd8cd76499829faa;hb=fc8465aa1f6f29774d2f35d627b40198fa489cb1;hp=f4f9cf22da5b0052fce3e303fbd216030be4aad4;hpb=dfe1bc44b44903faf77ef454c98c4c3e56c1d5e3;p=lyx.git diff --git a/src/Chktex.C b/src/Chktex.C index f4f9cf22da..8e315bd9bd 100644 --- a/src/Chktex.C +++ b/src/Chktex.C @@ -1,19 +1,19 @@ /* This file is part of - * ====================================================== + * ====================================================== * * LyX, The Document Processor * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2000 The LyX Team. * * This file is Copyright 1997-1998 * Asger Alstrup * - *====================================================== + * ====================================================== */ #include -#include // atoi +#include #ifdef __GNUG__ #pragma implementation @@ -30,6 +30,9 @@ #include "support/path.h" #include "gettext.h" +using std::ifstream; +using std::getline; + /* * CLASS Chktex */ @@ -43,7 +46,7 @@ Chktex::Chktex(string const & chktex, string const & f, string const & p) int Chktex::run(TeXErrors &terr) { // run bibtex - string log = ChangeExtension(file, ".log", true); + string log = OnlyFilename(ChangeExtension(file, ".log")); string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log; Systemcalls one; int result= one.startscript(Systemcalls::System, tmp); @@ -56,12 +59,12 @@ int Chktex::run(TeXErrors &terr) } -int Chktex::scanLogFile(TeXErrors &terr) +int Chktex::scanLogFile(TeXErrors & terr) { string token; int retval = 0; - string tmp = ChangeExtension(file, ".log", true); + string tmp = OnlyFilename(ChangeExtension(file, ".log")); ifstream ifs(tmp.c_str()); while (getline(ifs, token)) { @@ -72,7 +75,7 @@ int Chktex::scanLogFile(TeXErrors &terr) token = split(token, warno, ':'); token = split(token, warning, ':'); - int lineno = atoi(line.c_str()); + int lineno = lyx::atoi(line); warno = _("ChkTeX warning id #") + warno; terr.insertError(lineno, warno, warning); ++retval;