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/axis | |
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/axis')
-rw-r--r-- | src/datavisualization/axis/qabstract3daxis.h | 2 | ||||
-rw-r--r-- | src/datavisualization/axis/qcategory3daxis.h | 2 | ||||
-rw-r--r-- | src/datavisualization/axis/qlogvalue3daxisformatter.h | 4 | ||||
-rw-r--r-- | src/datavisualization/axis/qvalue3daxis.h | 2 | ||||
-rw-r--r-- | src/datavisualization/axis/qvalue3daxisformatter.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 8ca1052e..63dd0340 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -70,7 +70,7 @@ public: }; protected: - explicit QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = 0); + explicit QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = Q_NULLPTR); public: virtual ~QAbstract3DAxis(); diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index 640de5b5..2165a4d2 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -42,7 +42,7 @@ class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) public: - explicit QCategory3DAxis(QObject *parent = 0); + explicit QCategory3DAxis(QObject *parent = Q_NULLPTR); virtual ~QCategory3DAxis(); void setLabels(const QStringList &labels); diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h index ec7d12d2..45d70f43 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -45,9 +45,9 @@ class QT_DATAVISUALIZATION_EXPORT QLogValue3DAxisFormatter : public QValue3DAxis Q_PROPERTY(bool showEdgeLabels READ showEdgeLabels WRITE setShowEdgeLabels NOTIFY showEdgeLabelsChanged) protected: - explicit QLogValue3DAxisFormatter(QLogValue3DAxisFormatterPrivate *d, QObject *parent = 0); + explicit QLogValue3DAxisFormatter(QLogValue3DAxisFormatterPrivate *d, QObject *parent = Q_NULLPTR); public: - explicit QLogValue3DAxisFormatter(QObject *parent = 0); + explicit QLogValue3DAxisFormatter(QObject *parent = Q_NULLPTR); virtual ~QLogValue3DAxisFormatter(); void setBase(qreal base); diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index e1a12ec8..e430c03a 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -47,7 +47,7 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis Q_PROPERTY(bool reversed READ reversed WRITE setReversed NOTIFY reversedChanged REVISION 1) public: - explicit QValue3DAxis(QObject *parent = 0); + explicit QValue3DAxis(QObject *parent = Q_NULLPTR); virtual ~QValue3DAxis(); void setSegmentCount(int count); diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index 76ad6055..72392d0c 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -46,9 +46,9 @@ class QT_DATAVISUALIZATION_EXPORT QValue3DAxisFormatter : public QObject { Q_OBJECT protected: - explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = 0); + explicit QValue3DAxisFormatter(QValue3DAxisFormatterPrivate *d, QObject *parent = Q_NULLPTR); public: - explicit QValue3DAxisFormatter(QObject *parent = 0); + explicit QValue3DAxisFormatter(QObject *parent = Q_NULLPTR); virtual ~QValue3DAxisFormatter(); protected: |