Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Conflicts:
	src/datavisualization/utils/qutils.h

Change-Id: Ic882590b5386697fb4af068e435704849ed5405c

34 files changed, 101 insertions, 98 deletions

diff --git a/examples/datavisualization/audiolevels/audiolevels.h b/examples/datavisualization/audiolevels/audiolevels.h
index b1845c9a..f9a7d9e5 100644
--- a/examples/datavisualization/audiolevels/audiolevels.h
+++ b/examples/datavisualization/audiolevels/audiolevels.h
@@ -35,7 +35,10 @@
 using namespace QtDataVisualization;
 
 class AudioLevelsIODevice;
+
+QT_BEGIN_NAMESPACE
 class QAudioInput;
+QT_END_NAMESPACE
 
 class AudioLevels : public QObject
 {
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index 8ca1052e..63dd0340 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -70,7 +70,7 @@ public:
     };
 
 protected:
-    explicit QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = 0);
+    explicit QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = Q_NULLPTR);
 
 public:
     virtual ~QAbstract3DAxis();
diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h
index 640de5b5..2165a4d2 100644
--- a/src/datavisualization/axis/qcategory3daxis.h
+++ b/src/datavisualization/axis/qcategory3daxis.h
@@ -42,7 +42,7 @@ class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis
     Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged)
 
 public:
-    explicit QCategory3DAxis(QObject *parent = 0);
+    explicit QCategory3DAxis(QObject *parent = Q_NULLPTR);
     virtual ~QCategory3DAxis();
 
     void setLabels(const QStringList &labels);
diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h
index ec7d12d2..45d70f43 100644
--- a/src/datavisualization/axis/qlogvalue3daxisformatter.h
+++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h
@@ -45,9 +45,9 @@ class QT_DATAVISUALIZATION_EXPORT QLogValue3DAxisFormatter : public QValue3DAxis
     Q_PROPERTY(bool showEdgeLabels READ showEdgeLabels WRITE setShowEdgeLabels NOTIFY showEdgeLabelsChanged)
 
 protected:
-    explicit QLogValue3DAxisFormatter(QLogValue3DAxisFormatterPrivate *d, QObject *parent = 0);
+    explicit QLogValue3DAxisFormatter(QLogValue3DAxisFormatterPrivate *d, QObject *parent = Q_NULLPTR);
 public:
-    explicit QLogValue3DAxisFormatter(QObject *parent = 0);
+    explicit QLogValue3DAxisFormatter(QObject *parent = Q_NULLPTR);
     virtual ~QLogValue3DAxisFormatter();
 
     void setBase(qreal base);
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index e1a12ec8..e430c03a 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -47,7 +47,7 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis
     Q_PROPERTY(bool reversed READ reversed WRITE setReversed NOTIFY reversedChanged REVISION 1)
 
 public:
-    explicit QValue3DAxis(QObject *parent = 0);
+    explicit QValue3DAxis(QObject *parent = Q_NULLPTR);
     virtual ~QValue3DAxis();
 
     void setSegmentCount(int count);
diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h
index 76ad6055..72392d0c 100644
--- a/src/datavisualization/axis/qvalue3daxisformatter.h
+++ b/src/datavisualization/axis/qvalue3daxisformatter.h
@@ -46,9 +46,9 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject
 {
     Q_OBJECT
 protected:
-    explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = 0);
+    explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = Q_NULLPTR);
 public:
-    explicit QValue3DAxisFormatter(QObject *parent = 0);
+    explicit QValue3DAxisFormatter(QObject *parent = Q_NULLPTR);
     virtual ~QValue3DAxisFormatter();
 
 protected:
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 3888ca6d..45e0d404 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -88,7 +88,7 @@ public:
     };
 
 protected:
-    explicit QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent = 0);
+    explicit QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
 
 public:
     virtual ~QAbstract3DSeries();
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 7493aae2..6f2d268b 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -53,7 +53,7 @@ public:
     };
 
 protected:
-    explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = 0);
+    explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
 
 public:
     virtual ~QAbstractDataProxy();
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index ce8d0cd8..00b65b80 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -46,8 +46,8 @@ class QT_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries
     Q_PROPERTY(float meshAngle READ meshAngle WRITE setMeshAngle NOTIFY meshAngleChanged)
 
 public:
-    explicit QBar3DSeries(QObject *parent = 0);
-    explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = 0);
+    explicit QBar3DSeries(QObject *parent = Q_NULLPTR);
+    explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
     virtual ~QBar3DSeries();
 
     void setDataProxy(QBarDataProxy *proxy);
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 9db41ed9..d0d58f6e 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -55,7 +55,7 @@ class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
     Q_PROPERTY(QStringList columnLabels READ columnLabels WRITE setColumnLabels NOTIFY columnLabelsChanged)
     Q_PROPERTY(QBar3DSeries *series READ series NOTIFY seriesChanged)
 public:
