diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/materialsystem/qmaterial.h | |
parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qmaterial.h')
-rw-r--r-- | src/render/materialsystem/qmaterial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index 06df54a4d..48413c4a4 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); + explicit QMaterial(Qt3DCore::QNode *parent = nullptr); QEffect *effect() const; @@ -75,7 +75,7 @@ Q_SIGNALS: void effectChanged(QEffect *effect); protected: - QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = nullptr); private: Q_DECLARE_PRIVATE(QMaterial) |