diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /tests/auto/compositor | |
parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests/auto/compositor')
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h index 8eeb7ade6..d80fe3588 100644 --- a/tests/auto/compositor/compositor/testcompositor.h +++ b/tests/auto/compositor/compositor/testcompositor.h @@ -43,8 +43,8 @@ public slots: void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface); protected: - QWaylandSeat *createSeat() Q_DECL_OVERRIDE; - QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE; + QWaylandSeat *createSeat() override; + QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) override; public: QList<QWaylandSurface *> surfaces; diff --git a/tests/auto/compositor/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h index 0ef595987..7f0f2c86c 100644 --- a/tests/auto/compositor/compositor/testkeyboardgrabber.h +++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h @@ -34,10 +34,10 @@ class TestKeyboardGrabber : public QWaylandKeyboard public: TestKeyboardGrabber(QWaylandSeat *seat); - void setFocus(QWaylandSurface *surface) Q_DECL_OVERRIDE; - void sendKeyModifiers(QWaylandClient *client, uint32_t serial) Q_DECL_OVERRIDE; - void sendKeyPressEvent(uint code) Q_DECL_OVERRIDE; - void sendKeyReleaseEvent(uint code) Q_DECL_OVERRIDE; + void setFocus(QWaylandSurface *surface) override; + void sendKeyModifiers(QWaylandClient *client, uint32_t serial) override; + void sendKeyPressEvent(uint code) override; + void sendKeyReleaseEvent(uint code) override; signals: void focusedCalled(); diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index 7fa7030fa..b9f04a2c2 100644 --- a/tests/auto/compositor/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h @@ -42,7 +42,7 @@ public: TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps); ~TestSeat(); - bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE; + bool isOwner(QInputEvent *inputEvent) const override; QList<QMouseEvent *> createMouseEvents(int count); diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 393b9f5b7..b3ceb9e5c 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -315,7 +315,7 @@ void tst_WaylandCompositor::frameCallback() class BufferView : public QWaylandView { public: - void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) Q_DECL_OVERRIDE + void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) override { Q_UNUSED(damage); bufferRef = ref; @@ -529,7 +529,7 @@ void tst_WaylandCompositor::sendsXdgConfigure() { public: MockXdgSurface(::xdg_surface *xdgSurface) : QtWayland::xdg_surface(xdgSurface) {} - void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) Q_DECL_OVERRIDE + void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) override { configureSize = QSize(width, height); configureSerial = serial; @@ -729,7 +729,7 @@ void tst_WaylandCompositor::sendsIviConfigure() { public: MockIviSurface(::ivi_surface *iviSurface) : QtWayland::ivi_surface(iviSurface) {} - void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE + void ivi_surface_configure(int32_t width, int32_t height) override { configureSize = QSize(width, height); } |