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/render/io | |
| parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) | |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io')
| -rw-r--r-- | src/render/io/qsceneloader.h | 4 | ||||
| -rw-r--r-- | src/render/io/scene_p.h | 8 | ||||
| -rw-r--r-- | src/render/io/scenemanager_p.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 31ec47ac0..dbfed1a41 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -60,7 +60,7 @@ public: explicit QSceneLoader(Qt3DCore::QNode *parent = nullptr); ~QSceneLoader(); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; enum Status { None = 0, Loading, @@ -100,7 +100,7 @@ protected: private: Q_DECLARE_PRIVATE(QSceneLoader) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DRender diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h index 42e3121c9..fe483774f 100644 --- a/src/render/io/scene_p.h +++ b/src/render/io/scene_p.h @@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT Scene : public BackendNode public: Scene(); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; QUrl source() const; void setSceneSubtree(Qt3DCore::QEntity *subTree); void setSceneManager(SceneManager *manager); @@ -91,9 +91,9 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeMapper { public: explicit RenderSceneFunctor(AbstractRenderer *renderer, SceneManager *sceneManager); - 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: SceneManager *m_sceneManager; diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index d7dd8c752..fa2350226 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -72,7 +72,7 @@ class SceneDownloader : public Qt3DCore::QDownloadRequest { public: SceneDownloader(const QUrl &source, Qt3DCore::QNodeId sceneComponent, SceneManager* manager); - void onCompleted() Q_DECL_OVERRIDE; + void onCompleted() override; private: Qt3DCore::QNodeId m_sceneComponent; |