From a01b14670e5b35a951ec57297613418dc829d65c Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Fri, 29 Apr 2016 19:35:20 +0100 Subject: Q_NULLPTR -> nullptr Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire --- src/extras/defaults/qnormaldiffusemapmaterial.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/extras/defaults/qnormaldiffusemapmaterial.h') diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.h b/src/extras/defaults/qnormaldiffusemapmaterial.h index 7152d64d5..f60a27b86 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.h +++ b/src/extras/defaults/qnormaldiffusemapmaterial.h @@ -67,7 +67,7 @@ class QT3DEXTRASSHARED_EXPORT QNormalDiffuseMapMaterial : public Qt3DRender::QMa Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); + explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = nullptr); ~QNormalDiffuseMapMaterial(); QColor ambient() const; @@ -94,7 +94,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); + QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = nullptr); private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) -- cgit v1.2.3