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>

1 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index fbadab4d50..639e4f039c 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -67,10 +67,10 @@ enum {
 };
 #undef CursorShape
 
-static PtrXcursorLibraryLoadCursor ptrXcursorLibraryLoadCursor = 0;
-static PtrXcursorLibraryGetTheme ptrXcursorLibraryGetTheme = 0;
-static PtrXcursorLibrarySetTheme ptrXcursorLibrarySetTheme = 0;
-static PtrXcursorLibraryGetDefaultSize ptrXcursorLibraryGetDefaultSize = 0;
+static PtrXcursorLibraryLoadCursor ptrXcursorLibraryLoadCursor = nullptr;
+static PtrXcursorLibraryGetTheme ptrXcursorLibraryGetTheme = nullptr;
+static PtrXcursorLibrarySetTheme ptrXcursorLibrarySetTheme = nullptr;
+static PtrXcursorLibraryGetDefaultSize ptrXcursorLibraryGetDefaultSize = nullptr;
 #endif
 
 static xcb_font_t cursorFont = 0;
@@ -118,7 +118,7 @@ static const uint8_t mcur_fdiag_bits[] = {
 static const uint8_t *cursor_bits16[] = {
     cur_ver_bits, mcur_ver_bits, cur_hor_bits, mcur_hor_bits,
     cur_bdiag_bits, mcur_bdiag_bits, cur_fdiag_bits, mcur_fdiag_bits,
-    0, 0, cur_blank_bits, cur_blank_bits };
+    nullptr, nullptr, cur_blank_bits, cur_blank_bits };
 
 static const uint8_t vsplit_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -219,7 +219,7 @@ static const uint8_t busym_bits[] = {
 
 static const uint8_t * const cursor_bits32[] = {
     vsplit_bits, vsplitm_bits, hsplit_bits, hsplitm_bits,
-    0, 0, 0, 0, whatsthis_bits, whatsthism_bits, busy_bits, busym_bits
+    nullptr, nullptr, nullptr, nullptr, whatsthis_bits, whatsthism_bits, busy_bits, busym_bits
 };
 
 static const uint8_t forbidden_bits[] = {
@@ -452,19 +452,19 @@ xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
 
     if (cshape == Qt::BlankCursor) {
         xcb_pixmap_t cp = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(), cur_blank_bits, 16, 16,
-                                                             1, 0, 0, 0);
+                                                             1, 0, 0, nullptr);
         xcb_pixmap_t mp = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(), cur_blank_bits, 16, 16,
-                                                             1, 0, 0, 0);
+                                                             1, 0, 0, nullptr);
         cursor = xcb_generate_id(conn);
         xcb_create_cursor(conn, cursor, cp, mp, 0, 0, 0, 0xFFFF, 0xFFFF, 0xFFFF, 8, 8);
     } else if (cshape >= Qt::SizeVerCursor && cshape < Qt::SizeAllCursor) {
         int i = (cshape - Qt::SizeVerCursor) * 2;
         xcb_pixmap_t pm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                              const_cast<uint8_t*>(cursor_bits16[i]),
-                                                             16, 16, 1, 0, 0, 0);
+                                                             16, 16, 1, 0, 0, nullptr);
         xcb_pixmap_t pmm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                               const_cast<uint8_t*>(cursor_bits16[i + 1]),
-                                                              16, 16, 1, 0, 0, 0);
+                                                              16, 16, 1, 0, 0, nullptr);
         cursor = xcb_generate_id(conn);
         xcb_create_cursor(conn, cursor, pm, pmm, 0, 0, 0, 0xFFFF, 0xFFFF, 0xFFFF, 8, 8);
     } else if ((cshape >= Qt::SplitVCursor && cshape <= Qt::SplitHCursor)
@@ -472,10 +472,10 @@ xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
         int i = (cshape - Qt::SplitVCursor) * 2;
         xcb_pixmap_t pm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                              const_cast<uint8_t*>(cursor_bits32[i]),
-                                                             32, 32, 1, 0, 0, 0);
+                                                             32, 32, 1, 0, 0, nullptr);
         xcb_pixmap_t pmm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                               const_cast<uint8_t*>(cursor_bits32[i + 1]),
-                                                              32, 32, 1, 0, 0, 0);
+                                                              32, 32, 1, 0, 0, nullptr);
         int hs = (cshape == Qt::PointingHandCursor || cshape == Qt::WhatsThisCursor
                   || cshape == Qt::BusyCursor) ? 0 : 16;
         cursor = xcb_generate_id(conn);
@@ -484,20 +484,20 @@ xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
         int i = (cshape - Qt::ForbiddenCursor) * 2;
         xcb_pixmap_t pm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                              const_cast<uint8_t*>(cursor_bits20[i]),
-                                                             20, 20, 1, 0, 0, 0);
+                                                             20, 20, 1, 0, 0, nullptr);
         xcb_pixmap_t pmm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                               const_cast<uint8_t*>(cursor_bits20[i + 1]),
-                                                              20, 20, 1, 0, 0, 0);
+                                                              20, 20, 1, 0, 0, nullptr);
         cursor = xcb_generate_id(conn);
         xcb_create_cursor(conn, cursor, pm, pmm, 0, 0, 0, 0xFFFF, 0xFFFF, 0xFFFF, 10, 10);
     } else if (cshape == Qt::OpenHandCursor || cshape == Qt::ClosedHandCursor) {
         bool open = cshape == Qt::OpenHandCursor;
         xcb_pixmap_t pm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                              const_cast<uint8_t*>(open ? openhand_bits : closedhand_bits),
-                                                             16, 16, 1, 0, 0, 0);
+                                                             16, 16, 1, 0, 0, nullptr);
         xcb_pixmap_t pmm = xcb_create_pixmap_from_bitmap_data(conn, m_screen->root(),
                                                              const_cast<uint8_t*>(open ? openhandm_bits : closedhandm_bits),
-                                                             16, 16, 1, 0, 0, 0);
+                                                             16, 16, 1, 0, 0, nullptr);
         cursor = xcb_generate_id(conn);
         xcb_create_cursor(conn, cursor, pm, pmm, 0, 0, 0, 0xFFFF, 0xFFFF, 0xFFFF, 8, 8);
     } else if (cshape == Qt::DragCopyCursor || cshape == Qt::DragMoveCursor
@@ -660,14 +660,14 @@ void QXcbCursor::queryPointer(QXcbConnection *c, QXcbVirtualDesktop **virtualDes
 QPoint QXcbCursor::pos() const
 {
     QPoint p;
-    queryPointer(connection(), 0, &p);
+    queryPointer(connection(), nullptr, &p);
     return p;
 }
 
 void QXcbCursor::setPos(const QPoint &pos)
 {
     QXcbVirtualDesktop *virtualDesktop = nullptr;
-    queryPointer(connection(), &virtualDesktop, 0);
+    queryPointer(connection(), &virtualDesktop, nullptr);
     xcb_warp_pointer(xcb_connection(), XCB_NONE, virtualDesktop->root(), 0, 0, 0, 0, pos.x(), pos.y());
     xcb_flush(xcb_connection());
 }