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/corelib/io/qnoncontiguousbytedevice.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/corelib/io/qnoncontiguousbytedevice.cpp')

diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index d1806aa12b..df0197e8eb 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE
     \internal
 */
 
-QNonContiguousByteDevice::QNonContiguousByteDevice() : QObject((QObject*)0)
+QNonContiguousByteDevice::QNonContiguousByteDevice() : QObject((QObject*)nullptr)
 {
 }
 
@@ -188,7 +188,7 @@ const char* QNonContiguousByteDeviceByteArrayImpl::readPointer(qint64 maximumLen
 {
     if (atEnd()) {
         len = -1;
-        return 0;
+        return nullptr;
     }
 
     if (maximumLength != -1)
@@ -241,7 +241,7 @@ const char* QNonContiguousByteDeviceRingBufferImpl::readPointer(qint64 maximumLe
 {
     if (atEnd()) {
         len = -1;
-        return 0;
+        return nullptr;
     }
 
     const char *returnValue = ringBuffer->readPointerAtPosition(currentPosition, len);
@@ -282,7 +282,7 @@ qint64 QNonContiguousByteDeviceRingBufferImpl::size() const
 
 QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d)
     : QNonContiguousByteDevice(),
-    currentReadBuffer(0), currentReadBufferSize(16*1024),
+    currentReadBuffer(nullptr), currentReadBufferSize(16*1024),
     currentReadBufferAmount(0), currentReadBufferPosition(0), totalAdvancements(0),
     eof(false)
 {
@@ -301,10 +301,10 @@ const char* QNonContiguousByteDeviceIoDeviceImpl::readPointer(qint64 maximumLeng
 {
     if (eof == true) {
         len = -1;
-        return 0;
+        return nullptr;
     }
 
-    if (currentReadBuffer == 0)
+    if (currentReadBuffer == nullptr)
         currentReadBuffer = new QByteArray(currentReadBufferSize, '\0'); // lazy alloc
 
     if (maximumLength == -1)
@@ -323,7 +323,7 @@ const char* QNonContiguousByteDeviceIoDeviceImpl::readPointer(qint64 maximumLeng
         // size was unknown before, emit a readProgress with the final size
         if (size() == -1)
             emit readProgress(totalAdvancements, totalAdvancements);
-        return 0;
+        return nullptr;
     }
 
     currentReadBufferAmount = haveRead;
@@ -349,7 +349,7 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)
     if (currentReadBufferPosition > currentReadBufferAmount) {
         qint64 i = currentReadBufferPosition - currentReadBufferAmount;
         while (i > 0) {
-            if (device->getChar(0) == false) {
+            if (device->getChar(nullptr) == false) {
                 emit readProgress(totalAdvancements - i, size());
                 return false; // ### FIXME handle eof
             }
@@ -377,7 +377,7 @@ bool QNonContiguousByteDeviceIoDeviceImpl::reset()
         totalAdvancements = 0; //reset the progress counter
         if (currentReadBuffer) {
             delete currentReadBuffer;
-            currentReadBuffer = 0;
+            currentReadBuffer = nullptr;
         }
         currentReadBufferAmount = 0;
         currentReadBufferPosition = 0;
@@ -405,7 +405,7 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::pos() const
     return device->pos();
 }
 
-QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)0)
+QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)nullptr)
 {
     byteDevice = bd;
     connect(bd, SIGNAL(readyRead()), SIGNAL(readyRead()));
-- 
cgit v1.2.3