X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.h;h=dc16b52b1a7a7a19c3f1764d72dbb123e70c02fa;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=05ab00ad25358221d5d41b5baa7ebd3b950a7b9e;hpb=a5e85854f8a30623a448af5b7d0c6352ea2329c0;p=lyx.git diff --git a/src/lyxlex.h b/src/lyxlex.h index 05ab00ad25..dc16b52b1a 100644 --- a/src/lyxlex.h +++ b/src/lyxlex.h @@ -55,10 +55,10 @@ public: LEX_TOKEN = -4 }; - /// straem is open and end of straem is not reached + /// stream is open and end of stream is not reached bool isOK() const; /// stream is ok - operator void *() const; + operator void const *() const; /// stream is not ok bool operator!() const; /// return true if able to open file, else false @@ -96,7 +96,7 @@ public: /// bool getBool() const; /// - float getFloat() const; + double getFloat() const; /// std::string const getString() const; @@ -111,8 +111,6 @@ public: /// bool eatLine(); - /// - int findToken(char const * str[]); /// Pushes a token list on a stack and replaces it with a new one. void pushTable(keyword_item *, int); @@ -133,8 +131,6 @@ public: /// extract string LyXLex & operator>>(std::string &); - /// extract float - LyXLex & operator>>(float &); /// extract double LyXLex & operator>>(double &); /// extract integer @@ -145,7 +141,7 @@ public: LyXLex & operator>>(bool &); private: - struct Pimpl; + class Pimpl; /// Pimpl * pimpl_; }; @@ -155,9 +151,10 @@ private: This is needed to ensure that the pop is done upon exit from methods with more than one exit point or that can return as a response to exceptions. - @autor Lgb + @author Lgb */ -struct pushpophelper { +class pushpophelper { +public: /// pushpophelper(LyXLex & lexrc, keyword_item * i, int s) : lex(lexrc) { lex.pushTable(i, s);