fix ru.po typo

[lyx.git] / src / Chktex.C

diff --git a/src/Chktex.C b/src/Chktex.C
index f4f9cf22da5b0052fce3e303fbd216030be4aad4..74ee7ac09ac9924c1cb94b05c41230f3be561bd9 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -1,34 +1,38 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *           This file is Copyright 1997-1998
  *           Asger Alstrup
  *
- *======================================================
+ * ====================================================== 
  */
 
 #include <config.h>
 
-#include <cstdlib> // atoi
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "Chktex.h"
 #include "LaTeX.h" // TeXErrors
-#include "support/filetools.h"
 #include "lyxlex.h"
-#include "support/FileInfo.h"
 #include "debug.h"
+#include "gettext.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/syscall.h"
-#include "support/syscontr.h"
 #include "support/path.h"
-#include "gettext.h"
+#include "support/lstrings.h"
+
+#include <fstream>
+
+using std::ifstream;
+using std::getline;
 
 /*
  * CLASS Chktex
@@ -43,10 +47,10 @@ 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);
+       int result= one.startscript(Systemcalls::Wait, tmp);
        if (result == 0) {
                result = scanLogFile(terr);
        } else {
@@ -56,23 +60,27 @@ 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)) {
-               string srcfile, line, pos, warno, warning;
+               string srcfile;
+               string line;
+               string pos;
+               string warno;
+               string warning;
                token = split(token, srcfile, ':');
                token = split(token, line, ':');
                token = split(token, pos, ':');
                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;