diff options
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 2d1444c315..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 @@ -1954,7 +1952,7 @@ QString QLocale::standaloneMonthName(int month, FormatType type) const default: return QString(); } - QString name = getLocaleListData(standalone_months_data + idx, size, month - 1); + QString name = getLocaleListData(months_data + idx, size, month - 1); if (name.isEmpty()) return monthName(month, type); return name; |