Continue to improve GtkLengthEntry

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index ae7cbf7fd9faf31b6d30fee58cfdeca2c2050b39..79f4393acef51621bf74b71f86cf0513b947fc12 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,32 +1,39 @@
 // -*- C++ -*-
+/**
+ * \file lyxlex_pimpl.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYXLEX_PIMPL_H
 #define LYXLEX_PIMPL_H
 
-#include <fstream>
-#include <stack>
-#include <boost/utility.hpp>
-
 #include "lyxlex.h"
 
-#ifdef __GNUG__
-#pragma interface
+#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 {
-       ///
-       enum {
-               ///
-               LEX_MAX_BUFF = 2048
-       };
-       
+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;
+       void printError(std::string const & message) const;
        ///
        void printTable(std::ostream & os);
        ///
@@ -34,7 +41,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        void popTable();
        ///
-       bool setFile(string const & filename);
+       bool setFile(std::string const & filename);
        ///
        void setStream(std::istream & i);
        ///
@@ -46,36 +53,43 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
-       void pushToken(string const &);
-       /// fb__ is only used to open files, the stream is accessed through is
-       std::filebuf fb__;
+       void pushToken(std::string const &);
+       /// 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;
-       /// 
-       string name;
+       ///
+       std::string name;
        ///
        keyword_item * table;
        ///
        int no_items;
        ///
-       char buff[LEX_MAX_BUFF];
+       std::vector<char> buff;
        ///
-       short status;
+       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) {}