diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2016-08-16 20:57:23 -0700 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-08-17 19:54:40 +0000 |
| commit | ecb73a7bb3c048fd50ebdf4b552e5b65b9ef2c50 (patch) | |
| tree | 3744eba2ebf63f5eb8d6836ca1cfc7d8ea2eb4b6 /src/corelib/json | |
| parent | 9b491616f8353be243c5e5e98c864d09a25b99ea (diff) | |
QJsonValue: use Q_NULLPTR instead of 0 in ctor
Use Q_NULLPTR in all public headers
Task-number: QTBUG-45291
Change-Id: Ib294deb3c210a9a186448cbf9656af7a09fea2c1
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/json')
| -rw-r--r-- | src/corelib/json/qjsonvalue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index 372ae85290..a8b5d2796d 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -76,7 +76,7 @@ public: QJsonValue(QLatin1String s); #ifndef QT_NO_CAST_FROM_ASCII inline QT_ASCII_CAST_WARN QJsonValue(const char *s) - : d(0), t(String) { stringDataFromQStringHelper(QString::fromUtf8(s)); } + : d(Q_NULLPTR), t(String) { stringDataFromQStringHelper(QString::fromUtf8(s)); } #endif QJsonValue(const QJsonArray &a); QJsonValue(const QJsonObject &o); |