Some more fixes to compiler warnings.

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index c65b24724b908711946090b2d8aa2fd39b151d5a..f884ccd8ebcb622797022b1fcc6b84daebf6d4a9 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,7 +29,7 @@ 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);
@@ -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);
        ///
@@ -78,16 +78,16 @@ public:
        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
@@ -99,11 +99,9 @@ public:
        string const getLongString(string const & endtag);
        
        ///
-       bool EatLine();
+       bool eatLine();
        ///
-       int FindToken(char const * str[]);
-       ///
-       int CheckToken(char const * str[], int print_error);
+       int findToken(char const * str[]);
 
        ///
        string const text() const;