diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:04 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-26 15:45:33 +0000 |
| commit | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (patch) | |
| tree | 5a9f20aced2da3e4cc6055cae7156e121f4210d0 /tests/auto/compositor/compositor | |
| parent | 62c058f83add9f559f09cf74bc50f721ed75d76a (diff) | |
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>
Diffstat (limited to 'tests/auto/compositor/compositor')
| -rw-r--r-- | tests/auto/compositor/compositor/testcompositor.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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); |