Lars says _(_(b)) is a bug ... fix

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 8f92cb70ec30cdb337292f6edeccc4b6e49ff0cf..1f63abc1115d7fcaa4e93306eb16c7a54e78fce4 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -5,6 +5,7 @@
 
 #include <fstream>
 #include <stack>
+#include <boost/utility.hpp>
 
 #include "lyxlex.h"
 
@@ -13,17 +14,17 @@
 #endif
 
 ///
-struct LyXLex::Pimpl : public boost::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 +46,7 @@ struct LyXLex::Pimpl : public boost::noncopyable {
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
@@ -54,7 +55,7 @@ struct LyXLex::Pimpl : public boost::noncopyable {
        std::filebuf fb__;
        /// the stream that we use.
        std::istream is;
-       /// 
+       ///
        string name;
        ///
        keyword_item * table;
@@ -63,7 +64,7 @@ struct LyXLex::Pimpl : public boost::noncopyable {
        ///
        char buff[LEX_MAX_BUFF];
        ///
-       short status;
+       int status;
        ///
        int lineno;
        ///