summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qmesh.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-29 19:35:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 15:43:11 +0000
commita01b14670e5b35a951ec57297613418dc829d65c (patch)
treed9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/geometry/qmesh.cpp
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (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/qmesh.cpp')
-rw-r--r--src/render/geometry/qmesh.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 72a0a13b6..75483a332 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -174,7 +174,7 @@ QGeometry *MeshFunctor::operator()()
{
if (m_sourcePath.isEmpty()) {
qCWarning(Render::Jobs) << Q_FUNC_INFO << "Mesh is empty, nothing to load";
- return Q_NULLPTR;
+ return nullptr;
}
// TO DO : Maybe use Assimp instead of ObjLoader to handle more sources
@@ -191,7 +191,7 @@ QGeometry *MeshFunctor::operator()()
return loader.geometry();
qCWarning(Render::Jobs) << Q_FUNC_INFO << "OBJ load failure for:" << filePath;
- return Q_NULLPTR;
+ return nullptr;
}
/*!
@@ -200,7 +200,7 @@ QGeometry *MeshFunctor::operator()()
bool MeshFunctor::operator ==(const QGeometryFactory &other) const
{
const MeshFunctor *otherFunctor = functor_cast<MeshFunctor>(&other);
- if (otherFunctor != Q_NULLPTR)
+ if (otherFunctor != nullptr)
return (otherFunctor->m_sourcePath == m_sourcePath);
return false;
}