summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qheightmapsurfacedataproxy.h
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:54:55 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-26 17:14:16 +0000
commit3a965b26e38d551cac80a0e9ba1ffb4bf082a6df (patch)
tree39b55c10af9d51d3cc8de7707134d1c9aa4be8b9 /src/datavisualization/data/qheightmapsurfacedataproxy.h
parent73c299f96edb1d4a506e1d75e2bf215b595adc8d (diff)
Replace Q_NULLPTR with nullptr
Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/datavisualization/data/qheightmapsurfacedataproxy.h')
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.h8
1 files changed, 4 insertions, 4 deletions
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;