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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/render/materialsystem/qmaterial.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index 5f9bb04d6..cb8cd2bbe 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -80,7 +80,7 @@ namespace Qt3DRender { QMaterialPrivate::QMaterialPrivate() : QComponentPrivate() - , m_effect(Q_NULLPTR) + , m_effect(nullptr) { } @@ -137,7 +137,7 @@ void QMaterial::addParameter(QParameter *parameter) if (!parameter->parent()) parameter->setParent(this); - if (d->m_changeArbiter != Q_NULLPTR) { + if (d->m_changeArbiter != nullptr) { const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter); change->setPropertyName("parameter"); d->notifyObservers(change); @@ -149,7 +149,7 @@ void QMaterial::removeParameter(QParameter *parameter) { Q_ASSERT(parameter); Q_D(QMaterial); - if (d->m_changeArbiter != Q_NULLPTR) { + if (d->m_changeArbiter != nullptr) { const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter); change->setPropertyName("parameter"); d->notifyObservers(change); |