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/texture/textureimage.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/texture/textureimage.cpp')
-rw-r--r-- | src/render/texture/textureimage.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 320f6f8a2..94e4b3811 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -57,9 +57,9 @@ TextureImage::TextureImage() , m_mipLevel(0) , m_face(QAbstractTexture::CubeMapPositiveX) , m_dirty(true) - , m_textureManager(Q_NULLPTR) - , m_textureImageManager(Q_NULLPTR) - , m_textureDataManager(Q_NULLPTR) + , m_textureManager(nullptr) + , m_textureImageManager(nullptr) + , m_textureDataManager(nullptr) , m_dna(0) { } @@ -72,9 +72,9 @@ void TextureImage::cleanup() m_dirty = true; m_face = QAbstractTexture::CubeMapPositiveX; m_generator.reset(); - m_textureManager = Q_NULLPTR; - m_textureImageManager = Q_NULLPTR; - m_textureDataManager = Q_NULLPTR; + m_textureManager = nullptr; + m_textureImageManager = nullptr; + m_textureDataManager = nullptr; m_referencedTextures.clear(); m_dna = 0; } @@ -95,7 +95,7 @@ void TextureImage::updateFromPeer(Qt3DCore::QNode *peer) Texture *txt = m_textureManager->data(m_textureProvider); // Notify the Texture that it has a new TextureImage and needs an update txt->addTextureImageData(m_textureImageManager->lookupHandle(peerId())); - if (txt != Q_NULLPTR) + if (txt != nullptr) txt->addToPendingTextureJobs(); } } @@ -143,7 +143,7 @@ void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } if (m_dirty) {// Notify the Texture that we were updated and request it to schedule an update job Texture *txt = m_textureManager->data(m_textureProvider); - if (txt != Q_NULLPTR) + if (txt != nullptr) txt->addToPendingTextureJobs(); } markDirty(AbstractRenderer::AllDirty); |