diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-06-29 11:57:36 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-07-02 13:03:44 +0200 |
commit | b70f7af20550f55e9546ff5a2192f53d6ccb62cb (patch) | |
tree | c16156ad6b57a24e72dbcf491e680f95e73bce14 /src/animation | |
parent | abb02d0aae5a114b77ad2edc07568fb0bcf4c6e5 (diff) |
QAspectJob: switch to using std::vector
Change-Id: I1314bd4d37ad17442ebd6287f571e41bc5d25490
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/backend/handler.cpp | 4 | ||||
-rw-r--r-- | src/animation/backend/handler_p.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationaspect.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/animation/backend/handler.cpp b/src/animation/backend/handler.cpp index f87e0a2a2..939e58263 100644 --- a/src/animation/backend/handler.cpp +++ b/src/animation/backend/handler.cpp @@ -173,14 +173,14 @@ void Handler::cleanupHandleList(QVector<HBlendedClipAnimator> *animators) } } -QVector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time) +std::vector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time) { // Store the simulation time so we can mark the start time of // animators which will allow us to calculate the local time of // animation clips. m_simulationTime = time; - QVector<Qt3DCore::QAspectJobPtr> jobs; + std::vector<Qt3DCore::QAspectJobPtr> jobs; QMutexLocker lock(&m_mutex); diff --git a/src/animation/backend/handler_p.h b/src/animation/backend/handler_p.h index e65bc0797..cad1c568d 100644 --- a/src/animation/backend/handler_p.h +++ b/src/animation/backend/handler_p.h @@ -119,7 +119,7 @@ public: ClipBlendNodeManager *clipBlendNodeManager() const Q_DECL_NOTHROW { return m_clipBlendNodeManager.data(); } SkeletonManager *skeletonManager() const Q_DECL_NOTHROW { return m_skeletonManager.data(); } - QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time); + std::vector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time); void cleanupHandleList(QVector<HAnimationClip> *clips); void cleanupHandleList(QVector<HClipAnimator> *animators); diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index a25eb533e..ce059f996 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -138,7 +138,7 @@ QAnimationAspect::~QAnimationAspect() /*! \internal */ -QVector<QAspectJobPtr> QAnimationAspect::jobsToExecute(qint64 time) +std::vector<QAspectJobPtr> QAnimationAspect::jobsToExecute(qint64 time) { Q_D(QAnimationAspect); Q_ASSERT(d->m_handler); diff --git a/src/animation/frontend/qanimationaspect.h b/src/animation/frontend/qanimationaspect.h index 280c643e6..5bf2e01ab 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) override; + std::vector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override; Q_DECLARE_PRIVATE(QAnimationAspect) explicit QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent); |