Replace Q_NULLPTR with nullptr

Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

15 files changed, 45 insertions, 45 deletions

diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 45e0d404..80cb52c3 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 = Q_NULLPTR);
+    explicit QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent = nullptr);
 
 public:
     virtual ~QAbstract3DSeries();
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 6f2d268b..d0260684 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 = Q_NULLPTR);
+    explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = nullptr);
 
 public:
     virtual ~QAbstractDataProxy();
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 00b65b80..07a98ad5 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 = Q_NULLPTR);
-    explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
+    explicit QBar3DSeries(QObject *parent = nullptr);
+    explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = nullptr);
     virtual ~QBar3DSeries();
 
     void setDataProxy(QBarDataProxy *proxy);
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index d0d58f6e..a9311569 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 = Q_NULLPTR);
+    explicit QBarDataProxy(QObject *parent = nullptr);
     virtual ~QBarDataProxy();
 
     QBar3DSeries *series() const;
@@ -110,7 +110,7 @@ Q_SIGNALS:
     void seriesChanged(QBar3DSeries *series);
 
 protected:
-    explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
+    explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = nullptr);
     QBarDataProxyPrivate *dptr();
     const QBarDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index 3372a766..0fbc1926 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 = Q_NULLPTR);
+    explicit QCustom3DItem(QObject *parent = nullptr);
     explicit QCustom3DItem(const QString &meshFile, const QVector3D &position,
                            const QVector3D &scaling, const QQuaternion &rotation,
-                           const QImage &texture, QObject *parent = Q_NULLPTR);
+                           const QImage &texture, QObject *parent = 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 = Q_NULLPTR);
+    QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = nullptr);
 
     QScopedPointer<QCustom3DItemPrivate> d_ptr;
 
diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index e4178bbf..fdfcb9f9 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 = Q_NULLPTR);
+    explicit QCustom3DLabel(QObject *parent = nullptr);
     explicit QCustom3DLabel(const QString &text, const QFont &font, const QVector3D &position,
                             const QVector3D &scaling, const QQuaternion &rotation,
-                            QObject *parent = Q_NULLPTR);
+                            QObject *parent = nullptr);
     virtual ~QCustom3DLabel();
 
     void setText(const QString &text);
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index bd2fe7f4..78e684d9 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 = Q_NULLPTR);
+    explicit QCustom3DVolume(QObject *parent = 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 = Q_NULLPTR);
+                             const QVector<QRgb> &colorTable, QObject *parent = nullptr);
     virtual ~QCustom3DVolume();
 
     void setTextureWidth(int value);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 610ac483..4d815851 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 = Q_NULLPTR);
-    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = Q_NULLPTR);
-    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(QObject *parent = nullptr);
+    explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = nullptr);
+    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 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 = Q_NULLPTR);
+    explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = nullptr);
     QHeightMapSurfaceDataProxyPrivate *dptr();
     const QHeightMapSurfaceDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 648984e5..2dfa0753 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -70,24 +70,24 @@ public:
         MMBCumulative = 3
     };
 
-    explicit QItemModelBarDataProxy(QObject *parent = Q_NULLPTR);
-    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelBarDataProxy(QObject *parent = nullptr);
+    explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = nullptr);
     explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
-                                    QObject *parent = Q_NULLPTR);
+                                    QObject *parent = nullptr);
     explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                     const QString &columnRole, const QString &valueRole,
-                                    QObject *parent = Q_NULLPTR);
+                                    QObject *parent = nullptr);
     explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                     const QString &columnRole, const QString &valueRole,
-                                    const QString &rotationRole, QObject *parent = Q_NULLPTR);
+                                    const QString &rotationRole, QObject *parent = nullptr);
     explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                     const QString &columnRole, const QString &valueRole,
                                     const QStringList &rowCategories, const QStringList &columnCategories,
-                                    QObject *parent = Q_NULLPTR);
+                                    QObject *parent = 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);
+                                    const QStringList &columnCategories, QObject *parent = nullptr);
     virtual ~QItemModelBarDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 5e74d052..9a85c4aa 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 = Q_NULLPTR);
-    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelScatterDataProxy(QObject *parent = nullptr);
+    explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = nullptr);
     explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
                                         const QString &xPosRole, const QString &yPosRole,
-                                        const QString &zPosRole, QObject *parent = Q_NULLPTR);
+                                        const QString &zPosRole, QObject *parent = nullptr);
     explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
                                         const QString &xPosRole, const QString &yPosRole,
                                         const QString &zPosRole, const QString &rotationRole,
-                                        QObject *parent = Q_NULLPTR);
+                                        QObject *parent = nullptr);
     virtual ~QItemModelScatterDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index fac97ae9..ec94c1f0 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -74,28 +74,28 @@ public:
         MMBCumulativeY = 3
     };
 
-    explicit QItemModelSurfaceDataProxy(QObject *parent = Q_NULLPTR);
-    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+    explicit QItemModelSurfaceDataProxy(QObject *parent = nullptr);
+    explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = nullptr);
     explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &yPosRole,
-                                        QObject *parent = Q_NULLPTR);
+                                        QObject *parent = nullptr);
     explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                         const QString &columnRole, const QString &yPosRole,
-                                        QObject *parent = Q_NULLPTR);
+                                        QObject *parent = nullptr);
     explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                         const QString &columnRole, const QString &xPosRole,
                                         const QString &yPosRole, const QString &zPosRole,
-                                        QObject *parent = Q_NULLPTR);
+                                        QObject *parent = nullptr);
     explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                                         const QString &columnRole, const QString &yPosRole,
                                         const QStringList &rowCategories,
                                         const QStringList &columnCategories,
-                                        QObject *parent = Q_NULLPTR);
+                                        QObject *parent = 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);
+                                        QObject *parent = nullptr);
     virtual ~QItemModelSurfaceDataProxy();
 
     void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 5b6fc17e..0a1f93e9 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 = Q_NULLPTR);
-    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
+    explicit QScatter3DSeries(QObject *parent = nullptr);
+    explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = nullptr);
     virtual ~QScatter3DSeries();
 
     void setDataProxy(QScatterDataProxy *proxy);
@@ -65,7 +65,7 @@ Q_SIGNALS:
     void itemSizeChanged(float size);
 
 protected:
-    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
+    explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = nullptr);
     QScatter3DSeriesPrivate *dptr();
     const QScatter3DSeriesPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index d03cfd60..fd229d1c 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 = Q_NULLPTR);
+    explicit QScatterDataProxy(QObject *parent = nullptr);
     virtual ~QScatterDataProxy();
 
     QScatter3DSeries *series() const;
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void seriesChanged(QScatter3DSeries *series);
 
 protected:
-    explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
+    explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = nullptr);
     QScatterDataProxyPrivate *dptr();
     const QScatterDataProxyPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 9b651d8d..b0b83ea3 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 = Q_NULLPTR);
-    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
+    explicit QSurface3DSeries(QObject *parent = nullptr);
+    explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = 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 = Q_NULLPTR);
+    explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = nullptr);
     QSurface3DSeriesPrivate *dptr();
     const QSurface3DSeriesPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 45295912..427da55d 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 = Q_NULLPTR);
+    explicit QSurfaceDataProxy(QObject *parent = nullptr);
     virtual ~QSurfaceDataProxy();
 
     QSurface3DSeries *series() const;
@@ -92,7 +92,7 @@ Q_SIGNALS:
     void seriesChanged(QSurface3DSeries *series);
 
 protected:
-    explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
+    explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = nullptr);
     QSurfaceDataProxyPrivate *dptr();
     const QSurfaceDataProxyPrivate *dptrc() const;