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/extras/geometries/qcuboidgeometry.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/extras/geometries/qcuboidgeometry.cpp')
| -rw-r--r-- | src/extras/geometries/qcuboidgeometry.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp index 78eab4537..dc76edbf6 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -344,7 +344,7 @@ public: bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL { const CuboidVertexBufferFunctor *otherFunctor = functor_cast<CuboidVertexBufferFunctor>(&other); - if (otherFunctor != Q_NULLPTR) + if (otherFunctor != nullptr) return (otherFunctor->m_xExtent == m_xExtent && otherFunctor->m_yExtent == m_yExtent && otherFunctor->m_zExtent == m_zExtent && @@ -386,7 +386,7 @@ public: bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL { const CuboidIndexBufferFunctor *otherFunctor = functor_cast<CuboidIndexBufferFunctor>(&other); - if (otherFunctor != Q_NULLPTR) + if (otherFunctor != nullptr) return (otherFunctor->m_yzFaceResolution == m_yzFaceResolution && otherFunctor->m_xzFaceResolution == m_xzFaceResolution && otherFunctor->m_xyFaceResolution == m_xyFaceResolution); @@ -409,13 +409,13 @@ QCuboidGeometryPrivate::QCuboidGeometryPrivate() , m_yzFaceResolution(2, 2) , m_xzFaceResolution(2, 2) , m_xyFaceResolution(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) { } |