diff options
| author | John Layt <jlayt@kde.org> | 2012-01-27 19:04:42 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-05 17:49:56 +0100 |
| commit | 29c4a27a94d6f0dc9d91227d99bab7c2f55710db (patch) | |
| tree | cd66bb046981558a18d999770df90201b3cb946a /src/corelib/tools/qlocale.h | |
| parent | 1e3833bed8a661ee8ae284188a23bd0ffc3bed85 (diff) | |
SIC: QLocale: Remove base argument from conversion to number api
As discussed on list and approved by Lars and Thiago.
Remove the option to use QLocale to convert strings to non-decimal
numbers as they are not localised and the api is available in QString.
Change-Id: Ib810505ba86fb08ad23571b39f1520e86fde6787
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qlocale.h')
| -rw-r--r-- | src/corelib/tools/qlocale.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index a70b888ada..2255340b67 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -662,12 +662,12 @@ public: QString nativeLanguageName() const; QString nativeCountryName() const; - short toShort(const QString &s, bool *ok = 0, int base = 0) const; - ushort toUShort(const QString &s, bool *ok = 0, int base = 0) const; - int toInt(const QString &s, bool *ok = 0, int base = 0) const; - uint toUInt(const QString &s, bool *ok = 0, int base = 0) const; - qlonglong toLongLong(const QString &s, bool *ok = 0, int base = 0) const; - qlonglong toULongLong(const QString &s, bool *ok = 0, int base = 0) const; + short toShort(const QString &s, bool *ok = 0) const; + ushort toUShort(const QString &s, bool *ok = 0) const; + 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; float toFloat(const QString &s, bool *ok = 0) const; double toDouble(const QString &s, bool *ok = 0) const; |