-    explicit QBarDataProxy(QObject *parent = 0);
+    explicit QBarDataProxy(QObject *parent = Q_NULLPTR);
     virtual ~QBarDataProxy();
 
     QBar3DSeries *series() const;
@@ -110,7 +110,7 @@ Q_SIGNALS:
     void seriesChanged(QBar3DSeries *series);
 
 protected:
-    explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = 0);
+    explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
     QBarDataProxyPrivate *dptr();
     const QBarDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index cdf54414..3372a766 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -53,10 +53,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject
     Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1)
 
 public:
-    explicit QCustom3DItem(QObject *parent = 0);
+    explicit QCustom3DItem(QObject *parent = Q_NULLPTR);
     explicit QCustom3DItem(const QString &meshFile, const QVector3D &position,
                            const QVector3D &scaling, const QQuaternion &rotation,
-                           const QImage &texture, QObject *parent = 0);
+                           const QImage &texture, QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DItem();
 
     void setMeshFile(const QString &meshFile);
@@ -102,7 +102,7 @@ Q_SIGNALS:
     Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute);
 
 protected:
-    QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = 0);
+    QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = Q_NULLPTR);
 
     QScopedPointer<QCustom3DItemPrivate> d_ptr;
 
diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index 5cbec8c6..e4178bbf 100644
--- a/src/datavisualization/data/qcustom3dlabel.h
+++ b/src/datavisualization/data/qcustom3dlabel.h
@@ -53,10 +53,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem
     Q_PROPERTY(bool facingCamera READ isFacingCamera WRITE setFacingCamera NOTIFY facingCameraChanged)
 
 public:
-    explicit QCustom3DLabel(QObject *parent = 0);
+    explicit QCustom3DLabel(QObject *parent = Q_NULLPTR);
     explicit QCustom3DLabel(const QString &text, const QFont &font, const QVector3D &position,
                             const QVector3D &scaling, const QQuaternion &rotation,
-                            QObject *parent = 0);
+                            QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DLabel();
 
     void setText(const QString &text);
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index 9498c7eb..bd2fe7f4 100644
--- a/src/datavisualization/data/qcustom3dvolume.h
+++ b/src/datavisualization/data/qcustom3dvolume.h
@@ -62,12 +62,12 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem
 
 public:
 
-    explicit QCustom3DVolume(QObject *parent = 0);
+    explicit QCustom3DVolume(QObject *parent = Q_NULLPTR);
     explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling,
                              const QQuaternion &rotation, int textureWidth,
                              int textureHeight, int textureDepth,
                              QVector<uchar> *textureData, QImage::Format textureFormat,
-                             const QVector<QRgb> &colorTable, QObject *parent = 0);
+                             const QVector<QRgb> &colorTable, QObject *parent = Q_NULLPTR);
     virtual ~QCustom3DVolume();
 
     void setTextureWidth(int value);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 68c1978b..610ac483 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -50,9 +50,9 @@ class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDa
     Q_PROPERTY(float maxZValue READ maxZValue WRITE setMaxZValue NOTIFY maxZValueChanged)
 
 public:
-    explicit QHeightMapSurfaceDataProxy(QObject *parent = 0);
-    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = 0);
-    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 0);
+    explicit QHeightMapSurfaceDataProxy(QObject *parent = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = Q_NULLPTR);
     virtual ~QHeightMapSurfaceDataProxy();
 
     void setHeightMap(const QImage &image);
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void maxZValueChanged(float value);
 
 protected:
-    explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = 0);
+    explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
     QHeightMapSurfaceDataProxyPrivate *dptr();
     const QHeightMapSurfaceDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 30a5933c..648984e5 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -70,24 +70,24 @@ public:
         MMBCumulative = 3
     };
 
