the convert patch

[lyx.git] / src / lyxlex.C

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 664d95cfe91a5e8febc8ff2cdb0f90fe759d6766..6758dc167d767a3632e2525785e5a0a6eaa6c6b4 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -18,6 +18,7 @@
 #include "debug.h"
 #include "lyxlex_pimpl.h"
 
+#include "support/convert.h"
 #include "support/lstrings.h"
 
 using lyx::support::compare_ascii_no_case;
@@ -25,8 +26,6 @@ using lyx::support::isStrDbl;
 using lyx::support::isStrInt;
 using lyx::support::ltrim;
 using lyx::support::prefixIs;
-using lyx::support::strToDbl;
-using lyx::support::strToInt;
 using lyx::support::subst;
 using lyx::support::trim;
 
@@ -121,20 +120,20 @@ int LyXLex::lex()
 int LyXLex::getInteger() const
 {
        if (isStrInt(pimpl_->getString()))
-               return strToInt(pimpl_->getString());
+               return convert<int>(pimpl_->getString());
        pimpl_->printError("Bad integer `$$Token'");
        return -1;
 }
 
 
-float LyXLex::getFloat() const
+double LyXLex::getFloat() const
 {
        // replace comma with dot in case the file was written with
        // the wrong locale (should be rare, but is easy enough to
        // avoid).
-       string str = subst(pimpl_->getString(), ",", ".");
+       string const str = subst(pimpl_->getString(), ",", ".");
        if (isStrDbl(str))
-               return strToDbl(str);
+               return convert<double>(str);
        pimpl_->printError("Bad float `$$Token'");
        return -1;
 }
@@ -256,7 +255,7 @@ LyXLex & LyXLex::operator>>(std::string & s)
 }
 
 
-LyXLex & LyXLex::operator>>(float & s)
+LyXLex & LyXLex::operator>>(double & s)
 {
        if (isOK()) {
                next();