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/jobs/updateworldtransformjob.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/jobs/updateworldtransformjob.cpp')
| -rw-r--r-- | src/render/jobs/updateworldtransformjob.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp index 83a888e6d..3c621dbd0 100644 --- a/src/render/jobs/updateworldtransformjob.cpp +++ b/src/render/jobs/updateworldtransformjob.cpp @@ -59,7 +59,7 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatr { QMatrix4x4 worldTransform(parentTransform); Transform *nodeTransform = node->renderComponent<Transform>(); - if (nodeTransform != Q_NULLPTR && nodeTransform->isEnabled()) + if (nodeTransform != nullptr && nodeTransform->isEnabled()) worldTransform = worldTransform * nodeTransform->transformMatrix(); *(node->worldTransform()) = worldTransform; @@ -75,7 +75,7 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatr UpdateWorldTransformJob::UpdateWorldTransformJob() : Qt3DCore::QAspectJob() - , m_node(Q_NULLPTR) + , m_node(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTransform, 0); } @@ -98,7 +98,7 @@ void UpdateWorldTransformJob::run() QMatrix4x4 parentTransform; Entity *parent = m_node->parent(); - if (parent != Q_NULLPTR) + if (parent != nullptr) parentTransform = *(parent->worldTransform()); updateWorldTransformAndBounds(m_node, parentTransform); |