From f50945b8fd6f51bf679ef35153915da882f332de Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2020 10:06:39 -0700 Subject: [PATCH] QLocaleData: remove unused internal function Pick-to: 5.15 Change-Id: Iea47e0f8fc8b40378df7fffd1624bf3469e66c90 Reviewed-by: Edward Welbourne --- src/corelib/text/qlocale.cpp | 12 ------------ src/corelib/text/qlocale_p.h | 1 - 2 files changed, 13 deletions(-) diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 430991b83b7..159cbc0944d 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -3896,18 +3896,6 @@ qulonglong QLocaleData::stringToUnsLongLong(QStringView str, int base, bool *ok, return bytearrayToUnsLongLong(buff.constData(), base, ok); } -double QLocaleData::bytearrayToDouble(const char *num, bool *ok) -{ - bool nonNullOk = false; - int len = static_cast(strlen(num)); - Q_ASSERT(len >= 0); - int processed = 0; - double d = qt_asciiToDouble(num, len, nonNullOk, processed); - if (ok != nullptr) - *ok = nonNullOk; - return d; -} - qlonglong QLocaleData::bytearrayToLongLong(const char *num, int base, bool *ok) { bool _ok; diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index d822f86b723..fa614380414 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -265,7 +265,6 @@ public: qint64 stringToLongLong(QStringView str, int base, bool *ok, QLocale::NumberOptions options) const; quint64 stringToUnsLongLong(QStringView str, int base, bool *ok, QLocale::NumberOptions options) const; - static double bytearrayToDouble(const char *num, bool *ok); // this function is used in QIntValidator (QtGui) Q_CORE_EXPORT static qint64 bytearrayToLongLong(const char *num, int base, bool *ok); static quint64 bytearrayToUnsLongLong(const char *num, int base, bool *ok);