1 files changed, 26 insertions, 52 deletions

diff --git a/src/animation/frontend/qanimationclip.cpp b/src/animation/frontend/qanimationclip.cpp
index 56fe3978c..c21d94b02 100644
--- a/src/animation/frontend/qanimationclip.cpp
+++ b/src/animation/frontend/qanimationclip.cpp
@@ -1,34 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
 ** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -36,37 +39,24 @@
 
 #include "qanimationclip.h"
 #include "qanimationclip_p.h"
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
 QAnimationClipPrivate::QAnimationClipPrivate()
-    : Qt3DCore::QNodePrivate()
-    , m_duration(0.0f)
+    : QAbstractAnimationClipPrivate()
+    , m_clipData()
 {
 }
 
-void QAnimationClipPrivate::setDuration(float duration)
-{
-    if (qFuzzyCompare(duration, m_duration))
-        return;
-
-    Q_Q(QAnimationClip);
-    bool wasBlocked = q->blockNotifications(true);
-    m_duration = duration;
-    emit q->durationChanged(duration);
-    q->blockNotifications(wasBlocked);
-}
-
 QAnimationClip::QAnimationClip(Qt3DCore::QNode *parent)
-    : Qt3DCore::QNode(*new QAnimationClipPrivate, parent)
+    : QAbstractAnimationClip(*new QAnimationClipPrivate, parent)
 {
 }
 
 QAnimationClip::QAnimationClip(QAnimationClipPrivate &dd, Qt3DCore::QNode *parent)
-    : Qt3DCore::QNode(dd, parent)
+    : QAbstractAnimationClip(dd, parent)
 {
 }
 
@@ -74,44 +64,28 @@ QAnimationClip::~QAnimationClip()
 {
 }
 
-QUrl QAnimationClip::source() const
+QAnimationClipData QAnimationClip::clipData() const
 {
     Q_D(const QAnimationClip);
-    return d->m_source;
+    return d->m_clipData;
 }
 
-float QAnimationClip::duration() const
-{
-    Q_D(const QAnimationClip);
-    return d->m_duration;
-}
-
-void QAnimationClip::setSource(QUrl source)
+void QAnimationClip::setClipData(const Qt3DAnimation::QAnimationClipData &clipData)
 {
     Q_D(QAnimationClip);
-    if (d->m_source == source)
+    if (d->m_clipData == clipData)
         return;
 
-    d->m_source = source;
-    emit sourceChanged(source);
-}
-
-void QAnimationClip::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
-    Q_D(QAnimationClip);
-    if (change->type() == Qt3DCore::PropertyUpdated) {
-        Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
-        if (e->propertyName() == QByteArrayLiteral("duration"))
-            d->setDuration(e->value().toFloat());
-    }
+    d->m_clipData = clipData;
+    emit clipDataChanged(clipData);
 }
 
 Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClip::createNodeCreationChange() const
 {
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnimationClipData>::create(this);
+    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnimationClipChangeData>::create(this);
     auto &data = creationChange->data;
     Q_D(const QAnimationClip);
-    data.source = d->m_source;
+    data.clipData = d->m_clipData;
     return creationChange;
 }