Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 3090b5d6d9d958734d1e127e8ef46a2ef9747e27..d0ec72e4567c7c586b04cf7fc24507860c3d4f87 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -3,27 +3,25 @@
 #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>
 
 ///
-struct LyXLex::Pimpl : public noncopyable {
+struct LyXLex::Pimpl : boost::noncopyable {
        ///
        enum {
                ///
                LEX_MAX_BUFF = 2048
        };
-       
+
        ///
        Pimpl(keyword_item * tab, int num);
        ///
-       string const GetString() const;
+       string const getString() const;
        ///
        void printError(string const & message) const;
        ///
@@ -45,7 +43,7 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
@@ -54,7 +52,7 @@ struct LyXLex::Pimpl : public noncopyable {
        std::filebuf fb__;
        /// the stream that we use.
        std::istream is;
-       /// 
+       ///
        string name;
        ///
        keyword_item * table;
@@ -63,7 +61,7 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        char buff[LEX_MAX_BUFF];
        ///
-       short status;
+       int status;
        ///
        int lineno;
        ///