From ece0c0a5e7e0b18beb58ccd868bde54c7be64f78 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 22 Nov 2019 14:46:58 +0100
Subject: Tidy nullptr usage

Move away from using 0 as pointer literal.

Done using clang-tidy. This is not complete as
run-clang-tidy can't handle all of qtbase in one go.

Change-Id: I1076a21f32aac0dab078af6f175f7508145eece0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/network/access/qnetworkaccesscache.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/network/access/qnetworkaccesscache.cpp')

diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp
index b694a2c999..ba092f2618 100644
--- a/src/network/access/qnetworkaccesscache.cpp
+++ b/src/network/access/qnetworkaccesscache.cpp
@@ -73,7 +73,7 @@ struct QNetworkAccessCache::Node
     int useCount;
 
     Node()
-        : older(0), newer(0), object(0), useCount(0)
+        : older(nullptr), newer(nullptr), object(nullptr), useCount(0)
     { }
 };
 
@@ -103,7 +103,7 @@ void QNetworkAccessCache::CacheableObject::setShareable(bool enable)
 }
 
 QNetworkAccessCache::QNetworkAccessCache()
-    : oldest(0), newest(0)
+    : oldest(nullptr), newest(nullptr)
 {
 }
 
@@ -130,7 +130,7 @@ void QNetworkAccessCache::clear()
 
     timer.stop();
 
-    oldest = newest = 0;
+    oldest = newest = nullptr;
 }
 
 /*!
@@ -145,11 +145,11 @@ void QNetworkAccessCache::linkEntry(const QByteArray &key)
 
     Node *const node = &it.value();
     Q_ASSERT(node != oldest && node != newest);
-    Q_ASSERT(node->older == 0 && node->newer == 0);
+    Q_ASSERT(node->older == nullptr && node->newer == nullptr);
     Q_ASSERT(node->useCount == 0);
 
     if (newest) {
-        Q_ASSERT(newest->newer == 0);
+        Q_ASSERT(newest->newer == nullptr);
         newest->newer = node;
         node->older = newest;
     }
@@ -186,7 +186,7 @@ bool QNetworkAccessCache::unlinkEntry(const QByteArray &key)
     if (node->newer)
         node->newer->older = node->older;
 
-    node->newer = node->older = 0;
+    node->newer = node->older = nullptr;
     return wasOldest;
 }
 
@@ -235,9 +235,9 @@ void QNetworkAccessCache::timerEvent(QTimerEvent *)
 
     // fixup the list
     if (oldest)
-        oldest->older = 0;
+        oldest->older = nullptr;
     else
-        newest = 0;
+        newest = nullptr;
 
     updateTimer();
 }
@@ -277,7 +277,7 @@ bool QNetworkAccessCache::requestEntry(const QByteArray &key, QObject *target, c
     if (node->useCount > 0 && !node->object->shareable) {
         // object is not shareable and is in use
         // queue for later use
-        Q_ASSERT(node->older == 0 && node->newer == 0);
+        Q_ASSERT(node->older == nullptr && node->newer == nullptr);
         node->receiverQueue.push_back({target, member});
 
         // request queued
@@ -296,7 +296,7 @@ QNetworkAccessCache::CacheableObject *QNetworkAccessCache::requestEntryNow(const
 {
     NodeHash::Iterator it = hash.find(key);
     if (it == hash.end())
-        return 0;
+        return nullptr;
     if (it->useCount > 0) {
         if (it->object->shareable) {
             ++it->useCount;
@@ -304,7 +304,7 @@ QNetworkAccessCache::CacheableObject *QNetworkAccessCache::requestEntryNow(const
         }
 
         // object in use and not shareable
-        return 0;
+        return nullptr;
     }
 
     // entry not in use, let the caller have it
-- 
cgit v1.2.3