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/data/qcustom3ditem.h | |
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/data/qcustom3ditem.h')
-rw-r--r-- | src/datavisualization/data/qcustom3ditem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index d984b9d4..bec213f9 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -45,10 +45,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1) public: - explicit QCustom3DItem(QObject *parent = 0); + explicit QCustom3DItem(QObject *parent = Q_NULLPTR); explicit QCustom3DItem(const QString &meshFile, const QVector3D &position, const QVector3D &scaling, const QQuaternion &rotation, - const QImage &texture, QObject *parent = 0); + const QImage &texture, QObject *parent = Q_NULLPTR); virtual ~QCustom3DItem(); void setMeshFile(const QString &meshFile); @@ -94,7 +94,7 @@ Q_SIGNALS: Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute); protected: - QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = 0); + QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = Q_NULLPTR); QScopedPointer<QCustom3DItemPrivate> d_ptr; |