Alfredo's second patch

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 4c8f6e2f7535d47b1230e12d5d1450ca3d7d60a4..c590c74c534c5a568fda0d2a23785e945ccd4bd3 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -52,12 +52,6 @@ int LyXLex::getLineNo() const
 }
 
 
-string const LyXLex::text() const
-{
-       return &pimpl_->buff[0];
-}
-
-
 istream & LyXLex::getStream()
 {
        return pimpl_->is;
@@ -191,9 +185,9 @@ string const LyXLex::getLongString(string const & endtoken)
 
 bool LyXLex::getBool() const
 {
-       if (compare(pimpl_->buff, "true") == 0) {
+       if (pimpl_->getString() == "true") {
                return true;
-       } else if (compare(pimpl_->buff, "false") != 0) {
+       } else if (pimpl_->getString() != "false") {
                pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
        }
        return false;
@@ -233,8 +227,10 @@ int LyXLex::findToken(char const * str[])
 
        int i = 0;
 
-       if (compare(pimpl_->buff, "default")) {
-               while (str[i][0] && compare(str[i], pimpl_->buff)) {
+       string const search_token = pimpl_->getString();
+
+       if (search_token != "default") {
+               while (str[i][0] && str[i] != search_token) {
                        ++i;
                }
                if (!str[i][0]) {