summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/clipblendnode.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-16 17:38:52 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 20:41:28 +0000
commit7a3648ef4e884429dbe4bb60ab5a0a838bc5abfc (patch)
treefe617ede422a28854daeddff9f8d9a7874415750 /src/animation/backend/clipblendnode.cpp
parent2a485273c1da1f56412bfd19795ac5a29331b770 (diff)
Introduce QAbstractAnimationClip and rename QAnimationClip
Introduced an abstract base class for types of animation clip. Also renamed QAnimationClip to QAnimationClipLoader since it loads data from files. Also renamed corresponding backend type and fixed up unit tests accordingly. Task-number: QTBUG-58898 Change-Id: I01a96e108cbbcd12e01913693e96610598965018 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/backend/clipblendnode.cpp')
-rw-r--r--src/animation/backend/clipblendnode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/backend/clipblendnode.cpp b/src/animation/backend/clipblendnode.cpp
index a763f7f48..10220d9c9 100644
--- a/src/animation/backend/clipblendnode.cpp
+++ b/src/animation/backend/clipblendnode.cpp
@@ -36,7 +36,7 @@
#include "clipblendnode_p.h"
#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
-#include <Qt3DAnimation/qanimationclip.h>
+#include <Qt3DAnimation/qabstractanimationclip.h>
#include <Qt3DCore/qpropertynoderemovedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
@@ -80,7 +80,7 @@ void ClipBlendNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
Qt3DCore::QPropertyNodeAddedChangePtr change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
if (change->metaObject()->inherits(&QAbstractClipBlendNode::staticMetaObject))
addChildId(change->addedNodeId());
- else if (change->metaObject()->inherits(&QAnimationClip::staticMetaObject))
+ else if (change->metaObject()->inherits(&QAbstractAnimationClip::staticMetaObject))
m_clipIds.push_back(change->addedNodeId());
break;
}
@@ -89,7 +89,7 @@ void ClipBlendNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
Qt3DCore::QPropertyNodeRemovedChangePtr change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
if (change->metaObject()->inherits(&QAbstractClipBlendNode::staticMetaObject))
removeChildId(change->removedNodeId());
- else if (change->metaObject()->inherits(&QAnimationClip::staticMetaObject))
+ else if (change->metaObject()->inherits(&QAbstractAnimationClip::staticMetaObject))
m_clipIds.removeOne(change->removedNodeId());
break;
}