* remove various xforms relicts, in particular:

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index e3109d158f40df73c221eb11e31352813968b837..1a9a06c89c8f047fd74ff9533157846c06437c65 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,15 +14,21 @@
 
 #include "lyxlex.h"
 
-#include "support/gzstream.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>
 
 ///
-struct LyXLex::Pimpl : boost::noncopyable {
+class LyXLex::Pimpl : boost::noncopyable {
+public:
        ///
        Pimpl(keyword_item * tab, int num);
        ///
@@ -55,8 +61,9 @@ struct LyXLex::Pimpl : boost::noncopyable {
        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;
@@ -80,7 +87,8 @@ private:
        ///
        void verifyTable();
        ///
-       struct pushed_table {
+       class pushed_table {
+       public:
                ///
                pushed_table()
                        : table_elem(0), table_siz(0) {}