summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/compositor/tst_compositor.cpp
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-20 13:35:03 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-20 14:15:08 +0000
commit1ebb4e0d64bf27dfc6c38b9770ae744fad87fb82 (patch)
treef92eb1649a32785f93fe6af8df82c8d0611b21e0 /tests/auto/compositor/compositor/tst_compositor.cpp
parentabfdf34f510b64439c85cc54f47b41c4ce3f9c61 (diff)
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>
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 96095a0d..575ea646 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));