From 66e842dc6d052293c7ec97e0ba0cfb1d10c7590c Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Fri, 24 Mar 2017 13:42:02 +0000
Subject: Remove blend() virtual function from backend blend tree nodes

No longer needed as replaced by the more general doBlend() protected
virtual.

Change-Id: I5f11c068f8a379baa53a033e5ce8ce63ff64d5ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 .../additiveclipblend/tst_additiveclipblend.cpp    | 31 ----------------------
 .../animationutils/tst_animationutils.cpp          |  3 ---
 .../animation/clipblendnode/tst_clipblendnode.cpp  |  2 --
 .../tst_clipblendnodemanager.cpp                   |  2 --
 .../animation/lerpclipblend/tst_lerpclipblend.cpp  | 31 ----------------------
 5 files changed, 69 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index cd77425a0..9b2387ac1 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -50,8 +50,6 @@ public:
         , m_duration(duration)
     {}
 
-    float blend(float, float) const Q_DECL_FINAL { return 0.0f; }
-
     QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
@@ -211,35 +209,6 @@ private Q_SLOTS:
         }
     }
 
-    void checkBlend_data()
-    {
-        QTest::addColumn<float>("value1");
-        QTest::addColumn<float>("value2");
-        QTest::addColumn<float>("blendFactor");
-        QTest::addColumn<float>("result");
-
-        QTest::newRow("0_blending") << 8.0f << 5.0f << 0.0f << 8.0f;
-        QTest::newRow("0.5_blending") << 8.0f << 5.0f << 0.5f << 10.5f;
-        QTest::newRow("1_blending") << 8.0f << 5.0f << 1.0f << 13.0f;
-    }
-
-    void checkBlend()
-    {
-        // GIVEN
-        QFETCH(float, value1);
-        QFETCH(float, value2);
-        QFETCH(float, blendFactor);
-        QFETCH(float, result);
-        AdditiveClipBlend addBlend;
-
-        // WHEN
-        addBlend.setAdditiveFactor(blendFactor);
-        const float computed = addBlend.blend(value1, value2);
-
-        // THEN
-        QCOMPARE(computed, result);
-    }
-
     void checkDependencyIds()
     {
         // GIVEN
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index 0357d07d6..d5149b093 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -70,9 +70,6 @@ public:
         : ClipBlendNode(ClipBlendNode::LerpBlendType)
     {}
 
-    float blend(float, float ) const Q_DECL_FINAL { return 0.0f; }
-
-
     void setValueNodeIds(Qt3DCore::QNodeId value1Id,
                          Qt3DCore::QNodeId value2Id)
     {
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index b5953251b..3175931a9 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -54,8 +54,6 @@ public:
         , m_clipResults(clipResults)
     {}
 
-    float blend(float , float ) const Q_DECL_FINAL { return 0.0f; }
-
     QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
diff --git a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
index 4cf8fe5ce..95b8e2bfe 100644
--- a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
+++ b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
@@ -49,8 +49,6 @@ public:
         deadCount += 1;
     }
 
-    float blend(float , float ) const Q_DECL_FINAL { return 0.0f; }
-
     QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
diff --git a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
index 1ff17f9aa..a817028c3 100644
--- a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
+++ b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
@@ -50,8 +50,6 @@ public:
         , m_duration(duration)
     {}
 
-    float blend(float, float) const Q_DECL_FINAL { return 0.0f; }
-
     QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
@@ -181,35 +179,6 @@ private Q_SLOTS:
         }
     }
 
-    void checkBlend_data()
-    {
-        QTest::addColumn<float>("value1");
-        QTest::addColumn<float>("value2");
-        QTest::addColumn<float>("blendFactor");
-        QTest::addColumn<float>("result");
-
-        QTest::newRow("0_blending") << 8.0f << 5.0f << 0.0f << 8.0f;
-        QTest::newRow("0.5_blending") << 8.0f << 5.0f << 0.5f << 6.5f;
-        QTest::newRow("1_blending") << 8.0f << 5.0f << 1.0f << 5.0f;
-    }
-
-    void checkBlend()
-    {
-        // GIVEN
-        QFETCH(float, value1);
-        QFETCH(float, value2);
-        QFETCH(float, blendFactor);
-        QFETCH(float, result);
-        LerpClipBlend lerpBlend;
-
-        // WHEN
-        lerpBlend.setBlendFactor(blendFactor);
-        const float computed = lerpBlend.blend(value1, value2);
-
-        // THEN
-        QCOMPARE(computed, result);
-    }
-
     void checkDependencyIds()
     {
         // GIVEN
-- 
cgit v1.2.3