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/animation/frontend | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/frontend')
-rw-r--r-- | src/animation/frontend/qabstractanimationclip.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qadditiveclipblend.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationaspect.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationclip.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcliploader.h | 4 | ||||
-rw-r--r-- | src/animation/frontend/qblendedclipanimator.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qchannelmapper.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qchannelmapping.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qclipanimator.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qclipblendvalue.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qclock.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qlerpclipblend.h | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h index 377725fa1..6190550e6 100644 --- a/src/animation/frontend/qabstractanimationclip.h +++ b/src/animation/frontend/qabstractanimationclip.h @@ -62,7 +62,7 @@ Q_SIGNALS: protected: QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAbstractAnimationClip) diff --git a/src/animation/frontend/qadditiveclipblend.h b/src/animation/frontend/qadditiveclipblend.h index 11731c702..0771bd032 100644 --- a/src/animation/frontend/qadditiveclipblend.h +++ b/src/animation/frontend/qadditiveclipblend.h @@ -74,7 +74,7 @@ protected: private: Q_DECLARE_PRIVATE(QAdditiveClipBlend) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // Qt3DAnimation diff --git a/src/animation/frontend/qanimationaspect.h b/src/animation/frontend/qanimationaspect.h index 93f3318d9..bd3745fec 100644 --- a/src/animation/frontend/qanimationaspect.h +++ b/src/animation/frontend/qanimationaspect.h @@ -57,7 +57,7 @@ public: ~QAnimationAspect(); private: - QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override; Q_DECLARE_PRIVATE(QAnimationAspect) explicit QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent); diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h index 6e606c598..4781641e0 100644 --- a/src/animation/frontend/qanimationclip.h +++ b/src/animation/frontend/qanimationclip.h @@ -72,7 +72,7 @@ protected: private: Q_DECLARE_PRIVATE(QAnimationClip) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h index 20f0f14da..2106d0f31 100644 --- a/src/animation/frontend/qanimationcliploader.h +++ b/src/animation/frontend/qanimationcliploader.h @@ -78,11 +78,11 @@ Q_SIGNALS: protected: explicit QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAnimationClipLoader) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qblendedclipanimator.h b/src/animation/frontend/qblendedclipanimator.h index c227a05cc..064a83dc7 100644 --- a/src/animation/frontend/qblendedclipanimator.h +++ b/src/animation/frontend/qblendedclipanimator.h @@ -72,7 +72,7 @@ protected: private: Q_DECLARE_PRIVATE(QBlendedClipAnimator) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h index fce59f6ab..a14fbcdd4 100644 --- a/src/animation/frontend/qchannelmapper.h +++ b/src/animation/frontend/qchannelmapper.h @@ -64,7 +64,7 @@ protected: private: Q_DECLARE_PRIVATE(QChannelMapper) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qchannelmapping.h b/src/animation/frontend/qchannelmapping.h index 08bda13aa..c321e8b36 100644 --- a/src/animation/frontend/qchannelmapping.h +++ b/src/animation/frontend/qchannelmapping.h @@ -80,7 +80,7 @@ protected: private: Q_DECLARE_PRIVATE(QChannelMapping) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qclipanimator.h b/src/animation/frontend/qclipanimator.h index 7b06f9878..dee544831 100644 --- a/src/animation/frontend/qclipanimator.h +++ b/src/animation/frontend/qclipanimator.h @@ -74,7 +74,7 @@ protected: private: Q_DECLARE_PRIVATE(QClipAnimator) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qclipblendvalue.h b/src/animation/frontend/qclipblendvalue.h index b18bfb57b..65ac0eb6c 100644 --- a/src/animation/frontend/qclipblendvalue.h +++ b/src/animation/frontend/qclipblendvalue.h @@ -73,7 +73,7 @@ protected: private: Q_DECLARE_PRIVATE(QClipBlendValue) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qclock.h b/src/animation/frontend/qclock.h index d2bf91103..ea0f294d2 100644 --- a/src/animation/frontend/qclock.h +++ b/src/animation/frontend/qclock.h @@ -66,7 +66,7 @@ protected: private: Q_DECLARE_PRIVATE(QClock) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DAnimation diff --git a/src/animation/frontend/qlerpclipblend.h b/src/animation/frontend/qlerpclipblend.h index f6707a5a5..225b52e53 100644 --- a/src/animation/frontend/qlerpclipblend.h +++ b/src/animation/frontend/qlerpclipblend.h @@ -75,7 +75,7 @@ protected: private: Q_DECLARE_PRIVATE(QLerpClipBlend) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // Qt3DAnimation |