From 64a106da72796377bbff5cce0ecc5a379b105498 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 15:55:12 +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: I972f844bd5845f4d7d88a14ff1b358c8c2b2643d Task-number: QTBUG-45291 Reviewed-by: Milian Wolff --- src/webchannel/qqmlwebchannel.h | 2 +- src/webchannel/qwebchannel.h | 4 ++-- src/webchannel/qwebchannelabstracttransport.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webchannel/qqmlwebchannel.h b/src/webchannel/qqmlwebchannel.h index 52d09e6..69fcc70 100644 --- a/src/webchannel/qqmlwebchannel.h +++ b/src/webchannel/qqmlwebchannel.h @@ -53,7 +53,7 @@ class Q_WEBCHANNEL_EXPORT QQmlWebChannel : public QWebChannel Q_PROPERTY( QQmlListProperty registeredObjects READ registeredObjects ) public: - explicit QQmlWebChannel(QObject *parent = 0); + explicit QQmlWebChannel(QObject *parent = Q_NULLPTR); virtual ~QQmlWebChannel(); Q_INVOKABLE void registerObjects(const QVariantMap &objects); diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index d32d017..40621f2 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -51,7 +51,7 @@ class Q_WEBCHANNEL_EXPORT QWebChannel : public QObject Q_DISABLE_COPY(QWebChannel) Q_PROPERTY(bool blockUpdates READ blockUpdates WRITE setBlockUpdates NOTIFY blockUpdatesChanged) public: - explicit QWebChannel(QObject *parent = 0); + explicit QWebChannel(QObject *parent = Q_NULLPTR); ~QWebChannel(); void registerObjects(const QHash &objects); @@ -72,7 +72,7 @@ public Q_SLOTS: private: Q_DECLARE_PRIVATE(QWebChannel) - QWebChannel(QWebChannelPrivate &dd, QObject *parent = 0); + QWebChannel(QWebChannelPrivate &dd, QObject *parent = Q_NULLPTR); Q_PRIVATE_SLOT(d_func(), void _q_transportDestroyed(QObject*)) friend class QMetaObjectPublisher; diff --git a/src/webchannel/qwebchannelabstracttransport.h b/src/webchannel/qwebchannelabstracttransport.h index e7f2af4..a9bc5ed 100644 --- a/src/webchannel/qwebchannelabstracttransport.h +++ b/src/webchannel/qwebchannelabstracttransport.h @@ -44,7 +44,7 @@ class Q_WEBCHANNEL_EXPORT QWebChannelAbstractTransport : public QObject { Q_OBJECT public: - explicit QWebChannelAbstractTransport(QObject *parent = 0); + explicit QWebChannelAbstractTransport(QObject *parent = Q_NULLPTR); virtual ~QWebChannelAbstractTransport(); public Q_SLOTS: -- cgit v1.2.1