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.

Task-number: QTBUG-45291
Change-Id: Ied526fb2d7adc3a68946d6843a6bd6f475ebf864
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

7 files changed, 15 insertions, 15 deletions

diff --git a/src/quick/items/qquickframebufferobject.h b/src/quick/items/qquickframebufferobject.h
index 7fb7262222..ec40e7e97e 100644
--- a/src/quick/items/qquickframebufferobject.h
+++ b/src/quick/items/qquickframebufferobject.h
@@ -69,7 +69,7 @@ public:
         void *data;
     };
 
-    QQuickFramebufferObject(QQuickItem *parent = 0);
+    QQuickFramebufferObject(QQuickItem *parent = Q_NULLPTR);
 
     bool textureFollowsItemSize() const;
     void setTextureFollowsItemSize(bool follows);
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index bda6dd4da5..bf208e1f3e 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -53,7 +53,7 @@ class Q_QUICK_EXPORT QQuickTransform : public QObject
 {
     Q_OBJECT
 public:
-    QQuickTransform(QObject *parent = 0);
+    explicit QQuickTransform(QObject *parent = Q_NULLPTR);
     ~QQuickTransform();
 
     void appendToItem(QQuickItem *);
@@ -189,7 +189,7 @@ public:
     };
     Q_ENUM(TransformOrigin)
 
-    QQuickItem(QQuickItem *parent = 0);
+    explicit QQuickItem(QQuickItem *parent = Q_NULLPTR);
     virtual ~QQuickItem();
 
     QQuickWindow *window() const;
@@ -430,7 +430,7 @@ protected:
     virtual void updatePolish();
 
 protected:
-    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = 0);
+    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *))
diff --git a/src/quick/items/qquickitemgrabresult.h b/src/quick/items/qquickitemgrabresult.h
index 055cd09095..027ed19d9e 100644
--- a/src/quick/items/qquickitemgrabresult.h
+++ b/src/quick/items/qquickitemgrabresult.h
@@ -73,7 +73,7 @@ private Q_SLOTS:
 private:
     friend class QQuickItem;
 
-    QQuickItemGrabResult(QObject *parent = 0);
+    QQuickItemGrabResult(QObject *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 8c9ae2eebb..85e90e7263 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -51,7 +51,7 @@ class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
     Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
 
 public:
-    QQuickPaintedItem(QQuickItem *parent = 0);
+    QQuickPaintedItem(QQuickItem *parent = Q_NULLPTR);
     virtual ~QQuickPaintedItem();
 
     enum RenderTarget {
@@ -112,7 +112,7 @@ Q_SIGNALS:
     void textureSizeChanged();
 
 protected:
-    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = 0);
+    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
     void releaseResources() Q_DECL_OVERRIDE;
 
diff --git a/src/quick/items/qquickrendercontrol.h b/src/quick/items/qquickrendercontrol.h
index ff80acf766..1132585a66 100644
--- a/src/quick/items/qquickrendercontrol.h
+++ b/src/quick/items/qquickrendercontrol.h
@@ -49,7 +49,7 @@ class Q_QUICK_EXPORT QQuickRenderControl : public QObject
     Q_OBJECT
 
 public:
-    QQuickRenderControl(QObject *parent = 0);
+    QQuickRenderControl(QObject *parent = Q_NULLPTR);
     ~QQuickRenderControl();
 
     void prepareThread(QThread *targetThread);
@@ -62,8 +62,8 @@ public:
 
     QImage grab();
 
-    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = 0);
-    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return 0; }
+    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = Q_NULLPTR);
+    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return Q_NULLPTR; }
 
 Q_SIGNALS:
     void renderRequested();
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index 80da0ba4f1..28be948ff4 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -54,9 +54,9 @@ class Q_QUICK_EXPORT QQuickView : public QQuickWindow
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
 public:
-    explicit QQuickView(QWindow *parent = 0);
+    explicit QQuickView(QWindow *parent = Q_NULLPTR);
     QQuickView(QQmlEngine* engine, QWindow *parent);
-    QQuickView(const QUrl &source, QWindow *parent = 0);
+    QQuickView(const QUrl &source, QWindow *parent = Q_NULLPTR);
     virtual ~QQuickView();
 
     QUrl source() const;
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index d4ffb100de..92c560644e 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -89,7 +89,7 @@ public:
     };
     Q_ENUM(SceneGraphError)
 
-    QQuickWindow(QWindow *parent = 0);
+    QQuickWindow(QWindow *parent = Q_NULLPTR);
     explicit QQuickWindow(QQuickRenderControl *renderControl);
 
     virtual ~QQuickWindow();
@@ -123,7 +123,7 @@ public:
     // Scene graph specific functions
     QSGTexture *createTextureFromImage(const QImage &image) const;
     QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options) const;
-    QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption(0)) const;
+    QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption()) const;
 
     void setClearBeforeRendering(bool enabled);
     bool clearBeforeRendering() const;
@@ -170,7 +170,7 @@ public Q_SLOTS:
     void releaseResources();
 
 protected:
-    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = 0);
+    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = Q_NULLPTR);
 
     void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE;
     void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;