diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-01 05:50:41 +0000 |
| commit | 6251d4dafc86bcbec09d1962050af9924249d419 (patch) | |
| tree | e97174f06c7eac4d97ffd9a8c626c00aa4e1edc6 /src/corelib/json/qjsonobject.h | |
| parent | 1be6bad2323f481f7ab18daf99b41ad3c44520ad (diff) | |
QtCore: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I0cc388ef9faf45cbcf425ad0dc77db3060c104a8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/json/qjsonobject.h')
| -rw-r--r-- | src/corelib/json/qjsonobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/json/qjsonobject.h index 5f24ac3ac8..19c938fd83 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/json/qjsonobject.h @@ -105,7 +105,7 @@ public: typedef QJsonValue value_type; typedef QJsonValueRef reference; - Q_DECL_CONSTEXPR inline iterator() : o(0), i(0) {} + Q_DECL_CONSTEXPR inline iterator() : o(Q_NULLPTR), i(0) {} Q_DECL_CONSTEXPR inline iterator(QJsonObject *obj, int index) : o(obj), i(index) {} inline QString key() const { return o->keyAt(i); } @@ -147,7 +147,7 @@ public: typedef QJsonValue value_type; typedef QJsonValue reference; - Q_DECL_CONSTEXPR inline const_iterator() : o(0), i(0) {} + Q_DECL_CONSTEXPR inline const_iterator() : o(Q_NULLPTR), i(0) {} Q_DECL_CONSTEXPR inline const_iterator(const QJsonObject *obj, int index) : o(obj), i(index) {} inline const_iterator(const iterator &other) |