Remove old code from animation classes & update tests

Change-Id: Ic91a4f168172d6f34d858488e6fc170e8ed875f9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 1 insertions, 22 deletions

diff --git a/tests/auto/render/skeleton/tst_skeleton.cpp b/tests/auto/render/skeleton/tst_skeleton.cpp
index 6af055fb0..2786f27a8 100644
--- a/tests/auto/render/skeleton/tst_skeleton.cpp
+++ b/tests/auto/render/skeleton/tst_skeleton.cpp
@@ -34,9 +34,7 @@
 #include <Qt3DCore/qskeletonloader.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/private/qbackendnode_p.h>
-#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h>
 #include <qbackendnodetester.h>
 #include <testpostmanarbiter.h>
 #include <testrenderer.h>
@@ -49,24 +47,6 @@ Q_DECLARE_METATYPE(Qt3DRender::Render::JointInfo)
 Q_DECLARE_METATYPE(Qt3DRender::Render::SkeletonData)
 Q_DECLARE_METATYPE(Qt3DCore::Sqt)
 
-namespace {
-
-void linearizeTreeHelper(QJoint *joint, QVector<QJoint *> &joints)
-{
-    joints.push_back(joint);
-    for (const auto child : joint->childJoints())
-        linearizeTreeHelper(child, joints);
-}
-
-QVector<QJoint *> linearizeTree(QJoint *rootJoint)
-{
-    QVector<QJoint *> joints;
-    linearizeTreeHelper(rootJoint, joints);
-    return joints;
-}
-
-}
-
 class tst_Skeleton : public Qt3DCore::QBackendNodeTester
 {
     Q_OBJECT
@@ -155,7 +135,6 @@ private Q_SLOTS:
         backendSkeleton.setRenderer(&renderer);
         backendSkeleton.setSkeletonManager(nodeManagers.skeletonManager());
         backendSkeleton.setDataType(Skeleton::File);
-        Qt3DCore::QPropertyUpdatedChangePtr updateChange;
 
         // Initialize to ensure skeleton manager is set
         QSkeletonLoader skeleton;
@@ -225,7 +204,7 @@ private Q_SLOTS:
         QTest::addColumn<SkeletonData>("skeletonData");
         QTest::addColumn<QJoint *>("expectedRootJoint");
 
-        QTest::newRow("empty") << SkeletonData() << (QJoint*)nullptr;
+        QTest::newRow("empty") << SkeletonData() << static_cast<QJoint*>(nullptr);
 
         SkeletonData skeletonData;
         JointInfo rootJointInfo;