From ecb73a7bb3c048fd50ebdf4b552e5b65b9ef2c50 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Tue, 16 Aug 2016 20:57:23 -0700 Subject: 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 --- src/corelib/json/qjsonvalue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') 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); -- cgit v1.2.3