diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-20 20:57:27 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-25 10:42:42 +0000 |
commit | 43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch) | |
tree | 2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/core/aspects | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects')
-rw-r--r-- | src/core/aspects/qabstractaspect_p.h | 8 | ||||
-rw-r--r-- | src/core/aspects/qaspectthread_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index a6c47c494..6b0490d91 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -117,13 +117,13 @@ public: QServiceLocator *services() const; QAbstractAspectJobManager *jobManager() const; - QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<QAspectJobPtr> jobsToExecute(qint64 time) override; - QBackendNode *createBackendNode(const QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; + QBackendNode *createBackendNode(const QNodeCreatedChangeBasePtr &change) const override; void clearBackendNode(const QNodeDestroyedChangePtr &change) const; - void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) override; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) override; virtual void onEngineAboutToShutdown(); diff --git a/src/core/aspects/qaspectthread_p.h b/src/core/aspects/qaspectthread_p.h index 91fb363c5..8ae9ff86d 100644 --- a/src/core/aspects/qaspectthread_p.h +++ b/src/core/aspects/qaspectthread_p.h @@ -74,7 +74,7 @@ public: QAspectManager *aspectManager() const { return m_aspectManager; } protected: - void run() Q_DECL_OVERRIDE; + void run() override; private: QAspectManager *m_aspectManager; |