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/render/jobs/updateworldtransformjob.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/render/jobs/updateworldtransformjob.cpp') 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(); - 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); -- cgit v1.2.3