diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-04-04 13:51:33 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 05:21:58 +0200 |
| commit | 5a1cd3dcfaf37701a0a61cfe1a10dcec4c8bfefc (patch) | |
| tree | cfeea7eee29c85406d6102b0f3d630553d873395 | |
| parent | e915d310107878a12652dc77a2a1f8dbb9c98972 (diff) | |
Make QLocale::toULongLong return the proper type: qulonglong
Task-number: QTBUG-25143
Change-Id: Ia8fd588c25d11fe31acd57fd34a90d51dace248c
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: John Layt <jlayt@kde.org>
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 594189f272..b9f199e50e 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1139,8 +1139,6 @@ qlonglong QLocale::toLongLong(const QString &s, bool *ok) const return d()->stringToLongLong(s, 10, ok, mode); } -// ### Qt5: make the return type for toULongLong() qulonglong. - /*! Returns the unsigned long long int represented by the localized string \a s. @@ -1155,7 +1153,7 @@ qlonglong QLocale::toLongLong(const QString &s, bool *ok) const \sa toLongLong(), toInt(), toDouble(), toString() */ -qlonglong QLocale::toULongLong(const QString &s, bool *ok) const +qulonglong QLocale::toULongLong(const QString &s, bool *ok) const { QLocalePrivate::GroupSeparatorMode mode = p.numberOptions & RejectGroupSeparator diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 6c97a05ba8..bdb5ae026c 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -607,7 +607,7 @@ public: int toInt(const QString &s, bool *ok = 0) const; uint toUInt(const QString &s, bool *ok = 0) const; qlonglong toLongLong(const QString &s, bool *ok = 0) const; - qlonglong toULongLong(const QString &s, bool *ok = 0) const; + qulonglong toULongLong(const QString &s, bool *ok = 0) const; float toFloat(const QString &s, bool *ok = 0) const; double toDouble(const QString &s, bool *ok = 0) const; |