From 3a965b26e38d551cac80a0e9ba1ffb4bf082a6df Mon Sep 17 00:00:00 2001
From: Kevin Funk <kfunk@kde.org>
Date: Sun, 24 Sep 2017 23:54:55 +0200
Subject: Replace Q_NULLPTR with nullptr

Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 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 4ecb1953..6bbe7600 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 = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
+    explicit Q3DBars(const QSurfaceFormat *format = nullptr, QWindow *parent = nullptr);
     virtual ~Q3DBars();
 
     void setPrimarySeries(QBar3DSeries *series);
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index b592d4cc..9ef4a1b8 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -79,7 +79,7 @@ public:
         CameraPresetDirectlyBelow
     };
 
-    explicit Q3DCamera(QObject *parent = Q_NULLPTR);
+    explicit Q3DCamera(QObject *parent = nullptr);
     virtual ~Q3DCamera();
 
     float xRotation() const;
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 582e600c..546ac424 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -42,7 +42,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject
     Q_PROPERTY(bool autoPosition READ isAutoPosition WRITE setAutoPosition NOTIFY autoPositionChanged REVISION 1)
 
 public:
-    explicit Q3DLight(QObject *parent = Q_NULLPTR);
+    explicit Q3DLight(QObject *parent = nullptr);
     virtual ~Q3DLight();
 
     void setAutoPosition(bool enabled);
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index c6faef5a..e0fa0a08 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:
-    explicit Q3DObject(QObject *parent = Q_NULLPTR);
+    explicit Q3DObject(QObject *parent = nullptr);
     virtual ~Q3DObject();
 
     virtual void copyValuesFrom(const Q3DObject &source);
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index ef1561ea..9067ee0f 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 = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
+    explicit Q3DScatter(const QSurfaceFormat *format = nullptr, QWindow *parent = nullptr);
     virtual ~Q3DScatter();
 
     void addSeries(QScatter3DSeries *series);
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 74c24c7c..de71255d 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:
-    explicit Q3DScene(QObject *parent = Q_NULLPTR);
+    explicit Q3DScene(QObject *parent = nullptr);
     virtual ~Q3DScene();
 
     QRect viewport() const;
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index 4935f595..48a27c4f 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 = Q_NULLPTR, QWindow *parent = Q_NULLPTR);
+    explicit Q3DSurface(const QSurfaceFormat *format = nullptr, QWindow *parent = nullptr);
     virtual ~Q3DSurface();
 
     void addSeries(QSurface3DSeries *series);
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index a7d7d2ac..a59259d1 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 = Q_NULLPTR);
+                              QWindow *parent = nullptr);
 
 public:
     enum SelectionFlag {
-- 
cgit v1.2.3