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

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index bc5876aba6..79f4393ace 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,26 +1,39 @@
 // -*- C++ -*-
+/**
+ * \file lyxlex_pimpl.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYXLEX_PIMPL_H
 #define LYXLEX_PIMPL_H
 
 #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);
 	///
@@ -28,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);
 	///
@@ -44,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;
 	///
@@ -65,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) {}