From 7d16c732127199bf2f26ef93d242b0d19b0d7944 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 13:59:37 +0100 Subject: 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 --- src/datavisualization/data/qcustom3ditem.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/data/qcustom3ditem.h') 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 d_ptr; -- cgit v1.2.3