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: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6
Task-number: QTBUG-45291
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

9 files changed, 30 insertions, 22 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index b97a6525..b6c7da0f 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -95,7 +95,7 @@ public:
         BottomLeft, Bottom, BottomRight
     };
 
-    QDeclarativeItem(QDeclarativeItem *parent = 0);
+    QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR);
     virtual ~QDeclarativeItem();
 
     QDeclarativeItem *parentItem() const;
@@ -182,7 +182,7 @@ protected:
                                  const QRectF &oldGeometry);
 
 protected:
-    QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = 0);
+    QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR);
 
 private:
     Q_DISABLE_COPY(QDeclarativeItem)
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index ace62d77..cbba0fb5 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -60,10 +60,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject
     Q_PROPERTY(QUrl url READ url CONSTANT)
 
 public:
-    QDeclarativeComponent(QObject *parent = 0);
-    QDeclarativeComponent(QDeclarativeEngine *, QObject *parent=0);
-    QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = 0);
-    QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = 0);
+    QDeclarativeComponent(QObject *parent = Q_NULLPTR);
+    QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = Q_NULLPTR);
+    QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = Q_NULLPTR);
+    QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = Q_NULLPTR);
     virtual ~QDeclarativeComponent();
 
     Q_ENUMS(Status)
@@ -82,7 +82,7 @@ public:
 
     QUrl url() const;
 
-    virtual QObject *create(QDeclarativeContext *context = 0);
+    virtual QObject *create(QDeclarativeContext *context = Q_NULLPTR);
     virtual QObject *beginCreate(QDeclarativeContext *);
     virtual void completeCreate();
 
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index 0b6ece4a..1d01295e 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -58,8 +58,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject
     Q_DECLARE_PRIVATE(QDeclarativeContext)
 
 public:
-    QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent=0);
-    QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent=0);
+    QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent = Q_NULLPTR);
+    QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent = Q_NULLPTR);
     virtual ~QDeclarativeContext();
 
     bool isValid() const;
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
index 1b02bf14..875e000b 100644
--- a/src/declarative/qml/qdeclarativeengine.h
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -62,7 +62,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject
     Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
     Q_OBJECT
 public:
-    QDeclarativeEngine(QObject *p = 0);
+    QDeclarativeEngine(QObject *p = Q_NULLPTR);
     virtual ~QDeclarativeEngine();
 
     QDeclarativeContext *rootContext() const;
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 61ef3b70..978bdf83 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
     Q_OBJECT
 public:
     QDeclarativeExpression();
-    QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = 0);
+    QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = Q_NULLPTR);
     virtual ~QDeclarativeExpression();
 
     QDeclarativeEngine *engine() const;
@@ -77,7 +77,7 @@ public:
     void clearError();
     QDeclarativeError error() const;
 
-    QVariant evaluate(bool *valueIsUndefined = 0);
+    QVariant evaluate(bool *valueIsUndefined = Q_NULLPTR);
 
 Q_SIGNALS:
     void valueChanged();
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 420921a9..552e15f9 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public
     Q_OBJECT
     Q_INTERFACES(QDeclarativeExtensionInterface)
 public:
-    explicit QDeclarativeExtensionPlugin(QObject *parent = 0);
+    explicit QDeclarativeExtensionPlugin(QObject *parent = Q_NULLPTR);
     ~QDeclarativeExtensionPlugin();
 
     virtual void registerTypes(const char *uri) = 0;
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index 78d2f422..8653eb02 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -56,13 +56,21 @@ public:
     typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
 
     QDeclarativeListProperty()
-        : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
+        : object(Q_NULLPTR),
+          data(Q_NULLPTR),
+          append(Q_NULLPTR),
+          count(Q_NULLPTR),
+          at(Q_NULLPTR),
+          clear(Q_NULLPTR),
+          dummy1(Q_NULLPTR),
+          dummy2(Q_NULLPTR)
+    {}
     QDeclarativeListProperty(QObject *o, QList<T *> &list)
         : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
-          clear(qlist_clear), dummy1(0), dummy2(0) {}
-    QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
-                    ClearFunction r = 0)
-        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
+          clear(qlist_clear), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {}
+    QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = Q_NULLPTR,
+                             AtFunction t = Q_NULLPTR, ClearFunction r = Q_NULLPTR)
+        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {}
 
     bool operator==(const QDeclarativeListProperty &o) const {
         return object == o.object &&
@@ -108,7 +116,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeListReference
 {
 public:
     QDeclarativeListReference();
-    QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = 0);
+    QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = Q_NULLPTR);
     QDeclarativeListReference(const QDeclarativeListReference &);
     QDeclarativeListReference &operator=(const QDeclarativeListReference &);
     ~QDeclarativeListReference();
diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h
index 41073254..15507edb 100644
--- a/src/declarative/util/qdeclarativepropertymap.h
+++ b/src/declarative/util/qdeclarativepropertymap.h
@@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativePropertyMap(QObject *parent = 0);
+    QDeclarativePropertyMap(QObject *parent = Q_NULLPTR);
     virtual ~QDeclarativePropertyMap();
 
     QVariant value(const QString &key) const;
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index aa0caa11..e0b9742c 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -59,8 +59,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
     Q_ENUMS(ResizeMode Status)
 public:
-    explicit QDeclarativeView(QWidget *parent = 0);
-    QDeclarativeView(const QUrl &source, QWidget *parent = 0);
+    explicit QDeclarativeView(QWidget *parent = Q_NULLPTR);
+    QDeclarativeView(const QUrl &source, QWidget *parent = Q_NULLPTR);
     virtual ~QDeclarativeView();
 
     QUrl source() const;