Remove AnimationUtils class

It was stateless, so make the static member functions free functions
and export them for auto tests. We're already in the
Qt3DAnimation::Animation namespace so this removes some visual clutter.

Change-Id: I4e1a72c47d5bd4afb807ce5f6dc80dc0ce4bb213
Reviewed-by: Mike Krus <mike.krus@kdab.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/animation/backend/evaluateclipanimatorjob.cpp b/src/animation/backend/evaluateclipanimatorjob.cpp
index a2e481371..cbad58638 100644
--- a/src/animation/backend/evaluateclipanimatorjob.cpp
+++ b/src/animation/backend/evaluateclipanimatorjob.cpp
@@ -66,9 +66,9 @@ void EvaluateClipAnimatorJob::run()
     AnimationClipLoader *clip = m_handler->animationClipLoaderManager()->lookupResource(clipAnimator->clipId());
     Q_ASSERT(clip);
     // Prepare for evaluation (convert global time to local time ....)
-    const AnimationUtils::AnimatorEvaluationData animatorEvaluationData = AnimationUtils::animatorEvaluationDataForAnimator(clipAnimator, globalTime);
-    const AnimationUtils::ClipPreEvaluationData preEvaluationDataForClip = AnimationUtils::evaluationDataForClip(clip, animatorEvaluationData);
-    const QVector<float> channelResults = AnimationUtils::evaluateClipAtLocalTime(clip, preEvaluationDataForClip.localTime);
+    const AnimatorEvaluationData animatorEvaluationData = animatorEvaluationDataForAnimator(clipAnimator, globalTime);
+    const ClipPreEvaluationData preEvaluationDataForClip = evaluationDataForClip(clip, animatorEvaluationData);
+    const QVector<float> channelResults = evaluateClipAtLocalTime(clip, preEvaluationDataForClip.localTime);
 
     if (preEvaluationDataForClip.isFinalFrame)
         clipAnimator->setRunning(false);
@@ -76,10 +76,10 @@ void EvaluateClipAnimatorJob::run()
     clipAnimator->setCurrentLoop(preEvaluationDataForClip.currentLoop);
 
     // Prepare property changes (if finalFrame it also prepares the change for the running property for the frontend)
-    const QVector<Qt3DCore::QSceneChangePtr> changes = AnimationUtils::preparePropertyChanges(clipAnimator->peerId(),
-                                                                                              clipAnimator->mappingData(),
-                                                                                              channelResults,
-                                                                                              preEvaluationDataForClip.isFinalFrame);
+    const QVector<Qt3DCore::QSceneChangePtr> changes = preparePropertyChanges(clipAnimator->peerId(),
+                                                                              clipAnimator->mappingData(),
+                                                                              channelResults,
+                                                                              preEvaluationDataForClip.isFinalFrame);
 
     // Send the property changes
     clipAnimator->sendPropertyChanges(changes);