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/render/geometry/buffer.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/render/geometry/buffer.cpp')
-rw-r--r-- | src/render/geometry/buffer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 8a6b6e9ff..81de24083 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -56,7 +56,7 @@ Buffer::Buffer() , m_usage(QBuffer::StaticDraw) , m_bufferDirty(false) , m_syncData(false) - , m_manager(Q_NULLPTR) + , m_manager(nullptr) { // Maybe it could become read write if we want to inform // the frontend QBuffer node of any backend issue @@ -99,13 +99,13 @@ void Buffer::executeFunctor() void Buffer::updateFromPeer(Qt3DCore::QNode *peer) { QBuffer *buffer = static_cast<QBuffer *>(peer); - if (buffer != Q_NULLPTR) { + if (buffer != nullptr) { m_type = buffer->type(); m_usage = buffer->usage(); m_data = buffer->data(); m_functor = buffer->dataGenerator(); // Add to dirty list in the manager - if (m_functor && m_manager != Q_NULLPTR) + if (m_functor && m_manager != nullptr) m_manager->addDirtyBuffer(peerId()); m_bufferDirty = true; m_syncData = buffer->isSyncData(); @@ -147,7 +147,7 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QBufferDataGeneratorPtr newGenerator = propertyChange->value().value<QBufferDataGeneratorPtr>(); m_bufferDirty |= !(newGenerator && m_functor && *newGenerator == *m_functor); m_functor = newGenerator; - if (m_functor && m_manager != Q_NULLPTR) + if (m_functor && m_manager != nullptr) m_manager->addDirtyBuffer(peerId()); } else if (propertyName == QByteArrayLiteral("syncData")) { m_syncData = propertyChange->value().toBool(); |