the spellcheck cleanup

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 0f7d57a6732214403adde4e8e669cae6e7626c9b..4d582a54f36475bca9fcae67605cbb20eadf1091 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -13,24 +13,27 @@
 #include <config.h>
 
 #include "lyxlex_pimpl.h"
+
 #include "debug.h"
 
-#include "support/lyxalgo.h"
 #include "support/filetools.h"
+#include "support/lyxalgo.h"
 #include "support/lstrings.h"
 
-#include <algorithm>
-
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::getExtFromContents;
+using lyx::support::MakeDisplayPath;
+using lyx::support::split;
+using lyx::support::subst;
 
+using std::endl;
+using std::getline;
+using std::lower_bound;
 using std::sort;
-using std::ostream;
+using std::string;
 using std::ios;
 using std::istream;
-using std::endl;
-using std::lower_bound;
-using std::vector;
-using std::getline;
+using std::ostream;
 
 // namespace {
 struct compare_tags {
@@ -130,12 +133,12 @@ bool LyXLex::Pimpl::setFile(string const & filename)
        string const format = getExtFromContents(filename);
 
        if (format == "gzip" || format == "zip" || format == "compress") {
-               lyxerr << "lyxlex: compressed" << endl;
+               lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
 
                // The check only outputs a debug message, because it triggers
                // a bug in compaq cxx 6.2, where is_open() returns 'true' for
                // a fresh new filebuf.  (JMarc)
-               if (gz__.is_open() || is.tellg() > 0)
+               if (gz__.is_open() || istream::off_type(is.tellg()) > -1)
                        lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
                gz__.open(filename.c_str(), ios::in);
@@ -144,12 +147,12 @@ bool LyXLex::Pimpl::setFile(string const & filename)
                lineno = 0;
                return gz__.is_open() && is.good();
        } else {
-               lyxerr << "lyxlex: UNcompressed" << endl;
+               lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;
 
                // The check only outputs a debug message, because it triggers
                // a bug in compaq cxx 6.2, where is_open() returns 'true' for
                // a fresh new filebuf.  (JMarc)
-               if (fb__.is_open() || is.tellg() > 0)
+               if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
                        lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                                "file or stream already set." << endl;
                fb__.open(filename.c_str(), ios::in);
@@ -163,7 +166,7 @@ bool LyXLex::Pimpl::setFile(string const & filename)
 
 void LyXLex::Pimpl::setStream(istream & i)
 {
-       if (fb__.is_open() || is.tellg() > 0)
+       if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
                lyxerr[Debug::LYXLEX]  << "Error in LyXLex::setStream: "
                        "file or stream already set." << endl;
        is.rdbuf(i.rdbuf());