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/plugins/imageformats/gif/qgifhandler.cpp   | 12 ++++++------
 src/plugins/imageformats/jpeg/qjpeghandler.cpp |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins/imageformats')

diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index a6029b691c..c92cc3ea61 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -147,8 +147,8 @@ private:
 */
 QGIFFormat::QGIFFormat()
 {
-    globalcmap = 0;
-    localcmap = 0;
+    globalcmap = nullptr;
+    localcmap = nullptr;
     lncols = 0;
     gncols = 0;
     disposal = NoDisposal;
@@ -160,9 +160,9 @@ QGIFFormat::QGIFFormat()
     lcmap = false;
     newFrame = false;
     partialNewFrame = false;
-    table[0] = 0;
-    table[1] = 0;
-    stack = 0;
+    table[0] = nullptr;
+    table[1] = nullptr;
+    stack = nullptr;
 }
 
 /*!
@@ -550,7 +550,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
                         }
                         oldcode=incode;
                         const int h = image->height();
-                        QRgb *line = 0;
+                        QRgb *line = nullptr;
                         if (!out_of_bounds && h > y)
                             line = (QRgb*)FAST_SCAN_LINE(bits, bpl, y);
                         while (sp>stack) {
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index dd01138722..c31e2db3c5 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -729,7 +729,7 @@ static bool write_jpeg_image(const QImage &image,
     // do_write_jpeg_image (by making them non-local).
     struct jpeg_compress_struct cinfo;
     JSAMPROW row_pointer[1];
-    row_pointer[0] = 0;
+    row_pointer[0] = nullptr;
 
     const bool success = do_write_jpeg_image(cinfo, row_pointer,
                                              image, device,
@@ -751,7 +751,7 @@ public:
     };
 
     QJpegHandlerPrivate(QJpegHandler *qq)
-        : quality(75), transformation(QImageIOHandler::TransformationNone), iod_src(0),
+        : quality(75), transformation(QImageIOHandler::TransformationNone), iod_src(nullptr),
           rgb888ToRgb32ConverterPtr(qt_convert_rgb888_to_rgb32), state(Ready), optimize(false), progressive(false), q(qq)
     {}
 
@@ -761,7 +761,7 @@ public:
         {
             jpeg_destroy_decompress(&info);
             delete iod_src;
-            iod_src = 0;
+            iod_src = nullptr;
         }
     }
 
@@ -954,7 +954,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
 
             QByteArray exifData;
 
-            for (jpeg_saved_marker_ptr marker = info.marker_list; marker != NULL; marker = marker->next) {
+            for (jpeg_saved_marker_ptr marker = info.marker_list; marker != nullptr; marker = marker->next) {
                 if (marker->marker == JPEG_COM) {
                     QString key, value;
                     QString s = QString::fromUtf8((const char *)marker->data, marker->data_length);
-- 
cgit v1.2.3