From 56a533ea6c934f8fe05493be6939ed4dc298046c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 18 May 2016 11:53:27 +0000 Subject: [PATCH] use QByteArray::toDouble() instead of qstrtod Signed-off-by: Ivailo Monev --- src/core/tools/qlocale_tools.cpp | 4 ++-- src/core/tools/qlocale_tools_p.h | 2 +- src/declarative/qml/parser/qdeclarativejslexer.cpp | 6 +----- src/tools/lupdate/qscript.cpp | 4 +--- src/tools/lupdate/qscript.g | 4 +--- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/core/tools/qlocale_tools.cpp b/src/core/tools/qlocale_tools.cpp index f51c76f06..3ce4a9477 100644 --- a/src/core/tools/qlocale_tools.cpp +++ b/src/core/tools/qlocale_tools.cpp @@ -1567,7 +1567,7 @@ static const double tinytens[] = { 1e-16, 1e-32 }; */ static double g_double_zero = 0.0; -Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok) +double qstrtod(const char *s00, const char **se, bool *ok) { int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; @@ -2954,7 +2954,7 @@ Q_CORE_EXPORT char *qdtoa( double d, int mode, int ndigits, int *decpt, int *sig return *resultp; } -Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok) +double qstrtod(const char *s00, const char **se, bool *ok) { double ret = strtod((char*)s00, (char**)se); if (ok) { diff --git a/src/core/tools/qlocale_tools_p.h b/src/core/tools/qlocale_tools_p.h index 32998a49e..93e4eff12 100644 --- a/src/core/tools/qlocale_tools_p.h +++ b/src/core/tools/qlocale_tools_p.h @@ -113,7 +113,7 @@ bool removeGroupSeparators(QLocalePrivate::CharBuff *num); Q_CORE_EXPORT char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **digits_str); -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); +double qstrtod(const char *s00, char const **se, bool *ok); qlonglong qstrtoll(const char *nptr, const char **endptr, int base, bool *ok); qulonglong qstrtoull(const char *nptr, const char **endptr, int base, bool *ok); diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index fd76d4a5a..3802a671a 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -56,10 +56,6 @@ #include QT_BEGIN_NAMESPACE -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE #define shiftWindowsLineBreak() \ do { \ @@ -826,7 +822,7 @@ int Lexer::lex() double dval = 0; if (state == Number) { - dval = qstrtod(buffer8, 0, 0); + dval = QByteArray::fromRawData(buffer8, 0).toDouble(); } else if (state == Hex) { // scan hex numbers dval = integerFromString(buffer8, pos8, 16); state = Number; diff --git a/src/tools/lupdate/qscript.cpp b/src/tools/lupdate/qscript.cpp index a71664f02..1aecd80de 100644 --- a/src/tools/lupdate/qscript.cpp +++ b/src/tools/lupdate/qscript.cpp @@ -992,8 +992,6 @@ private: } // namespace QScript -extern double qstrtod(const char *s00, char const **se, bool *ok); - #define shiftWindowsLineBreak() if(current == '\r' && next1 == '\n') shift(1); namespace QScript { @@ -1733,7 +1731,7 @@ int QScript::Lexer::lex() double dval = 0; if (state == Number) { - dval = qstrtod(buffer8, 0, 0); + dval = QByteArray::fromRawData(buffer8, 0).toDouble(); } else if (state == Hex) { // scan hex numbers dval = QScript::integerFromString(buffer8, pos8, 16); state = Number; diff --git a/src/tools/lupdate/qscript.g b/src/tools/lupdate/qscript.g index 60495b9e8..10a7dc094 100644 --- a/src/tools/lupdate/qscript.g +++ b/src/tools/lupdate/qscript.g @@ -309,8 +309,6 @@ private: } // namespace QScript -extern double qstrtod(const char *s00, char const **se, bool *ok); - #define shiftWindowsLineBreak() if(current == '\r' && next1 == '\n') shift(1); namespace QScript { @@ -1050,7 +1048,7 @@ int QScript::Lexer::lex() double dval = 0; if (state == Number) { - dval = qstrtod(buffer8, 0, 0); + dval = QByteArray::fromRawData(buffer8, 0).toDouble(); } else if (state == Hex) { // scan hex numbers dval = QScript::integerFromString(buffer8, pos8, 16); state = Number; -- 2.11.0