Rename QAdditiveBlend -> QAdditiveClipBlend

Also rename backend type accordingly.

Task-number: QTBUG-58903
Change-Id: Ia1ad670937487dd84768e79d8c2be59ed3b6d0a5
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>

5 files changed, 50 insertions, 50 deletions

diff --git a/src/animation/frontend/frontend.pri b/src/animation/frontend/frontend.pri
index ce9bee2cf..01f74eedd 100644
--- a/src/animation/frontend/frontend.pri
+++ b/src/animation/frontend/frontend.pri
@@ -17,8 +17,6 @@ HEADERS += \
     $$PWD/qchannelmapping_p.h \
     $$PWD/qclipblendnodecreatedchange.h \
     $$PWD/qclipblendnodecreatedchange_p.h \
-    $$PWD/qadditiveblend.h \
-    $$PWD/qadditiveblend_p.h \
     $$PWD/qanimationcontroller.h \
     $$PWD/qanimationcontroller_p.h \
     $$PWD/qanimationgroup.h \
@@ -36,7 +34,9 @@ HEADERS += \
     $$PWD/qanimationcliploader.h \
     $$PWD/qanimationcliploader_p.h \
     $$PWD/qlerpclipblend.h \
-    $$PWD/qlerpclipblend_p.h
+    $$PWD/qlerpclipblend_p.h \
+    $$PWD/qadditiveclipblend.h \
+    $$PWD/qadditiveclipblend_p.h
 
 SOURCES += \
     $$PWD/qanimationaspect.cpp \
@@ -48,7 +48,6 @@ SOURCES += \
     $$PWD/qchannelmapper.cpp \
     $$PWD/qchannelmapping.cpp \
     $$PWD/qclipblendnodecreatedchange.cpp \
-    $$PWD/qadditiveblend.cpp \
     $$PWD/qanimationcontroller.cpp \
     $$PWD/qanimationgroup.cpp \
     $$PWD/qkeyframeanimation.cpp \
@@ -57,6 +56,7 @@ SOURCES += \
     $$PWD/qmorphtarget.cpp \
     $$PWD/qvertexblendanimation.cpp \
     $$PWD/qanimationcliploader.cpp \
-    $$PWD/qlerpclipblend.cpp
+    $$PWD/qlerpclipblend.cpp \
+    $$PWD/qadditiveclipblend.cpp
 
 INCLUDEPATH += $$PWD
diff --git a/src/animation/frontend/qadditiveblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index 977f36919..90cc92e55 100644
--- a/src/animation/frontend/qadditiveblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qadditiveblend.h"
-#include "qadditiveblend_p.h"
+#include "qadditiveclipblend.h"
+#include "qadditiveclipblend_p.h"
 #include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
@@ -44,8 +44,8 @@ namespace Qt3DAnimation {
 
 
 /*!
-    \qmltype AdditiveBlend
-    \instantiates Qt3DAnimation::QAdditiveBlend
+    \qmltype AdditiveClipBlend
+    \instantiates Qt3DAnimation::QAdditiveClipBlend
     \inqmlmodule Qt3D.Animation
 
     \brief Performs an addition of two animation clips based on a
@@ -53,7 +53,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    AdditiveBlend can be useful to create advanced animation effects based on
+    AdditiveClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character, additive
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -65,7 +65,7 @@ namespace Qt3DAnimation {
 */
 
 /*!
-    \class Qt3DAnimation::QAdditiveBlend
+    \class Qt3DAnimation::QAdditiveClipBlend
     \inmodule Qt3DAnimation
     \inherits Qt3DAnimation::QAbstractClipBlendNode
 
@@ -74,7 +74,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    QAdditiveBlend can be useful to create advanced animation effects based on
+    QAdditiveClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character, additive
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -85,56 +85,56 @@ namespace Qt3DAnimation {
     \sa QBlendedClipAnimator
 */
 
-QAdditiveBlendPrivate::QAdditiveBlendPrivate()
+QAdditiveClipBlendPrivate::QAdditiveClipBlendPrivate()
     : QAbstractClipBlendNodePrivate()
     , m_blendFactor(0.0f)
 {
 }
 
-QAdditiveBlend::QAdditiveBlend(Qt3DCore::QNode *parent)
-    : QAbstractClipBlendNode(*new QAdditiveBlendPrivate(), parent)
+QAdditiveClipBlend::QAdditiveClipBlend(Qt3DCore::QNode *parent)
+    : QAbstractClipBlendNode(*new QAdditiveClipBlendPrivate(), parent)
 {
 }
 
-QAdditiveBlend::QAdditiveBlend(QAdditiveBlendPrivate &dd, Qt3DCore::QNode *parent)
+QAdditiveClipBlend::QAdditiveClipBlend(QAdditiveClipBlendPrivate &dd, Qt3DCore::QNode *parent)
     : QAbstractClipBlendNode(dd, parent)
 {
 }
 
-QAdditiveBlend::~QAdditiveBlend()
+QAdditiveClipBlend::~QAdditiveClipBlend()
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAdditiveBlend::createNodeCreationChange() const
+Qt3DCore::QNodeCreatedChangeBasePtr QAdditiveClipBlend::createNodeCreationChange() const
 {
-    Q_D(const QAdditiveBlend);
-    auto creationChange = QClipBlendNodeCreatedChangePtr<QAdditiveBlendData>::create(this);
-    QAdditiveBlendData &data = creationChange->data;
+    Q_D(const QAdditiveClipBlend);
+    auto creationChange = QClipBlendNodeCreatedChangePtr<QAdditiveClipBlendData>::create(this);
+    QAdditiveClipBlendData &data = creationChange->data;
     data.blendFactor = d->m_blendFactor;
     return creationChange;
 }
 
 /*!
-    \qmlproperty real AdditiveBlend::blendFactor
+    \qmlproperty real AdditiveClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
 */
 /*!
-    \property QAdditiveBlend::blendFactor
+    \property QAdditiveClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
  */
-float QAdditiveBlend::blendFactor() const
+float QAdditiveClipBlend::blendFactor() const
 {
-    Q_D(const QAdditiveBlend);
+    Q_D(const QAdditiveClipBlend);
     return d->m_blendFactor;
 }
 
-void QAdditiveBlend::setBlendFactor(float blendFactor)
+void QAdditiveClipBlend::setBlendFactor(float blendFactor)
 {
-    Q_D(QAdditiveBlend);
+    Q_D(QAdditiveClipBlend);
     if (d->m_blendFactor == blendFactor)
         return;
 
@@ -143,7 +143,7 @@ void QAdditiveBlend::setBlendFactor(float blendFactor)
 }
 
 /*!
-    \qmlproperty list<AnimationClip> AdditiveBlend::clips
+    \qmlproperty list<AnimationClip> AdditiveClipBlend::clips
 
     Holds the list of AnimationClip nodes against which the blending is performed.
 
@@ -152,19 +152,19 @@ void QAdditiveBlend::setBlendFactor(float blendFactor)
 
 
 /*!
-    \fn void QAdditiveBlend::addClip(QAnimationClip *clip);
+    \fn void QAdditiveClipBlend::addClip(QAnimationClip *clip);
     Adds a \a clip to the blending node's clips list.
 
     \note Only the two first AnimationClip are used, subsequent ones are ignored
  */
 
 /*!
-    \fn void QAdditiveBlend::removeClip(QAnimationClip *clip);
+    \fn void QAdditiveClipBlend::removeClip(QAnimationClip *clip);
     Removes a \a clip from the blending node's clips list.
  */
 
 /*!
-    \fn QVector<QAnimationClip *> QAdditiveBlend::clips() const;
+    \fn QVector<QAnimationClip *> QAdditiveClipBlend::clips() const;
     Returns the list of QAnimationClip against which the blending is performed.
  */
 
diff --git a/src/animation/frontend/qadditiveblend.h b/src/animation/frontend/qadditiveclipblend.h
index 76075988b..eb1de9abb 100644
--- a/src/animation/frontend/qadditiveblend.h
+++ b/src/animation/frontend/qadditiveclipblend.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DANIMATION_QADDITIVEBLEND_H
-#define QT3DANIMATION_QADDITIVEBLEND_H
+#ifndef QT3DANIMATION_QADDITIVECLIPBLEND_H
+#define QT3DANIMATION_QADDITIVECLIPBLEND_H
 
 #include <Qt3DAnimation/qabstractclipblendnode.h>
 
@@ -43,15 +43,15 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAdditiveBlendPrivate;
+class QAdditiveClipBlendPrivate;
 
-class QT3DANIMATIONSHARED_EXPORT QAdditiveBlend : public QAbstractClipBlendNode
+class QT3DANIMATIONSHARED_EXPORT QAdditiveClipBlend : public QAbstractClipBlendNode
 {
     Q_OBJECT
     Q_PROPERTY(float blendFactor READ blendFactor WRITE setBlendFactor NOTIFY blendFactorChanged)
 public:
-    explicit QAdditiveBlend(Qt3DCore::QNode *parent = nullptr);
-    ~QAdditiveBlend();
+    explicit QAdditiveClipBlend(Qt3DCore::QNode *parent = nullptr);
+    ~QAdditiveClipBlend();
 
     float blendFactor() const;
 
@@ -62,10 +62,10 @@ Q_SIGNALS:
     void blendFactorChanged(float blendFactor);
 
 protected:
-    explicit QAdditiveBlend(QAdditiveBlendPrivate &dd, Qt3DCore::QNode *parent = nullptr);
+    explicit QAdditiveClipBlend(QAdditiveClipBlendPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
 private:
-    Q_DECLARE_PRIVATE(QAdditiveBlend)
+    Q_DECLARE_PRIVATE(QAdditiveClipBlend)
     Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
 };
 
@@ -73,4 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DANIMATION_QADDITIVEBLEND_H
+#endif // QT3DANIMATION_QADDITIVECLIPBLEND_H
diff --git a/src/animation/frontend/qadditiveblend_p.h b/src/animation/frontend/qadditiveclipblend_p.h
index e21872098..0506fc459 100644
--- a/src/animation/frontend/qadditiveblend_p.h
+++ b/src/animation/frontend/qadditiveclipblend_p.h
@@ -55,18 +55,18 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAdditiveBlend;
+class QAdditiveClipBlend;
 
-class QAdditiveBlendPrivate : public QAbstractClipBlendNodePrivate
+class QAdditiveClipBlendPrivate : public QAbstractClipBlendNodePrivate
 {
 public:
-    QAdditiveBlendPrivate();
+    QAdditiveClipBlendPrivate();
 
-    Q_DECLARE_PUBLIC(QAdditiveBlend)
+    Q_DECLARE_PUBLIC(QAdditiveClipBlend)
     float m_blendFactor;
 };
 
-struct QAdditiveBlendData
+struct QAdditiveClipBlendData
 {
     float blendFactor;
 };
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 2fac063c2..56dd012ed 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -45,12 +45,12 @@
 #include <Qt3DAnimation/qchannelmapping.h>
 #include <Qt3DAnimation/qchannelmapper.h>
 #include <Qt3DAnimation/qlerpclipblend.h>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
 #include <Qt3DAnimation/private/handler_p.h>
 #include <Qt3DAnimation/private/managers_p.h>
 #include <Qt3DAnimation/private/nodefunctor_p.h>
 #include <Qt3DAnimation/private/lerpclipblend_p.h>
-#include <Qt3DAnimation/private/additiveblend_p.h>
+#include <Qt3DAnimation/private/additiveclipblend_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -109,9 +109,9 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent)
     registerBackendType<QLerpClipBlend>(
                 QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::LerpClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                                   d->m_handler->clipBlendNodeManager()));
-    registerBackendType<QAdditiveBlend>(
-                QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
-                                                                                                                             d->m_handler->clipBlendNodeManager()));
+    registerBackendType<QAdditiveClipBlend>(
+                QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
+                                                                                                                                      d->m_handler->clipBlendNodeManager()));
 }
 
 /*! \internal */