X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=79f4393acef51621bf74b71f86cf0513b947fc12;hb=37d42d45f3f4a5d3e916a080af50b37ae4a9d118;hp=79078d5d029ebc91c8d903032b5774a3f4de6a61;hpb=0705dae8a3a2bcdd6be55eb468547c1389e84d2c;p=lyx.git

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 79078d5d02..79f4393ace 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,21 +14,26 @@
 
 #include "lyxlex.h"
 
-#include "support/gzstream.h"
+#ifdef USE_COMPRESSION
+# include "support/gzstream.h"
+#endif
 
 #include <boost/utility.hpp>
 
+#include <fstream>
+#include <istream>
 #include <stack>
 #include <vector>
 
 ///
-struct LyXLex::Pimpl : boost::noncopyable {
+class LyXLex::Pimpl : boost::noncopyable {
+public:
 	///
 	Pimpl(keyword_item * tab, int num);
 	///
-	string const getString() const;
+	std::string const getString() const;
 	///
-	void printError(string const & message) const;
+	void printError(std::string const & message) const;
 	///
 	void printTable(std::ostream & os);
 	///
@@ -36,7 +41,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
 	///
 	void popTable();
 	///
-	bool setFile(string const & filename);
+	bool setFile(std::string const & filename);
 	///
 	void setStream(std::istream & i);
 	///
@@ -52,16 +57,19 @@ struct LyXLex::Pimpl : boost::noncopyable {
 	///
 	bool nextToken();
 	///
-	void pushToken(string const &);
-	/// fb__ is only used to open files, the stream is accessed through is.
-	std::filebuf fb__;
-	/// gz__ is only used to open files, the stream is accessed through is.
-	gz::gzstreambuf gz__;
+	void pushToken(std::string const &);
+	/// fb_ is only used to open files, the stream is accessed through is.
+	std::filebuf fb_;
+
+#ifdef USE_COMPRESSION
+	/// gz_ is only used to open files, the stream is accessed through is.
+	gz::gzstreambuf gz_;
+#endif
 
 	/// the stream that we use.
 	std::istream is;
 	///
-	string name;
+	std::string name;
 	///
 	keyword_item * table;
 	///
@@ -73,14 +81,15 @@ struct LyXLex::Pimpl : boost::noncopyable {
 	///
 	int lineno;
 	///
-	string pushTok;
+	std::string pushTok;
 	///
 	char commentChar;
 private:
 	///
 	void verifyTable();
 	///
-	struct pushed_table {
+	class pushed_table {
+	public:
 		///
 		pushed_table()
 			: table_elem(0), table_siz(0) {}