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

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 79078d5d02..c844fb4c1c 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,21 +14,35 @@
 
 #include "lyxlex.h"
 
-#include "support/gzstream.h"
+#include "support/types.h"
+
+# include <boost/iostreams/filtering_streambuf.hpp>
+# include <boost/iostreams/filter/gzip.hpp>
+# include <boost/iostreams/device/file.hpp>
+namespace io = boost::iostreams;
 
 #include <boost/utility.hpp>
 
+#include <istream>
 #include <stack>
 #include <vector>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
-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;
+	docstring const getDocString() const;
+	///
+	void printError(std::string const & message) const;
 	///
 	void printTable(std::ostream & os);
 	///
@@ -36,7 +50,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
 	///
 	void popTable();
 	///
-	bool setFile(string const & filename);
+	bool setFile(support::FileName const & filename);
 	///
 	void setStream(std::istream & i);
 	///
@@ -52,35 +66,37 @@ 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_;
+
+	/// gz_ is only used to open files, the stream is accessed through is.
+	io::filtering_istreambuf gz_;
 
 	/// the stream that we use.
 	std::istream is;
 	///
-	string name;
+	std::string name;
 	///
 	keyword_item * table;
 	///
 	int no_items;
 	///
-	std::vector<char> buff;
+	std::string buff;
 	///
 	int status;
 	///
 	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) {}
@@ -95,4 +111,7 @@ private:
 	///
 	std::stack<pushed_table> pushed;
 };
+
+} // namespace lyx
+
 #endif