Continue to improve GtkLengthEntry

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 52ea84d33b6f2456039ae35ac66789c69fc6ca67..79f4393acef51621bf74b71f86cf0513b947fc12 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -14,15 +14,20 @@
 
 #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);
        ///
@@ -53,10 +58,13 @@ struct LyXLex::Pimpl : boost::noncopyable {
        bool nextToken();
        ///
        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__;
+       /// 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;
@@ -80,7 +88,8 @@ private:
        ///
        void verifyTable();
        ///
-       struct pushed_table {
+       class pushed_table {
+       public:
                ///
                pushed_table()
                        : table_elem(0), table_siz(0) {}