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/geometry/geometryrenderer.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/geometry/geometryrenderer.cpp')
-rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index e396cdf6e..8e3d71567 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -65,7 +65,7 @@ GeometryRenderer::GeometryRenderer() , m_primitiveRestartEnabled(false) , m_primitiveType(QGeometryRenderer::Triangles) , m_dirty(false) - , m_manager(Q_NULLPTR) + , m_manager(nullptr) { } @@ -107,10 +107,10 @@ void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer) m_verticesPerPatch = geometryRenderer->verticesPerPatch(); m_primitiveRestartEnabled = geometryRenderer->primitiveRestartEnabled(); m_primitiveType = geometryRenderer->primitiveType(); - if (geometryRenderer->geometry() != Q_NULLPTR) + if (geometryRenderer->geometry() != nullptr) m_geometryId = geometryRenderer->geometry()->id(); m_geometryFactory = geometryRenderer->geometryFactory(); - if (m_geometryFactory && m_manager != Q_NULLPTR) + if (m_geometryFactory && m_manager != nullptr) m_manager->addDirtyGeometryRenderer(peerId()); m_dirty = true; } @@ -173,7 +173,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QGeometryFactoryPtr newFunctor = propertyChange->value().value<QGeometryFactoryPtr>(); m_dirty |= !(newFunctor && m_geometryFactory && *newFunctor == *m_geometryFactory); m_geometryFactory = newFunctor; - if (m_geometryFactory && m_manager != Q_NULLPTR) + if (m_geometryFactory && m_manager != nullptr) m_manager->addDirtyGeometryRenderer(peerId()); } break; |