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/client | |
| 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/client')
| -rw-r--r-- | tests/auto/client/client/mockinput.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/client/client/mocksurface.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/client/client/mockinput.cpp b/tests/auto/client/client/mockinput.cpp index 99acdd43a..6bc27f109 100644 --- a/tests/auto/client/client/mockinput.cpp +++ b/tests/auto/client/client/mockinput.cpp @@ -239,8 +239,8 @@ void Seat::seat_get_touch(Resource *resource, uint32_t id) Keyboard::Keyboard(Compositor *compositor) : wl_keyboard() , m_compositor(compositor) - , m_focusResource(Q_NULLPTR) - , m_focus(Q_NULLPTR) + , m_focusResource(nullptr) + , m_focus(nullptr) { } @@ -293,8 +293,8 @@ void Keyboard::keyboard_destroy_resource(wl_keyboard::Resource *resource) Pointer::Pointer(Compositor *compositor) : wl_pointer() , m_compositor(compositor) - , m_focusResource(Q_NULLPTR) - , m_focus(Q_NULLPTR) + , m_focusResource(nullptr) + , m_focus(nullptr) { } diff --git a/tests/auto/client/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp index 55712af11..61c9ac1b7 100644 --- a/tests/auto/client/client/mocksurface.cpp +++ b/tests/auto/client/client/mocksurface.cpp @@ -33,7 +33,7 @@ namespace Impl { Surface::Surface(wl_client *client, uint32_t id, int v, Compositor *compositor) : QtWaylandServer::wl_surface(client, id, v) - , m_buffer(Q_NULLPTR) + , m_buffer(nullptr) , m_compositor(compositor) , m_mockSurface(new MockSurface(this)) , m_mapped(false) |