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, 15 insertions, 15 deletions

diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 9b133a823e..48f8b8db5c 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -57,7 +57,7 @@ public:
     QQuickFramebufferObjectPrivate()
         : followsItemSize(true)
         , mirrorVertically(false)
-        , node(0)
+        , node(nullptr)
     {
     }
 
@@ -194,10 +194,10 @@ class QSGFramebufferObjectNode : public QSGTextureProvider, public QSGSimpleText
 
 public:
     QSGFramebufferObjectNode()
-        : window(0)
-        , fbo(0)
-        , msDisplayFbo(0)
-        , renderer(0)
+        : window(nullptr)
+        , fbo(nullptr)
+        , msDisplayFbo(nullptr)
+        , renderer(nullptr)
         , renderPending(true)
         , invalidatePending(false)
         , devicePixelRatio(1)
@@ -282,13 +282,13 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
     // that easily so with this logic, the renderer only goes away when
     // the scenegraph is invalidated or it is removed from the scene.
     if (!n && (width() <= 0 || height() <= 0))
-        return 0;
+        return nullptr;
 
     Q_D(QQuickFramebufferObject);
 
     if (!n) {
         if (!isOpenGL(d->sceneGraphRenderContext()))
-            return 0;
+            return nullptr;
         if (!d->node)
             d->node = new QSGFramebufferObjectNode;
         n = d->node;
@@ -315,9 +315,9 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
     if (n->fbo && ((d->followsItemSize && n->fbo->size() != desiredFboSize) || n->invalidatePending)) {
         delete n->texture();
         delete n->fbo;
-        n->fbo = 0;
+        n->fbo = nullptr;
         delete n->msDisplayFbo;
-        n->msDisplayFbo = 0;
+        n->msDisplayFbo = nullptr;
         n->invalidatePending = false;
     }
 
@@ -368,10 +368,10 @@ QSGTextureProvider *QQuickFramebufferObject::textureProvider() const
     QQuickWindow *w = window();
     if (!w || !w->openglContext() || QThread::currentThread() != w->openglContext()->thread()) {
         qWarning("QQuickFramebufferObject::textureProvider: can only be queried on the rendering thread of an exposed window");
-        return 0;
+        return nullptr;
     }
     if (!isOpenGL(d->sceneGraphRenderContext()))
-        return 0;
+        return nullptr;
     if (!d->node)
         d->node = new QSGFramebufferObjectNode;
     return d->node;
@@ -386,13 +386,13 @@ void QQuickFramebufferObject::releaseResources()
     // forget about the node. Since it is the node we returned from updatePaintNode
     // it will be managed by the scene graph.
     Q_D(QQuickFramebufferObject);
-    d->node = 0;
+    d->node = nullptr;
 }
 
 void QQuickFramebufferObject::invalidateSceneGraph()
 {
     Q_D(QQuickFramebufferObject);
-    d->node = 0;
+    d->node = nullptr;
 }
 
 /*!
@@ -411,7 +411,7 @@ void QQuickFramebufferObject::invalidateSceneGraph()
  * GUI thread is blocked.
  */
 QQuickFramebufferObject::Renderer::Renderer()
-    : data(0)
+    : data(nullptr)
 {
 }
 
@@ -439,7 +439,7 @@ QQuickFramebufferObject::Renderer::~Renderer()
  */
 QOpenGLFramebufferObject *QQuickFramebufferObject::Renderer::framebufferObject() const
 {
-    return data ? ((QSGFramebufferObjectNode *) data)->fbo : 0;
+    return data ? ((QSGFramebufferObjectNode *) data)->fbo : nullptr;
 }
 
 /*!