use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 0f9ee9cfde..70a8b321d8 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -67,7 +67,7 @@ QSGOpaqueTextureMaterialShader::QSGOpaqueTextureMaterialShader()
 
 char const *const *QSGOpaqueTextureMaterialShader::attributeNames() const
 {
-    static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", 0 };
+    static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", nullptr };
     return attr;
 }
 
@@ -80,7 +80,7 @@ void QSGOpaqueTextureMaterialShader::initialize()
 
 void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
     QSGOpaqueTextureMaterial *tx = static_cast<QSGOpaqueTextureMaterial *>(newEffect);
     QSGOpaqueTextureMaterial *oldTx = static_cast<QSGOpaqueTextureMaterial *>(oldEffect);
 
@@ -112,7 +112,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
     t->setMipmapFiltering(tx->mipmapFiltering());
     t->setAnisotropyLevel(tx->anisotropyLevel());
 
-    if (oldTx == 0 || oldTx->texture()->textureId() != t->textureId())
+    if (oldTx == nullptr || oldTx->texture()->textureId() != t->textureId())
         t->bind();
     else
         t->updateBindOptions();
@@ -169,7 +169,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
 
  */
 QSGOpaqueTextureMaterial::QSGOpaqueTextureMaterial()
-    : m_texture(0)
+    : m_texture(nullptr)
     , m_filtering(QSGTexture::Nearest)
     , m_mipmap_filtering(QSGTexture::None)
     , m_horizontal_wrap(QSGTexture::ClampToEdge)
@@ -398,7 +398,7 @@ QSGTextureMaterialShader::QSGTextureMaterialShader()
 
 void QSGTextureMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
-    Q_ASSERT(oldEffect == 0 || newEffect->type() == oldEffect->type());
+    Q_ASSERT(oldEffect == nullptr || newEffect->type() == oldEffect->type());
 #if QT_CONFIG(opengl)
     if (state.isOpacityDirty())
         program()->setUniformValue(m_opacity_id, state.opacity());