diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-11-10 23:01:34 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-11-16 16:15:31 -0800 |
| commit | 308f9ae8f041e0cac47fdca55f1172a7d3ea892d (patch) | |
| tree | c9e617df3f1e3ad2856f8e556d5fec894082f7f1 /src | |
| parent | 07ac4690c707d8552f251ce2f602c537495c07c4 (diff) | |
QString: rewrite toDouble() and toFloat() using QStringView
The implementations are identical. Just reuse them. And move the two
QStringView functions closer, instead of where they are today which
lacks apparent motivation.
Pick-to: 6.4
Change-Id: Ieba79baf5ac34264a988fffd172675ac3584f94b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 4db2723be7..f954e8b25d 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -7482,6 +7482,11 @@ qulonglong QString::toIntegral_helper(QStringView string, bool *ok, uint base) double QString::toDouble(bool *ok) const { + return QStringView(*this).toDouble(ok); +} + +double QStringView::toDouble(bool *ok) const +{ return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator); } @@ -7520,6 +7525,11 @@ float QString::toFloat(bool *ok) const return QLocaleData::convertDoubleToFloat(toDouble(ok), ok); } +float QStringView::toFloat(bool *ok) const +{ + return QLocaleData::convertDoubleToFloat(toDouble(ok), ok); +} + /*! \fn QString &QString::setNum(int n, int base) Sets the string to the printed value of \a n in the specified \a @@ -11164,16 +11174,6 @@ void QAbstractConcatenable::appendLatin1To(QLatin1StringView in, QChar *out) noe qt_from_latin1(reinterpret_cast<char16_t *>(out), in.data(), size_t(in.size())); } -double QStringView::toDouble(bool *ok) const -{ - return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator); -} - -float QStringView::toFloat(bool *ok) const -{ - return QLocaleData::convertDoubleToFloat(toDouble(ok), ok); -} - /*! \fn template <typename T> qsizetype erase(QString &s, const T &t) \relates QString |