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 /examples/qt3d | |
| parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) | |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/assimp/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/scenemodifier.cpp | 12 | ||||
| -rw-r--r-- | examples/qt3d/simple-cpp/orbittransformcontroller.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 78d2035d9..5df575e32 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -92,7 +92,7 @@ QObject *SceneHelper::findComponent(Qt3DCore::QEntity *entity, const QString &co return component; } } - return Q_NULLPTR; + return nullptr; } void SceneHelper::addListEntry(const QVariant &list, QObject *entry) 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); } diff --git a/examples/qt3d/simple-cpp/orbittransformcontroller.cpp b/examples/qt3d/simple-cpp/orbittransformcontroller.cpp index e2759d202..0aa7a68e4 100644 --- a/examples/qt3d/simple-cpp/orbittransformcontroller.cpp +++ b/examples/qt3d/simple-cpp/orbittransformcontroller.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE OrbitTransformController::OrbitTransformController(QObject *parent) : QObject(parent) - , m_target(Q_NULLPTR) + , m_target(nullptr) , m_matrix() , m_radius(1.0f) , m_angle(0.0f) diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp index 33e062971..e98ee8936 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp @@ -58,7 +58,7 @@ class TessellatedGeometry : public Qt3DRender::QGeometry { Q_OBJECT public: - TessellatedGeometry(Qt3DCore::QNode *parent = Q_NULLPTR) + TessellatedGeometry(Qt3DCore::QNode *parent = nullptr) : Qt3DRender::QGeometry(parent) , m_positionAttribute(new Qt3DRender::QAttribute(this)) , m_vertexBuffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, this)) |