Use nullptr instead of 0 or NULL

Applied automatic fixes using clang-tidy's modernize-use-nullptr, and some
manual cleanup to prevent QFlag macros to be affected.

Change-Id: I88f94390185bc6e6f23693b68723cd5710815ae6
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

3 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 94198b457..0e086c7a6 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -295,9 +295,9 @@ void tst_WaylandClient::events()
     QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QCOMPARE(window.focusOutEventCount, 0);
-    compositor->setKeyboardFocus(QSharedPointer<MockSurface>(0));
+    compositor->setKeyboardFocus(QSharedPointer<MockSurface>(nullptr));
     QTRY_COMPARE(window.focusOutEventCount, 1);
-    QTRY_COMPARE(QGuiApplication::focusWindow(), static_cast<QWindow *>(0));
+    QTRY_COMPARE(QGuiApplication::focusWindow(), static_cast<QWindow *>(nullptr));
 
     compositor->setKeyboardFocus(surface);
     QTRY_COMPARE(window.focusInEventCount, 2);
@@ -375,7 +375,7 @@ class DndWindow : public QWindow
     Q_OBJECT
 
 public:
-    DndWindow(QWindow *parent = 0)
+    DndWindow(QWindow *parent = nullptr)
         : QWindow(parent)
         , dragStarted(false)
     {
diff --git a/tests/auto/compositor/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp
index bdc2b3b93..4720b0d9f 100644
--- a/tests/auto/compositor/compositor/mockclient.cpp
+++ b/tests/auto/compositor/compositor/mockclient.cpp
@@ -47,9 +47,9 @@ const struct wl_registry_listener MockClient::registryListener = {
 
 MockClient::MockClient()
     : display(wl_display_connect("wayland-qt-test-0"))
-    , compositor(0)
-    , registry(0)
-    , wlshell(0)
+    , compositor(nullptr)
+    , registry(nullptr)
+    , wlshell(nullptr)
     , xdgShell(nullptr)
     , iviApplication(nullptr)
     , refreshRate(-1)
@@ -223,7 +223,7 @@ ivi_surface *MockClient::createIviSurface(wl_surface *surface, uint iviId)
 }
 
 ShmBuffer::ShmBuffer(const QSize &size, wl_shm *shm)
-    : handle(0)
+    : handle(nullptr)
 {
     int stride = size.width() * 4;
     int alloc = stride * size.height();
@@ -242,7 +242,7 @@ ShmBuffer::ShmBuffer(const QSize &size, wl_shm *shm)
         return;
     }
 
-    void *data = mmap(0, alloc, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    void *data = mmap(nullptr, alloc, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
     unlink(filename);
 
     if (data == MAP_FAILED) {
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 96095a0d4..575ea6466 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -106,7 +106,7 @@ void tst_WaylandCompositor::singleClient()
     QWaylandClient *cb = compositor.surfaces.at(1)->client();
 
     QCOMPARE(ca, cb);
-    QVERIFY(ca != 0);
+    QVERIFY(ca != nullptr);
 
     QList<QWaylandSurface *> surfaces = compositor.surfacesForClient(ca);
     QCOMPARE(surfaces.size(), 2);
@@ -142,7 +142,7 @@ void tst_WaylandCompositor::multipleClients()
     QVERIFY(ca != cb);
     QVERIFY(ca != cc);
     QVERIFY(cb != cc);
-    QVERIFY(ca != 0);
+    QVERIFY(ca != nullptr);
 
     QCOMPARE(compositor.surfacesForClient(ca).size(), 1);
     QCOMPARE(compositor.surfacesForClient(ca).at(0), compositor.surfaces.at(0));