diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-10-22 06:56:06 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-10-22 20:30:04 +0000 |
| commit | d521b994450f0a4febbd789ba66701ba24fdbe22 (patch) | |
| tree | 67ee16c8aef1ea5b41338362cac428a5c01a00ba /src/animation | |
| parent | 84766ed9098f10efc53e4e43a75eef38fce7fbf6 (diff) | |
Update jobs to remove post FF changes
Made the d_ptr private again.
Change-Id: Ia5ba23b03cd22290d5c922e9a1c657a67ff98977
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
4 files changed, 2 insertions, 7 deletions
diff --git a/src/animation/backend/abstractevaluateclipanimatorjob.cpp b/src/animation/backend/abstractevaluateclipanimatorjob.cpp index 5267d4526..e3c8e9e40 100644 --- a/src/animation/backend/abstractevaluateclipanimatorjob.cpp +++ b/src/animation/backend/abstractevaluateclipanimatorjob.cpp @@ -75,7 +75,7 @@ void AbstractEvaluateClipAnimatorJob::setPostFrameData(const AnimationRecord &re }), mainThreadCB.end()); // Should now only have callbacks to be called on main thread - Q_D(AbstractEvaluateClipAnimatorJob); + Q_DJOB(AbstractEvaluateClipAnimatorJob); d->m_record = record; d->m_callbacks = mainThreadCB; } diff --git a/src/animation/backend/abstractevaluateclipanimatorjob_p.h b/src/animation/backend/abstractevaluateclipanimatorjob_p.h index 2a8914faa..7027a8639 100644 --- a/src/animation/backend/abstractevaluateclipanimatorjob_p.h +++ b/src/animation/backend/abstractevaluateclipanimatorjob_p.h @@ -64,9 +64,6 @@ protected: AbstractEvaluateClipAnimatorJob(); void setPostFrameData(const AnimationRecord &record, const QVector<AnimationCallbackAndValue> &callbacks); - -private: - Q_DECLARE_PRIVATE(AbstractEvaluateClipAnimatorJob) }; } // Animation diff --git a/src/animation/backend/loadanimationclipjob.cpp b/src/animation/backend/loadanimationclipjob.cpp index 93d4c2d9d..86d7edf87 100644 --- a/src/animation/backend/loadanimationclipjob.cpp +++ b/src/animation/backend/loadanimationclipjob.cpp @@ -85,7 +85,7 @@ void LoadAnimationClipJob::clearDirtyAnimationClips() void LoadAnimationClipJob::run() { Q_ASSERT(m_handler); - Q_D(LoadAnimationClipJob); + Q_DJOB(LoadAnimationClipJob); d->m_updatedNodes.reserve(m_animationClipHandles.size()); AnimationClipLoaderManager *animationClipManager = m_handler->animationClipLoaderManager(); diff --git a/src/animation/backend/loadanimationclipjob_p.h b/src/animation/backend/loadanimationclipjob_p.h index 07d78d416..42cf27854 100644 --- a/src/animation/backend/loadanimationclipjob_p.h +++ b/src/animation/backend/loadanimationclipjob_p.h @@ -76,8 +76,6 @@ protected: void run() override; private: - Q_DECLARE_PRIVATE(LoadAnimationClipJob) - QVector<HAnimationClip> m_animationClipHandles; Handler *m_handler; }; |