diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-01-30 12:33:51 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-29 04:30:10 +0000 |
| commit | 8c779f97605d667e85944898252b24e6bc00f54a (patch) | |
| tree | bdfe0e5bcf904092bf1c8ade3fd2d1e9d3be7ba1 /src/corelib/tools/qstring.cpp | |
| parent | 3fc09372fbb25a525e58960aca22138dae368f1e (diff) | |
QLocalePrivate: port number parsing to QStringView
This ports all functions in qlocale_p.h to QStringView that can be
ported with the QStringView features we already have.
Prerequisite for QStringView::to<Integer>(), and
QLocale::to<Integer>(QStringView).
Change-Id: I52112dc199cdf3a8545e722399b1c9cceaf797e1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 3af6438f93..0e8a4cc39d 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6364,7 +6364,7 @@ qlonglong QString::toIntegral_helper(const QChar *data, int len, bool *ok, int b } #endif - return QLocaleData::c()->stringToLongLong(data, len, base, ok, QLocale::RejectGroupSeparator); + return QLocaleData::c()->stringToLongLong(QStringView(data, len), base, ok, QLocale::RejectGroupSeparator); } @@ -6404,7 +6404,7 @@ qulonglong QString::toIntegral_helper(const QChar *data, uint len, bool *ok, int } #endif - return QLocaleData::c()->stringToUnsLongLong(data, len, base, ok, + return QLocaleData::c()->stringToUnsLongLong(QStringView(data, len), base, ok, QLocale::RejectGroupSeparator); } @@ -6606,7 +6606,7 @@ ushort QString::toUShort(bool *ok, int base) const double QString::toDouble(bool *ok) const { - return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocale::RejectGroupSeparator); + return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator); } /*! @@ -10863,7 +10863,7 @@ ushort QStringRef::toUShort(bool *ok, int base) const double QStringRef::toDouble(bool *ok) const { - return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocale::RejectGroupSeparator); + return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator); } /*! |