summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-03-24 13:49:01 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-03-26 07:29:42 +0000
commit2357c213b61fc4111701cf86b26ca44ab020058b (patch)
tree996e6a9bb229b7ec6f8639b2cafc0fb9ae87fe48 /tests
parent66e842dc6d052293c7ec97e0ba0cfb1d10c7590c (diff)
Rename QClipBlendNode::performBlend() to blend()
Now the old blend() virtual is gone we can give this function a nicer name. Change-Id: I74e427692f9667d52342d5c558bff3e7cf63c652 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp2
-rw-r--r--tests/auto/animation/clipblendnode/tst_clipblendnode.cpp2
-rw-r--r--tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index 9b2387ac1..cade61ffb 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -410,7 +410,7 @@ private Q_SLOTS:
QFETCH(ClipResults, expectedResults);
// WHEN
- blendNode->performBlend(animatorId);
+ blendNode->blend(animatorId);
// THEN
const ClipResults actualResults = blendNode->clipResults(animatorId);
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index 3175931a9..8c1ba0b6c 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -293,7 +293,7 @@ private Q_SLOTS:
auto animator = createBlendedClipAnimator(handler, globalStartTimeNS, loopCount);
// WHEN
- blendNode->performBlend(animator->peerId());
+ blendNode->blend(animator->peerId());
// THEN
const ClipResults actualResults = blendNode->clipResults(animator->peerId());
diff --git a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
index a817028c3..8ed08c563 100644
--- a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
+++ b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
@@ -382,7 +382,7 @@ private Q_SLOTS:
QFETCH(ClipResults, expectedResults);
// WHEN
- blendNode->performBlend(animatorId);
+ blendNode->blend(animatorId);
// THEN
const ClipResults actualResults = blendNode->clipResults(animatorId);