work around for bug reported by Mario Morandini

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index c65b24724b908711946090b2d8aa2fd39b151d5a..143a88d087547bf7e04d0dc7560ec3b01ccab01c 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -21,7 +21,7 @@ struct keyword_item {
        ///
        char const * tag;
        ///
-       short code;
+       int code;
 };
 
 /** Generalized simple lexical analizer.
@@ -29,13 +29,13 @@ struct keyword_item {
     texclass and others to come.
     @see lyxrc.C for an example of usage.
   */
-class LyXLex : public boost::noncopyable { 
+class LyXLex : boost::noncopyable {
 public:
        ///
        LyXLex (keyword_item *, int);
        ///
        ~LyXLex();
-       
+
        /// Lex basic codes
        enum {
                ///
@@ -49,7 +49,7 @@ public:
        };
 
        /// file is open and end of file is not reached
-       bool IsOK() const;
+       bool isOK() const;
        /// return true if able to open file, else false
        bool setFile(string const & filename);
        ///
@@ -76,19 +76,19 @@ public:
        bool nextToken();
        /// Push a token, that next token got from lyxlex.
        void pushToken(string const &);
-       
-       /// 
-       int GetLineNo() const;
-       
+
+       ///
+       int getLineNo() const;
+
        ///
-       int GetInteger() const;
+       int getInteger() const;
        ///
-       bool GetBool() const;
+       bool getBool() const;
        ///
-       float GetFloat() const;
+       float getFloat() const;
        ///
-       string const GetString() const;
-       
+       string const getString() const;
+
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
            serves as a template for how many spaces the lines
@@ -97,13 +97,11 @@ public:
            perfectly if you use tabs.
        */
        string const getLongString(string const & endtag);
-       
-       ///
-       bool EatLine();
+
        ///
-       int FindToken(char const * str[]);
+       bool eatLine();
        ///
-       int CheckToken(char const * str[], int print_error);
+       int findToken(char const * str[]);
 
        ///
        string const text() const;
@@ -111,7 +109,7 @@ public:
        /** Pushes a token list on a stack and replaces it with a new one.
         */
        void pushTable(keyword_item *, int);
-       
+
        /** Pops a token list into void and replaces it with the one now
            on top of the stack.
        */