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 /src/compositor/extensions | |
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 'src/compositor/extensions')
8 files changed, 9 insertions, 9 deletions
diff --git a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h index a28bd6de6..8257479f8 100644 --- a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h +++ b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h @@ -64,7 +64,7 @@ class IviSurfaceIntegration : public QWaylandQuickShellIntegration Q_OBJECT public: IviSurfaceIntegration(QWaylandQuickShellSurfaceItem *item); - ~IviSurfaceIntegration(); + ~IviSurfaceIntegration() override; private Q_SLOTS: void handleIviSurfaceDestroyed(); diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h index 152d5c53e..e2c823651 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h @@ -56,7 +56,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItem : public QWaylan Q_PROPERTY(QQuickItem *moveItem READ moveItem WRITE setMoveItem NOTIFY moveItemChanged) public: QWaylandQuickShellSurfaceItem(QQuickItem *parent = nullptr); - ~QWaylandQuickShellSurfaceItem(); + ~QWaylandQuickShellSurfaceItem() override; QWaylandShellSurface *shellSurface() const; void setShellSurface(QWaylandShellSurface *shellSurface); diff --git a/src/compositor/extensions/qwaylandtextinput.h b/src/compositor/extensions/qwaylandtextinput.h index 21c1bd917..9f252837d 100644 --- a/src/compositor/extensions/qwaylandtextinput.h +++ b/src/compositor/extensions/qwaylandtextinput.h @@ -58,7 +58,7 @@ class QWaylandTextInput : public QWaylandCompositorExtensionTemplate<QWaylandTex Q_DECLARE_PRIVATE(QWaylandTextInput) public: explicit QWaylandTextInput(QWaylandObject *container, QWaylandCompositor *compositor); - ~QWaylandTextInput(); + ~QWaylandTextInput() override; void sendInputMethodEvent(QInputMethodEvent *event); void sendKeyEvent(QKeyEvent *event); diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h index d1efeed0b..4923b4fb0 100644 --- a/src/compositor/extensions/qwaylandwlshell.h +++ b/src/compositor/extensions/qwaylandwlshell.h @@ -116,7 +116,7 @@ public: QWaylandWlShellSurface(); QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &resource); - virtual ~QWaylandWlShellSurface(); + ~QWaylandWlShellSurface() override; Q_INVOKABLE void initialize(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &resource); diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h index 4e91eabc9..e8d568fce 100644 --- a/src/compositor/extensions/qwaylandwlshell_p.h +++ b/src/compositor/extensions/qwaylandwlshell_p.h @@ -91,7 +91,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurfacePrivate Q_DECLARE_PUBLIC(QWaylandWlShellSurface) public: QWaylandWlShellSurfacePrivate(); - ~QWaylandWlShellSurfacePrivate(); + ~QWaylandWlShellSurfacePrivate() override; static QWaylandWlShellSurfacePrivate *get(QWaylandWlShellSurface *surface) { return surface->d_func(); } diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h index 19ee07b80..68c936b1e 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration_p.h +++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h @@ -64,7 +64,7 @@ class WlShellIntegration : public QWaylandQuickShellIntegration Q_OBJECT public: WlShellIntegration(QWaylandQuickShellSurfaceItem *item); - ~WlShellIntegration(); + ~WlShellIntegration() override; bool mouseMoveEvent(QMouseEvent *event) override; bool mouseReleaseEvent(QMouseEvent *event) override; diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h index 271a5b257..b2c16c6d9 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h @@ -63,7 +63,7 @@ class XdgShellV5Integration : public QWaylandQuickShellIntegration Q_OBJECT public: XdgShellV5Integration(QWaylandQuickShellSurfaceItem *item); - ~XdgShellV5Integration(); + ~XdgShellV5Integration() override; bool mouseMoveEvent(QMouseEvent *event) override; bool mouseReleaseEvent(QMouseEvent *event) override; @@ -115,7 +115,7 @@ class XdgPopupV5Integration : public QWaylandQuickShellIntegration Q_OBJECT public: XdgPopupV5Integration(QWaylandQuickShellSurfaceItem *item); - ~XdgPopupV5Integration(); + ~XdgPopupV5Integration() override; private Q_SLOTS: void handlePopupDestroyed(); diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 1a22e0808..301616926 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -78,7 +78,7 @@ public: Q_DECLARE_FLAGS(BehaviorFlags, BehaviorFlag) TouchExtensionGlobal(QWaylandCompositor *compositor); - ~TouchExtensionGlobal(); + ~TouchExtensionGlobal() override; bool postTouchEvent(QTouchEvent *event, QWaylandSurface *surface); |