diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
commit | 8427634773505f73ce030cf68761c4719eb03e5c (patch) | |
tree | 56d0e488e533778782b55c54aa3ab07f0d5e888d /src/datavisualization/data/qscatter3dseries.h | |
parent | 3fb7ce6a29ca69237c777cc65a3831768e938782 (diff) | |
parent | 364ed207af1becd2b85d93bc87d5db84624b4381 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
Diffstat (limited to 'src/datavisualization/data/qscatter3dseries.h')
-rw-r--r-- | src/datavisualization/data/qscatter3dseries.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |