From 064feb4fd76e6adbfcafe449d6ae7f52834c538a Mon Sep 17 00:00:00 2001
From: Kevin Funk <kfunk@kde.org>
Date: Sun, 24 Sep 2017 23:55:04 +0200
Subject: Replace Q_NULLPTR with nullptr

Change-Id: I9699a957430b8d3574ce29acb91b7ada9ea6209b
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/auto/compositor/compositor/testcompositor.cpp | 2 +-
 tests/auto/compositor/compositor/tst_compositor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/auto/compositor/compositor')

diff --git a/tests/auto/compositor/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
index 733bea5b3..f91d0d3f1 100644
--- a/tests/auto/compositor/compositor/testcompositor.cpp
+++ b/tests/auto/compositor/compositor/testcompositor.cpp
@@ -42,7 +42,7 @@ TestCompositor::TestCompositor(bool createInputDev)
 
 void TestCompositor::create()
 {
-    new QWaylandOutput(this, Q_NULLPTR);
+    new QWaylandOutput(this, nullptr);
     QWaylandCompositor::create();
 
     connect(this, &QWaylandCompositor::surfaceCreated, this, &TestCompositor::onSurfaceCreated);
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 52428eb4a..c54903dc0 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -198,7 +198,7 @@ void tst_WaylandCompositor::keyboardGrab()
     QTRY_COMPARE(grabKeyReleaseSpy.count(), 2);
 
     // Stop grabbing
-    seat->setKeyboardFocus(Q_NULLPTR);
+    seat->setKeyboardFocus(nullptr);
     seat->sendFullKeyEvent(&ke);
     seat->sendFullKeyEvent(&ke1);
     QTRY_COMPARE(grabKeyPressSpy.count(), 2);
-- 
cgit v1.2.3