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 /src/plugins/shellintegration | |
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 'src/plugins/shellintegration')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/main.cpp b/src/plugins/shellintegration/ivi-shell/main.cpp index c7af9b157..70ffdb898 100644 --- a/src/plugins/shellintegration/ivi-shell/main.cpp +++ b/src/plugins/shellintegration/ivi-shell/main.cpp @@ -44,7 +44,7 @@ class QWaylandIviShellIntegrationPlugin : public QWaylandShellIntegrationPlugin Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "ivi-shell.json") public: - virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) Q_DECL_OVERRIDE; + virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) override; }; QWaylandShellIntegration *QWaylandIviShellIntegrationPlugin::create(const QString &key, const QStringList ¶mList) diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index ef1c7609a..5a0bfbdc0 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -54,7 +54,7 @@ public: QWaylandIviShellIntegration(); ~QWaylandIviShellIntegration(); bool initialize(QWaylandDisplay *display); - virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE; + virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; private: static void registryIvi(void *data, struct wl_registry *registry, diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index 9ac81ad61..f96eb3c10 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -60,7 +60,7 @@ public: private: void createExtendedSurface(QWaylandWindow *window); - virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE; + virtual void ivi_surface_configure(int32_t width, int32_t height) override; QWaylandWindow *m_window; QWaylandExtendedSurface *m_extendedWindow; |