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/logic | |
| parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) | |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/logic')
| -rw-r--r-- | src/logic/callbackjob_p.h | 2 | ||||
| -rw-r--r-- | src/logic/handler_p.h | 8 | ||||
| -rw-r--r-- | src/logic/qlogicaspect.h | 6 | ||||
| -rw-r--r-- | src/logic/qlogicaspect_p.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/logic/callbackjob_p.h b/src/logic/callbackjob_p.h index 3aed3447f..2dabc77f7 100644 --- a/src/logic/callbackjob_p.h +++ b/src/logic/callbackjob_p.h @@ -66,7 +66,7 @@ public: CallbackJob(); void setManager(Manager *manager); - void run() Q_DECL_OVERRIDE; + void run() override; private: Manager *m_logicManager; diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h index 7b1fad788..beae32f96 100644 --- a/src/logic/handler_p.h +++ b/src/logic/handler_p.h @@ -71,7 +71,7 @@ public: Manager *logicManager() const { return m_logicManager; } protected: - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; @@ -85,9 +85,9 @@ class HandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit HandlerFunctor(Manager *handler); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; - void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override; + void destroy(Qt3DCore::QNodeId id) const override; private: Manager *m_manager; diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h index e73e2eb2d..958c0ce82 100644 --- a/src/logic/qlogicaspect.h +++ b/src/logic/qlogicaspect.h @@ -57,9 +57,9 @@ public: ~QLogicAspect(); private: - QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void onRegistered() Q_DECL_OVERRIDE; - void onEngineStartup() Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override; + void onRegistered() override; + void onEngineStartup() override; Q_DECLARE_PRIVATE(QLogicAspect) explicit QLogicAspect(QLogicAspectPrivate &dd, QObject *parent); diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h index ee7131a3e..2a6a7259a 100644 --- a/src/logic/qlogicaspect_p.h +++ b/src/logic/qlogicaspect_p.h @@ -71,7 +71,7 @@ class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate Q_DECLARE_PUBLIC(QLogicAspect) - void onEngineAboutToShutdown() Q_DECL_OVERRIDE; + void onEngineAboutToShutdown() override; void registerBackendTypes(); qint64 m_time; |