Rename dependencyIds() to currentDependencyIds()

We need to add another function that returns all potential dependencies
rather than just those that are dependencies given the current state
(blend value). Make room for that by renaming this to a more descriptive
name.

Change-Id: I06cdc2e471007e3bd40cd7b687a4a2c21e4b2828
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index cade61ffb..b3b9d98da 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -50,7 +50,7 @@ public:
         , m_duration(duration)
     {}
 
-    QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
     }
@@ -219,7 +219,7 @@ private Q_SLOTS:
         // WHEN
         addBlend.setBaseClipId(baseClipId);
         addBlend.setAdditiveClipId(additiveClipId);
-        QVector<Qt3DCore::QNodeId> actualIds = addBlend.dependencyIds();
+        QVector<Qt3DCore::QNodeId> actualIds = addBlend.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 2);
@@ -229,7 +229,7 @@ private Q_SLOTS:
         // WHEN
         auto anotherAdditiveClipId = Qt3DCore::QNodeId::createId();
         addBlend.setAdditiveClipId(anotherAdditiveClipId);
-        actualIds = addBlend.dependencyIds();
+        actualIds = addBlend.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 2);
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index d5149b093..7de3d42be 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -77,7 +77,7 @@ public:
         m_value2Id = value2Id;
     }
 
-    QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>() << m_value1Id << m_value2Id;
     }
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index 8c1ba0b6c..c195b760c 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -54,7 +54,7 @@ public:
         , m_clipResults(clipResults)
     {}
 
-    QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() 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 95b8e2bfe..b909bb3ad 100644
--- a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
+++ b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
@@ -49,7 +49,7 @@ public:
         deadCount += 1;
     }
 
-    QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
     }
diff --git a/tests/auto/animation/clipblendvalue/tst_clipblendvalue.cpp b/tests/auto/animation/clipblendvalue/tst_clipblendvalue.cpp
index 9266161fc..eba5c600e 100644
--- a/tests/auto/animation/clipblendvalue/tst_clipblendvalue.cpp
+++ b/tests/auto/animation/clipblendvalue/tst_clipblendvalue.cpp
@@ -134,7 +134,7 @@ private Q_SLOTS:
 
         // WHEN
         clipNode.setClipId(clipId);
-        QVector<Qt3DCore::QNodeId> actualIds = clipNode.dependencyIds();
+        QVector<Qt3DCore::QNodeId> actualIds = clipNode.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 1);
@@ -143,7 +143,7 @@ private Q_SLOTS:
         // WHEN
         auto anotherClipId = Qt3DCore::QNodeId::createId();
         clipNode.setClipId(anotherClipId);
-        actualIds = clipNode.dependencyIds();
+        actualIds = clipNode.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 1);
diff --git a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
index 8ed08c563..f2d6263ae 100644
--- a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
+++ b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
@@ -50,7 +50,7 @@ public:
         , m_duration(duration)
     {}
 
-    QVector<Qt3DCore::QNodeId> dependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
     {
         return QVector<Qt3DCore::QNodeId>();
     }
@@ -189,7 +189,7 @@ private Q_SLOTS:
         // WHEN
         lerpBlend.setStartClipId(startClipId);
         lerpBlend.setEndClipId(endClipId);
-        QVector<Qt3DCore::QNodeId> actualIds = lerpBlend.dependencyIds();
+        QVector<Qt3DCore::QNodeId> actualIds = lerpBlend.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 2);
@@ -199,7 +199,7 @@ private Q_SLOTS:
         // WHEN
         auto anotherEndClipId = Qt3DCore::QNodeId::createId();
         lerpBlend.setEndClipId(anotherEndClipId);
-        actualIds = lerpBlend.dependencyIds();
+        actualIds = lerpBlend.currentDependencyIds();
 
         // THEN
         QCOMPARE(actualIds.size(), 2);