-    explicit QItemModelBarDataProxy(QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
-                           QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                           const QString &columnRole, const QString &valueRole,
-                           QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                           const QString &columnRole, const QString &valueRole,
-                           const QString &rotationRole, QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                           const QString &columnRole, const QString &valueRole,
-                           const QStringList &rowCategories, const QStringList &columnCategories,
-                           QObject *parent = 0);
-    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                           const QString &columnRole, const QString &valueRole,
-                           const QString &rotationRole, const QStringList &rowCategories,
-                           const QStringList &columnCategories, QObject *parent = 0);
+    explicit QItemModelBarDataProxy(QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
+                                    QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                    const QString &columnRole, const QString &valueRole,
+                                    QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                    const QString &columnRole, const QString &valueRole,
+                                    const QString &rotationRole, QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                    const QString &columnRole, const QString &valueRole,
+                                    const QStringList &rowCategories, const QStringList &columnCategories,
+                                    QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                    const QString &columnRole, const QString &valueRole,
+                                    const QString &rotationRole, const QStringList &rowCategories,
+                                    const QStringList &columnCategories, QObject *parent = Q_NULLPTR);
     virtual ~QItemModelBarDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 5015f1df..5e74d052 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -57,15 +57,15 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa
     Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1)
 
 public:
-    explicit QItemModelScatterDataProxy(QObject *parent = 0);
-    QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
-    QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
-                               const QString &xPosRole, const QString &yPosRole,
-                               const QString &zPosRole, QObject *parent = 0);
-    QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
-                               const QString &xPosRole, const QString &yPosRole,
-                               const QString &zPosRole, const QString &rotationRole,
-                               QObject *parent = 0);
+    explicit QItemModelScatterDataProxy(QObject *parent = Q_NULLPTR);
+    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
+                                        const QString &xPosRole, const QString &yPosRole,
+                                        const QString &zPosRole, QObject *parent = Q_NULLPTR);
+    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
+                                        const QString &xPosRole, const QString &yPosRole,
+                                        const QString &zPosRole, const QString &rotationRole,
+                                        QObject *parent = Q_NULLPTR);
     virtual ~QItemModelScatterDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index 2a9b4a2d..fac97ae9 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -74,28 +74,28 @@ public:
         MMBCumulativeY = 3
     };
 
-    explicit QItemModelSurfaceDataProxy(QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &yPosRole,
-                               QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                               const QString &columnRole, const QString &yPosRole,
-                               QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                               const QString &columnRole, const QString &xPosRole,
-                               const QString &yPosRole, const QString &zPosRole,
-                               QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                               const QString &columnRole, const QString &yPosRole,
-                               const QStringList &rowCategories,
-                               const QStringList &columnCategories,
-                               QObject *parent = 0);
-    QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
-                               const QString &columnRole, const QString &xPosRole,
-                               const QString &yPosRole, const QString &zPosRole,
-                               const QStringList &rowCategories,
-                               const QStringList &columnCategories,
-                               QObject *parent = 0);
+    explicit QItemModelSurfaceDataProxy(QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &yPosRole,
+                                        QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                        const QString &columnRole, const QString &yPosRole,
+                                        QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                        const QString &columnRole, const QString &xPosRole,
+                                        const QString &yPosRole, const QString &zPosRole,
+                                        QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                        const QString &columnRole, const QString &yPosRole,
+                                        const QStringList &rowCategories,
+                                        const QStringList &columnCategories,
+                                        QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+                                        const QString &columnRole, const QString &xPosRole,
+                                        const QString &yPosRole, const QString &zPosRole,
+                                        const QStringList &rowCategories,
+                                        const QStringList &columnCategories,
+                                        QObject *parent = Q_NULLPTR);
     virtual ~QItemModelSurfaceDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 18ec2fdf..5b6fc17e 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -45,8 +45,8 @@ class QT_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries
     Q_PROPERTY(float itemSize READ itemSize WRITE setItemSize NOTIFY itemSizeChanged)
 
 public:
-    explicit QScatter3DSeries(QObject *parent = 0);
-    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = 0);
+    explicit QScatter3DSeries(QObject *parent = Q_NULLPTR);
+    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
     virtual ~QScatter3DSeries();
 
     void setDataProxy(QScatterDataProxy *proxy);
@@ -65,7 +65,7 @@ Q_SIGNALS:
     void itemSizeChanged(float size);
 
 protected:
-    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = 0);
+    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
     QScatter3DSeriesPrivate *dptr();
     const QScatter3DSeriesPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index 15eb3da1..d03cfd60 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -51,7 +51,7 @@ class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
     Q_PROPERTY(QScatter3DSeries *series READ series NOTIFY seriesChanged)
 
 public:
-    explicit QScatterDataProxy(QObject *parent = 0);
+    explicit QScatterDataProxy(QObject *parent = Q_NULLPTR);
     virtual ~QScatterDataProxy();
 
     QScatter3DSeries *series() const;
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void seriesChanged(QScatter3DSeries *series);
 
 protected:
