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/compositor/global | |
| 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/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandcompositorextension.h | 4 | ||||
| -rw-r--r-- | src/compositor/global/qwaylandquickextension.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index e9aa84609..fe8a7ff1e 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -89,7 +89,7 @@ protected: QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd); QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; }; template <typename T> @@ -104,7 +104,7 @@ public: : QWaylandCompositorExtension(container) { } - const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE + const struct wl_interface *extensionInterface() const override { return T::interface(); } diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h index 63c3d135e..d328f7bdb 100644 --- a/src/compositor/global/qwaylandquickextension.h +++ b/src/compositor/global/qwaylandquickextension.h @@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE { \ return QQmlListProperty<QObject>(this, m_objects); \ } \ - void classBegin() Q_DECL_OVERRIDE {} \ - void componentComplete() Q_DECL_OVERRIDE { initialize(); } \ + void classBegin() override {} \ + void componentComplete() override { initialize(); } \ private: \ QList<QObject *> m_objects; \ }; |