diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
commit | 13a8c4eb9977a962fd70a91c6e5801f7a6506900 (patch) | |
tree | c7baf2d0bfedcea8e51d996d5a336d29064d73d7 /src/datavisualization/data/qsurface3dseries.h | |
parent | 5ad9e88e1a08efc57739e9ea6d98199b416a4178 (diff) | |
parent | 8427634773505f73ce030cf68761c4719eb03e5c (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
Diffstat (limited to 'src/datavisualization/data/qsurface3dseries.h')
-rw-r--r-- | src/datavisualization/data/qsurface3dseries.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |