summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-04-12 14:20:28 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-04-13 07:21:16 +0000
commit16d21c369746d7159097ca3fa95fa5159a3a3e21 (patch)
treea7e783cfac965a7d52b739c61a244e9192b1df63
parentf33332a83ac3a2465a7f217d6cd40fcf81d3c179 (diff)
Add convenience ctor to QClipBlendValue
Also mark other ctor as explicit as a drive by. Change-Id: I34f20651f20462f988990657554e14aaefc7f50f Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/animation/frontend/qclipblendvalue.cpp7
-rw-r--r--src/animation/frontend/qclipblendvalue.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index db62209fc..d329f6722 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -57,6 +57,13 @@ QClipBlendValue::QClipBlendValue(Qt3DCore::QNode *parent)
{
}
+QClipBlendValue::QClipBlendValue(Qt3DAnimation::QAbstractAnimationClip *clip,
+ Qt3DCore::QNode *parent)
+ : QAbstractClipBlendNode(*new QClipBlendValuePrivate(), parent)
+{
+ setClip(clip);
+}
+
QClipBlendValue::QClipBlendValue(QClipBlendValuePrivate &dd, Qt3DCore::QNode *parent)
: QAbstractClipBlendNode(dd, parent)
{
diff --git a/src/animation/frontend/qclipblendvalue.h b/src/animation/frontend/qclipblendvalue.h
index a40f71a6c..b18bfb57b 100644
--- a/src/animation/frontend/qclipblendvalue.h
+++ b/src/animation/frontend/qclipblendvalue.h
@@ -55,7 +55,9 @@ class QT3DANIMATIONSHARED_EXPORT QClipBlendValue : public Qt3DAnimation::QAbstra
Q_PROPERTY(Qt3DAnimation::QAbstractAnimationClip *clip READ clip WRITE setClip NOTIFY clipChanged)
public:
- QClipBlendValue(Qt3DCore::QNode *parent = nullptr);
+ explicit QClipBlendValue(Qt3DCore::QNode *parent = nullptr);
+ explicit QClipBlendValue(Qt3DAnimation::QAbstractAnimationClip *clip,
+ Qt3DCore::QNode *parent = nullptr);
~QClipBlendValue();
Qt3DAnimation::QAbstractAnimationClip *clip() const;