From a6434420574f775d3afa6e8912eb2ede8429db90 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 14:13:06 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I799040633b2d1fc15ccafb42b4eb932b55cf1a55 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll --- src/enginio_client/enginioclient.h | 2 +- src/enginio_client/enginiomodel.h | 2 +- src/enginio_client/enginiooauth2authentication.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/enginio_client/enginioclient.h b/src/enginio_client/enginioclient.h index b0dc8f7..2083b80 100644 --- a/src/enginio_client/enginioclient.h +++ b/src/enginio_client/enginioclient.h @@ -53,7 +53,7 @@ class ENGINIOCLIENT_EXPORT EnginioClient : public EnginioClientConnection Q_DECLARE_PRIVATE(EnginioClient) public: - explicit EnginioClient(QObject *parent = 0); + explicit EnginioClient(QObject *parent = Q_NULLPTR); ~EnginioClient(); Q_INVOKABLE EnginioReply *customRequest(const QUrl &url, const QByteArray &httpOperation, const QJsonObject &data = QJsonObject()); diff --git a/src/enginio_client/enginiomodel.h b/src/enginio_client/enginiomodel.h index 8b64daa..d949077 100644 --- a/src/enginio_client/enginiomodel.h +++ b/src/enginio_client/enginiomodel.h @@ -57,7 +57,7 @@ class ENGINIOCLIENT_EXPORT EnginioModel Q_PROPERTY(QJsonObject query READ query WRITE setQuery NOTIFY queryChanged) public: - explicit EnginioModel(QObject *parent = 0); + explicit EnginioModel(QObject *parent = Q_NULLPTR); ~EnginioModel(); EnginioClient *client() const Q_REQUIRED_RESULT; diff --git a/src/enginio_client/enginiooauth2authentication.h b/src/enginio_client/enginiooauth2authentication.h index f276652..c8a724f 100644 --- a/src/enginio_client/enginiooauth2authentication.h +++ b/src/enginio_client/enginiooauth2authentication.h @@ -48,7 +48,7 @@ class ENGINIOCLIENT_EXPORT EnginioOAuth2Authentication : public EnginioIdentity Q_DECLARE_PRIVATE(EnginioOAuth2Authentication) public: - explicit EnginioOAuth2Authentication(QObject *parent = 0); + explicit EnginioOAuth2Authentication(QObject *parent = Q_NULLPTR); ~EnginioOAuth2Authentication(); QString user() const Q_REQUIRED_RESULT; -- cgit v1.2.3