-    explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = 0);
+    explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
     QScatterDataProxyPrivate *dptr();
     const QScatterDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 59299288..9b651d8d 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -57,8 +57,8 @@ public:
     };
     Q_DECLARE_FLAGS(DrawFlags, DrawFlag)
 
-    explicit QSurface3DSeries(QObject *parent = 0);
-    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = 0);
+    explicit QSurface3DSeries(QObject *parent = Q_NULLPTR);
+    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
     virtual ~QSurface3DSeries();
 
     void setDataProxy(QSurfaceDataProxy *proxy);
@@ -91,7 +91,7 @@ Q_SIGNALS:
     void textureFileChanged(const QString &filename);
 
 protected:
-    explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = 0);
+    explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
     QSurface3DSeriesPrivate *dptr();
     const QSurface3DSeriesPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index dfbbbb08..45295912 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -53,7 +53,7 @@ class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
     Q_PROPERTY(QSurface3DSeries *series READ series NOTIFY seriesChanged)
 
 public:
-    explicit QSurfaceDataProxy(QObject *parent = 0);
+    explicit QSurfaceDataProxy(QObject *parent = Q_NULLPTR);
     virtual ~QSurfaceDataProxy();
 
     QSurface3DSeries *series() const;
@@ -92,7 +92,7 @@ Q_SIGNALS:
     void seriesChanged(QSurface3DSeries *series);
 
 protected:
-    explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = 0);
+    explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
     QSurfaceDataProxyPrivate *dptr();
     const QSurfaceDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 3f5ebbd6..4ecb1953 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -54,7 +54,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 5799ca30..b592d4cc 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -79,7 +79,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 c02597de..8dc59d3a 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -41,7 +41,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 5f121632..c6faef5a 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -46,7 +46,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 6d9f1f76..ef1561ea 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -47,7 +47,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 4202c5bc..74c24c7c 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -55,7 +55,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 c5fe6d83..4935f595 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -48,7 +48,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 eacdf948..87c93f5f 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -73,7 +73,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 {
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index 74e059ed..f2028cd1 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -45,7 +45,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandl
     Q_PROPERTY(bool zoomAtTargetEnabled READ isZoomAtTargetEnabled WRITE setZoomAtTargetEnabled NOTIFY zoomAtTargetEnabledChanged)
 
 public:
-    explicit Q3DInputHandler(QObject *parent = 0);
+    explicit Q3DInputHandler(QObject *parent = Q_NULLPTR);
     virtual ~Q3DInputHandler();
 
     void setRotationEnabled(bool enable);
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 9538902b..753a34fa 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -58,7 +58,7 @@ public:
     };
 
 protected:
-    explicit QAbstract3DInputHandler(QObject *parent = 0);
+    explicit QAbstract3DInputHandler(QObject *parent = Q_NULLPTR);
 public:
     virtual ~QAbstract3DInputHandler();
 
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 0f7087f7..b6f2a82e 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -41,7 +41,7 @@ class QT_DATAVISUALIZATION_EXPORT QTouch3DInputHandler : public Q3DInputHandler
     Q_OBJECT
 
 public:
-    explicit QTouch3DInputHandler(QObject *parent = 0);
+    explicit QTouch3DInputHandler(QObject *parent = Q_NULLPTR);
     virtual ~QTouch3DInputHandler();
 
     // Input event listeners
diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 4ebe160d..e4a7645c 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -88,8 +88,8 @@ public:
     };
 
 public:
-    explicit Q3DTheme(QObject *parent = 0);
-    explicit Q3DTheme(Theme themeType, QObject *parent = 0);
+    explicit Q3DTheme(QObject *parent = Q_NULLPTR);
+    explicit Q3DTheme(Theme themeType, QObject *parent = Q_NULLPTR);
     virtual ~Q3DTheme();
 
     void setType(Theme themeType);
@@ -183,7 +183,7 @@ Q_SIGNALS:
     void colorStyleChanged(Q3DTheme::ColorStyle style);
 
 protected:
-    explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0);
+    explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = Q_NULLPTR);
 
     QScopedPointer<Q3DThemePrivate> d_ptr;
 
diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h
index 0b7930b6..e80e9170 100644
--- a/src/datavisualization/utils/qutils.h
+++ b/src/datavisualization/utils/qutils.h
@@ -52,7 +52,7 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias)
     surfaceFormat.setRenderableType(QSurfaceFormat::DefaultRenderableType);
 
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    QOffscreenSurface *dummySurface = 0;
+    QOffscreenSurface *dummySurface = Q_NULLPTR;
     if (!ctx) {
         dummySurface = new QOffscreenSurface();
         dummySurface->setFormat(surfaceFormat);