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 --- src/extras/geometries/qplanegeometry.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/extras/geometries/qplanegeometry.cpp') 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(&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(&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) { } -- cgit v1.2.3