From 7d16c732127199bf2f26ef93d242b0d19b0d7944 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 3 Mar 2016 13:59:37 +0100
Subject: Add explicit and 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.

Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.

Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d
Task-number: QTBUG-45291
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
---
 src/datavisualization/engine/q3dbars.h          | 2 +-
 src/datavisualization/engine/q3dcamera.h        | 2 +-
 src/datavisualization/engine/q3dlight.h         | 2 +-
 src/datavisualization/engine/q3dobject.h        | 2 +-
 src/datavisualization/engine/q3dscatter.h       | 2 +-
 src/datavisualization/engine/q3dscene.h         | 2 +-
 src/datavisualization/engine/q3dsurface.h       | 2 +-
 src/datavisualization/engine/qabstract3dgraph.h | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/datavisualization/engine')

diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index e910571e..55fec1d2 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -46,7 +46,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public QAbstract3DGraph
     Q_PROPERTY(float floorLevel READ floorLevel WRITE setFloorLevel NOTIFY floorLevelChanged)
 
 public:
-    explicit Q3DBars(const QSurfaceFormat *format = 0, QWindow *parent = 0);
+    explicit Q3DBars(const QSurfaceFormat *format = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
     virtual ~Q3DBars();
 
     void setPrimarySeries(QBar3DSeries *series);
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 60e1f303..5fd2d25d 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -71,7 +71,7 @@ public:
         CameraPresetDirectlyBelow
     };
 
-    Q3DCamera(QObject *parent = 0);
+    explicit Q3DCamera(QObject *parent = Q_NULLPTR);
     virtual ~Q3DCamera();
 
     float xRotation() const;
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 760766c0..aaedd552 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -33,7 +33,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject
     Q_OBJECT
 
 public:
-    Q3DLight(QObject *parent = 0);
+    explicit Q3DLight(QObject *parent = Q_NULLPTR);
     virtual ~Q3DLight();
 
 private:
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index 636cd295..bbafa60c 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -38,7 +38,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DObject : public QObject
     Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)
 
 public:
-    Q3DObject(QObject *parent = 0);
+    explicit Q3DObject(QObject *parent = Q_NULLPTR);
     virtual ~Q3DObject();
 
     virtual void copyValuesFrom(const Q3DObject &source);
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index 4b1c805c..af98c03f 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -39,7 +39,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph
     Q_PROPERTY(QScatter3DSeries *selectedSeries READ selectedSeries NOTIFY selectedSeriesChanged)
 
 public:
-    explicit Q3DScatter(const QSurfaceFormat *format = 0, QWindow *parent = 0);
+    explicit Q3DScatter(const QSurfaceFormat *format = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
     virtual ~Q3DScatter();
 
     void addSeries(QScatter3DSeries *series);
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 4dd39954..53126d05 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -47,7 +47,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
     Q_PROPERTY(QPoint graphPositionQuery READ graphPositionQuery WRITE setGraphPositionQuery NOTIFY graphPositionQueryChanged REVISION 1)
 
 public:
-    Q3DScene(QObject *parent = 0);
+    explicit Q3DScene(QObject *parent = Q_NULLPTR);
     virtual ~Q3DScene();
 
     QRect viewport() const;
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index 28111d5c..939b634b 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -40,7 +40,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph
     Q_PROPERTY(bool flipHorizontalGrid READ flipHorizontalGrid WRITE setFlipHorizontalGrid NOTIFY flipHorizontalGridChanged)
 
 public:
-    explicit Q3DSurface(const QSurfaceFormat *format = 0, QWindow *parent = 0);
+    explicit Q3DSurface(const QSurfaceFormat *format = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
     virtual ~Q3DSurface();
 
     void addSeries(QSurface3DSeries *series);
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 13e2faf0..45057e71 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -65,7 +65,7 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected Q
 
 protected:
     explicit QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format,
-                              QWindow *parent = 0);
+                              QWindow *parent = Q_NULLPTR);
 
 public:
     enum SelectionFlag {
-- 
cgit v1.2.3