diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-20 14:00:19 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-28 14:25:27 +0000 |
commit | ced351295b67f0c8ef72802a11d2a0f2381b46e8 (patch) | |
tree | bdd563c8d0f731f3cb949494ee07e87a998aa7e5 /tests | |
parent | 1fab644753443a525475740fc23172dedaa70d0e (diff) |
Use override when applicable
Applied automatic fixes using clang-tidy's modernize-use-override.
This adds the "override" keyword where it's possible and also removes the
"virtual" keyword when redundant.
Change-Id: I899950e5cf8782785d30a245a9c69c1720905d50
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/client/client/tst_client.cpp | 14 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockclient.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockpointer.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockseat.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testcompositor.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testseat.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 4eb85818c..1e0fc5675 100644 --- a/tests/auto/client/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp @@ -54,35 +54,35 @@ public: create(); } - void focusInEvent(QFocusEvent *) + void focusInEvent(QFocusEvent *) override { ++focusInEventCount; } - void focusOutEvent(QFocusEvent *) + void focusOutEvent(QFocusEvent *) override { ++focusOutEventCount; } - void keyPressEvent(QKeyEvent *event) + void keyPressEvent(QKeyEvent *event) override { ++keyPressEventCount; keyCode = event->nativeScanCode(); } - void keyReleaseEvent(QKeyEvent *event) + void keyReleaseEvent(QKeyEvent *event) override { ++keyReleaseEventCount; keyCode = event->nativeScanCode(); } - void mousePressEvent(QMouseEvent *event) + void mousePressEvent(QMouseEvent *event) override { ++mousePressEventCount; mousePressPos = event->pos(); } - void mouseReleaseEvent(QMouseEvent *) + void mouseReleaseEvent(QMouseEvent *) override { ++mouseReleaseEventCount; } @@ -401,7 +401,7 @@ public: cursorImage.fill(Qt::blue); m_dragIcon = QPixmap::fromImage(cursorImage); } - ~DndWindow(){} + ~DndWindow() override{} QPoint frameOffset() const { return QPoint(frameMargins().left(), frameMargins().top()); } bool dragStarted = false; diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 820f2df39..6d5bf31df 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -55,7 +55,7 @@ class MockClient : public QObject public: MockClient(); - ~MockClient(); + ~MockClient() override; wl_surface *createSurface(); wl_shell_surface *createShellSurface(wl_surface *surface); diff --git a/tests/auto/compositor/compositor/mockpointer.h b/tests/auto/compositor/compositor/mockpointer.h index 353861415..2054040fd 100644 --- a/tests/auto/compositor/compositor/mockpointer.h +++ b/tests/auto/compositor/compositor/mockpointer.h @@ -38,7 +38,7 @@ class MockPointer : public QObject public: MockPointer(wl_seat *seat); - ~MockPointer(); + ~MockPointer() override; wl_pointer *m_pointer = nullptr; wl_surface *m_enteredSurface = nullptr; diff --git a/tests/auto/compositor/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h index 2cdd1df55..73d289281 100644 --- a/tests/auto/compositor/compositor/mockseat.h +++ b/tests/auto/compositor/compositor/mockseat.h @@ -39,7 +39,7 @@ class MockSeat : public QObject public: MockSeat(wl_seat *seat); - ~MockSeat(); + ~MockSeat() override; MockPointer *pointer() const { return m_pointer.data(); } wl_seat *m_seat = nullptr; diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h index d80fe3588..7829f1a65 100644 --- a/tests/auto/compositor/compositor/testcompositor.h +++ b/tests/auto/compositor/compositor/testcompositor.h @@ -35,7 +35,7 @@ class TestCompositor : public QWaylandCompositor Q_OBJECT public: TestCompositor(bool createInputDev = false); - void create(); + void create() override; void flushClients(); public slots: diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index b9f04a2c2..f4449f144 100644 --- a/tests/auto/compositor/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h @@ -40,7 +40,7 @@ class TestSeat : public QWaylandSeat public: TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps); - ~TestSeat(); + ~TestSeat() override; bool isOwner(QInputEvent *inputEvent) const override; |