Alfredo's second patch

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 3090b5d6d9d958734d1e127e8ef46a2ef9747e27..dd18a1262f70cce19d2ec75f66307fcd80dad229 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -3,27 +3,20 @@
 #ifndef LYXLEX_PIMPL_H
 #define LYXLEX_PIMPL_H
 
-#include <fstream>
-#include <stack>
-
 #include "lyxlex.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <boost/utility.hpp>
+
+#include <fstream>
+#include <stack>
+#include <vector>
 
 ///
-struct LyXLex::Pimpl : public noncopyable {
-       ///
-       enum {
-               ///
-               LEX_MAX_BUFF = 2048
-       };
-       
+struct LyXLex::Pimpl : boost::noncopyable {
        ///
        Pimpl(keyword_item * tab, int num);
        ///
-       string const GetString() const;
+       string const getString() const;
        ///
        void printError(string const & message) const;
        ///
@@ -45,7 +38,7 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
@@ -54,16 +47,16 @@ struct LyXLex::Pimpl : public noncopyable {
        std::filebuf fb__;
        /// the stream that we use.
        std::istream is;
-       /// 
+       ///
        string name;
        ///
        keyword_item * table;
        ///
        int no_items;
        ///
-       char buff[LEX_MAX_BUFF];
+       std::vector<char> buff;
        ///
-       short status;
+       int status;
        ///
        int lineno;
        ///