diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 13:59:37 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 16:14:27 +0000 |
commit | 7d16c732127199bf2f26ef93d242b0d19b0d7944 (patch) | |
tree | 8a881b6c893a529f74500d29310c3af475853b25 /src/datavisualization/axis | |
parent | a3cd1d4b7d35f4c12d2a26283fcd346126a535e7 (diff) |
Add explicit and make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d
Task-number: QTBUG-45291
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
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 e5b5dbcf..88153c3b 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -62,7 +62,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 994432ef..97fca13a 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -34,7 +34,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 ddbc8d50..d4d84b7c 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -37,9 +37,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 37076482..68467e3e 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -39,7 +39,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 e9aaaa16..904fd137 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -38,9 +38,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: |