diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:54:47 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-25 11:55:44 +0000 |
| commit | ba5bc93b95d28a28a72e60281f765a6f031129a5 (patch) | |
| tree | b9132290c3b153a81b229ea4cd681a17b58352fa /src/render/texture/qpaintedtextureimage.cpp | |
| parent | 93f5ac54f56b8c340731fd88e1b88525fca7793c (diff) | |
Replace Q_NULLPTR with nullptr
Change-Id: I480f8b917e41d514f9efff01b2f2664b61ea3440
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qpaintedtextureimage.cpp')
| -rw-r--r-- | src/render/texture/qpaintedtextureimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp index db03b26b9..af0e74d4b 100644 --- a/src/render/texture/qpaintedtextureimage.cpp +++ b/src/render/texture/qpaintedtextureimage.cpp @@ -233,7 +233,7 @@ QTextureImageDataPtr QPaintedTextureImageDataGenerator::operator ()() bool QPaintedTextureImageDataGenerator::operator ==(const QTextureImageDataGenerator &other) const { const QPaintedTextureImageDataGenerator *otherFunctor = functor_cast<QPaintedTextureImageDataGenerator>(&other); - return (otherFunctor != Q_NULLPTR && otherFunctor->m_generation == m_generation && otherFunctor->m_paintedTextureImageId == m_paintedTextureImageId); + return (otherFunctor != nullptr && otherFunctor->m_generation == m_generation && otherFunctor->m_paintedTextureImageId == m_paintedTextureImageId); } } // namespace Qt3DRender |