X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=c844fb4c1ca56d4a3baecdd5d44d1032e8250c4d;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=e449c8b08ec5b34695489b15c11e846ca1546871;hpb=5cf8376ef7cd5f1132c5f9ebb66db59d06bbb64b;p=lyx.git

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index e449c8b08e..c844fb4c1c 100644
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,20 +14,24 @@
 
 #include "lyxlex.h"
 
-#ifdef USE_COMPRESSION
+#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;
-#endif
 
 #include <boost/utility.hpp>
 
-#include <fstream>
 #include <istream>
 #include <stack>
 #include <vector>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 class LyXLex::Pimpl : boost::noncopyable {
 public:
@@ -36,6 +40,8 @@ public:
 	///
 	std::string const getString() const;
 	///
+	docstring const getDocString() const;
+	///
 	void printError(std::string const & message) const;
 	///
 	void printTable(std::ostream & os);
@@ -44,7 +50,7 @@ public:
 	///
 	void popTable();
 	///
-	bool setFile(std::string const & filename);
+	bool setFile(support::FileName const & filename);
 	///
 	void setStream(std::istream & i);
 	///
@@ -64,10 +70,8 @@ public:
 	/// 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.
 	io::filtering_istreambuf gz_;
-#endif
 
 	/// the stream that we use.
 	std::istream is;
@@ -78,7 +82,7 @@ public:
 	///
 	int no_items;
 	///
-	std::vector<char> buff;
+	std::string buff;
 	///
 	int status;
 	///
@@ -107,4 +111,7 @@ private:
 	///
 	std::stack<pushed_table> pushed;
 };
+
+} // namespace lyx
+
 #endif