summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-04-04 13:51:33 -0300
committerQt by Nokia <qt-info@nokia.com>2012-04-05 05:21:58 +0200
commit5a1cd3dcfaf37701a0a61cfe1a10dcec4c8bfefc (patch)
treecfeea7eee29c85406d6102b0f3d630553d873395 /src/corelib/tools/qlocale.h
parente915d310107878a12652dc77a2a1f8dbb9c98972 (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>
Diffstat (limited to 'src/corelib/tools/qlocale.h')
-rw-r--r--src/corelib/tools/qlocale.h2
1 files changed, 1 insertions, 1 deletions
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;