hopefully fix tex2lyx linking.

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 681c0a746ff82ce9d43d7f459a86019527fa0bc4..a5cb4a9d78e9e3ccf908cf9c643374386905d289 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,13 +14,23 @@
 
 #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 <fstream>
+#include <istream>
 #include <stack>
 #include <vector>
 
+
+namespace lyx {
+
 ///
 class LyXLex::Pimpl : boost::noncopyable {
 public:
@@ -29,6 +39,8 @@ public:
        ///
        std::string const getString() const;
        ///
+       docstring const getDocString() const;
+       ///
        void printError(std::string const & message) const;
        ///
        void printTable(std::ostream & os);
@@ -56,8 +68,9 @@ public:
        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.
-       gz::gzstreambuf gz_;
+       io::filtering_istreambuf gz_;
 
        /// the stream that we use.
        std::istream is;
@@ -68,7 +81,7 @@ public:
        ///
        int no_items;
        ///
-       std::vector<char> buff;
+       std::string buff;
        ///
        int status;
        ///
@@ -97,4 +110,7 @@ private:
        ///
        std::stack<pushed_table> pushed;
 };
+
+} // namespace lyx
+
 #endif