summaryrefslogtreecommitdiffstats
path: root/src/extras/geometries/qplanegeometry.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/extras/geometries/qplanegeometry.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/extras/geometries/qplanegeometry.cpp')
-rw-r--r--src/extras/geometries/qplanegeometry.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index 59e2dbad4..29ec8256e 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -163,7 +163,7 @@ public:
bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
{
const PlaneVertexBufferFunctor *otherFunctor = functor_cast<PlaneVertexBufferFunctor>(&other);
- if (otherFunctor != Q_NULLPTR)
+ if (otherFunctor != nullptr)
return (otherFunctor->m_width == m_width &&
otherFunctor->m_height == m_height &&
otherFunctor->m_resolution == m_resolution);
@@ -195,7 +195,7 @@ public:
bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
{
const PlaneIndexBufferFunctor *otherFunctor = functor_cast<PlaneIndexBufferFunctor>(&other);
- if (otherFunctor != Q_NULLPTR)
+ if (otherFunctor != nullptr)
return (otherFunctor->m_resolution == m_resolution);
return false;
}
@@ -439,13 +439,13 @@ QPlaneGeometryPrivate::QPlaneGeometryPrivate()
, m_width(1.0f)
, m_height(1.0f)
, m_meshResolution(QSize(2, 2))
- , m_positionAttribute(Q_NULLPTR)
- , m_normalAttribute(Q_NULLPTR)
- , m_texCoordAttribute(Q_NULLPTR)
- , m_tangentAttribute(Q_NULLPTR)
- , m_indexAttribute(Q_NULLPTR)
- , m_vertexBuffer(Q_NULLPTR)
- , m_indexBuffer(Q_NULLPTR)
+ , m_positionAttribute(nullptr)
+ , m_normalAttribute(nullptr)
+ , m_texCoordAttribute(nullptr)
+ , m_tangentAttribute(nullptr)
+ , m_indexAttribute(nullptr)
+ , m_vertexBuffer(nullptr)
+ , m_indexBuffer(nullptr)
{
}