From f72d63866d3f5820865fcd309b649dc9932518ee Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 12 Jan 2017 13:25:48 +0100 Subject: Replace all occurrences of Q_DECL_OVERRIDE with override Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 Reviewed-by: Paul Olav Tvete --- src/compositor/extensions/qwaylandxdgshellv5.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/compositor/extensions/qwaylandxdgshellv5.h') diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h index b465e92e6..269ea8934 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.h +++ b/src/compositor/extensions/qwaylandxdgshellv5.h @@ -68,7 +68,7 @@ public: QWaylandXdgShellV5(); QWaylandXdgShellV5(QWaylandCompositor *compositor); - void initialize() Q_DECL_OVERRIDE; + void initialize() override; QWaylandClient *popupClient() const; static const struct wl_interface *interface(); @@ -167,7 +167,7 @@ public: Q_INVOKABLE uint sendResizing(const QSize &maxSize); #ifdef QT_WAYLAND_COMPOSITOR_QUICK - QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE; + QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif Q_SIGNALS: @@ -238,7 +238,7 @@ public: Q_INVOKABLE void sendPopupDone(); #ifdef QT_WAYLAND_COMPOSITOR_QUICK - QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE; + QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif Q_SIGNALS: -- cgit v1.2.3