diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-27 18:18:10 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 00:34:25 +0100 |
| commit | ed7458a8a66416c106ad33871a288091058d01ea (patch) | |
| tree | 6098a3a4804561fe2392d2b7a654ee38069888bb /src/corelib/tools/qstring.cpp | |
| parent | 1b26ef0c0c894a720b163333396054a8571e2581 (diff) | |
QLocalePrivate: move the stringToXxx to QLocaleData
Along with some more helper functions.
There are two more functions used in QIntValidator
Change-Id: I469ef40426cbb73ab515454bd5ecb12d944f5c0a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index f02b09b836..0c0bcac1b6 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6075,8 +6075,7 @@ qint64 QString::toLongLong(bool *ok, int base) const } #endif - QLocale c_locale(QLocale::C); - return c_locale.d->stringToLongLong(constData(), size(), base, ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToLongLong(constData(), size(), base, ok, QLocaleData::FailOnGroupSeparators); } /*! @@ -6110,8 +6109,7 @@ quint64 QString::toULongLong(bool *ok, int base) const } #endif - QLocale c_locale(QLocale::C); - return c_locale.d->stringToUnsLongLong(constData(), size(), base, ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToUnsLongLong(constData(), size(), base, ok, QLocaleData::FailOnGroupSeparators); } /*! @@ -6349,8 +6347,7 @@ ushort QString::toUShort(bool *ok, int base) const double QString::toDouble(bool *ok) const { - QLocale c_locale(QLocale::C); - return c_locale.d->stringToDouble(constData(), size(), ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocaleData::FailOnGroupSeparators); } /*! @@ -9616,8 +9613,7 @@ qint64 QStringRef::toLongLong(bool *ok, int base) const } #endif - QLocale c_locale(QLocale::C); - return c_locale.d->stringToLongLong(constData(), size(), base, ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToLongLong(constData(), size(), base, ok, QLocaleData::FailOnGroupSeparators); } /*! @@ -9649,8 +9645,7 @@ quint64 QStringRef::toULongLong(bool *ok, int base) const } #endif - QLocale c_locale(QLocale::C); - return c_locale.d->stringToUnsLongLong(constData(), size(), base, ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToUnsLongLong(constData(), size(), base, ok, QLocaleData::FailOnGroupSeparators); } /*! @@ -9867,8 +9862,7 @@ ushort QStringRef::toUShort(bool *ok, int base) const double QStringRef::toDouble(bool *ok) const { - QLocale c_locale(QLocale::C); - return c_locale.d->stringToDouble(constData(), size(), ok, QLocalePrivate::FailOnGroupSeparators); + return QLocaleData::c()->stringToDouble(constData(), size(), ok, QLocaleData::FailOnGroupSeparators); } /*! |