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 --- examples/qt3d/basicshapes-cpp/scenemodifier.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/qt3d/basicshapes-cpp') diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp index 798d3aeb6..cadfa517e 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp @@ -197,31 +197,31 @@ SceneModifier::~SceneModifier() //! [4] void SceneModifier::enableTorus(bool enabled) { - m_torusEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_torusEntity->setParent(enabled ? m_rootEntity : nullptr); } //! [4] void SceneModifier::enableCone(bool enabled) { - m_coneEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_coneEntity->setParent(enabled ? m_rootEntity : nullptr); } void SceneModifier::enableCylinder(bool enabled) { - m_cylinderEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_cylinderEntity->setParent(enabled ? m_rootEntity : nullptr); } void SceneModifier::enableCuboid(bool enabled) { - m_cuboidEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_cuboidEntity->setParent(enabled ? m_rootEntity : nullptr); } void SceneModifier::enablePlane(bool enabled) { - m_planeEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_planeEntity->setParent(enabled ? m_rootEntity : nullptr); } void SceneModifier::enableSphere(bool enabled) { - m_sphereEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR); + m_sphereEntity->setParent(enabled ? m_rootEntity : nullptr); } -- cgit v1.2.3