summaryrefslogtreecommitdiffstats
path: root/tests/auto/animation/clipblendnode
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-22 10:21:05 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 20:41:36 +0000
commitde28bb3aafdfc2dec80aa65cd426bf2b74718358 (patch)
tree6eb6c5f3724ca876e50cc69b5bcce141ebe0191c /tests/auto/animation/clipblendnode
parentd9d2f46e402a29c9e52279ec257f76320e699c9b (diff)
Rename QLerpBlend to QLerpClipBlend
Also rename backend class accordingly. Task-number: QTBUG-58904 Change-Id: I3a8d3898507e5055c2727e4bb1b19b06fdba988b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'tests/auto/animation/clipblendnode')
-rw-r--r--tests/auto/animation/clipblendnode/tst_clipblendnode.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index d8163f13f..3e0ebf4f6 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -28,7 +28,7 @@
#include <QtTest/QTest>
-#include <Qt3DAnimation/qlerpblend.h>
+#include <Qt3DAnimation/qlerpclipblend.h>
#include <Qt3DAnimation/qanimationcliploader.h>
#include <Qt3DAnimation/private/qabstractclipblendnode_p.h>
#include <Qt3DAnimation/private/clipblendnode_p.h>
@@ -77,7 +77,7 @@ private Q_SLOTS:
void checkInitializeFromPeer()
{
// GIVEN
- Qt3DAnimation::QLerpBlend clipBlendNode;
+ Qt3DAnimation::QLerpClipBlend clipBlendNode;
Qt3DAnimation::QAnimationClipLoader clip;
clipBlendNode.addClip(&clip);
@@ -153,7 +153,7 @@ private Q_SLOTS:
}
{
// WHEN
- Qt3DAnimation::QLerpBlend clipBlendChild;
+ Qt3DAnimation::QLerpClipBlend clipBlendChild;
// Will be destroyed when manager is destroyed
TestClipBlendNode *backenChildClipBlendNode = new TestClipBlendNode();
backendClipBlendNode.setClipBlendNodeManager(&manager);
@@ -182,8 +182,8 @@ private Q_SLOTS:
// GIVEN
TestClipBlendNode *backendClipBlendNode = new TestClipBlendNode();
TestClipBlendNode *backendChildClipBlendNode = new TestClipBlendNode();
- Qt3DAnimation::QLerpBlend clipBlendParent;
- Qt3DAnimation::QLerpBlend childClipBlend(&clipBlendParent);
+ Qt3DAnimation::QLerpClipBlend clipBlendParent;
+ Qt3DAnimation::QLerpClipBlend childClipBlend(&clipBlendParent);
Qt3DAnimation::Animation::ClipBlendNodeManager manager;
backendClipBlendNode->setClipBlendNodeManager(&manager);
backendChildClipBlendNode->setClipBlendNodeManager(&manager);