Fix the WorkArea problems.

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 0acc50974d2b92d6a82a4fd7fa3fd690bf269651..9aecd59bd3d118a03b5ac246bfd960fdf2682d76 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,7 +14,7 @@
 #endif
 
 ///
-struct LyXLex::Pimpl : public noncopyable {
+struct LyXLex::Pimpl : boost::noncopyable {
        ///
        enum {
                ///
@@ -23,7 +24,7 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        Pimpl(keyword_item * tab, int num);
        ///
-       string const GetString() const;
+       string const getString() const;
        ///
        void printError(string const & message) const;
        ///
@@ -37,13 +38,15 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        void setStream(std::istream & i);
        ///
+       void setCommentChar(char c);
+       ///
        bool next(bool esc = false);
        ///
        int search_kw(char const * const tag) const;
        ///
        int lex();
        ///
-       bool EatLine();
+       bool eatLine();
        ///
        bool nextToken();
        ///
@@ -61,11 +64,13 @@ struct LyXLex::Pimpl : public noncopyable {
        ///
        char buff[LEX_MAX_BUFF];
        ///
-       short status;
+       int status;
        ///
        int lineno;
        ///
        string pushTok;
+       ///
+       char commentChar;
 private:
        ///
        void verifyTable();