diff options
Diffstat (limited to 'src/animation/frontend/qanimationclip.h')
| -rw-r--r-- | src/animation/frontend/qanimationclip.h | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h index 55b1910fa..6e606c598 100644 --- a/src/animation/frontend/qanimationclip.h +++ b/src/animation/frontend/qanimationclip.h @@ -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$ ** @@ -37,9 +40,9 @@ #ifndef QT3DANIMATION_QANIMATIONCLIP_H #define QT3DANIMATION_QANIMATIONCLIP_H +#include <Qt3DAnimation/qabstractanimationclip.h> #include <Qt3DAnimation/qt3danimation_global.h> -#include <Qt3DCore/qnode.h> -#include <QtCore/qurl.h> +#include <Qt3DAnimation/qanimationclipdata.h> QT_BEGIN_NAMESPACE @@ -47,29 +50,25 @@ namespace Qt3DAnimation { class QAnimationClipPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationClip : public Qt3DCore::QNode +class QT3DANIMATIONSHARED_EXPORT QAnimationClip : public QAbstractAnimationClip { Q_OBJECT - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(float duration READ duration NOTIFY durationChanged) + Q_PROPERTY(Qt3DAnimation::QAnimationClipData clipData READ clipData WRITE setClipData NOTIFY clipDataChanged) public: explicit QAnimationClip(Qt3DCore::QNode *parent = nullptr); ~QAnimationClip(); - QUrl source() const; - float duration() const; + Qt3DAnimation::QAnimationClipData clipData() const; public Q_SLOTS: - void setSource(QUrl source); + void setClipData(const Qt3DAnimation::QAnimationClipData &clipData); Q_SIGNALS: - void sourceChanged(QUrl source); - void durationChanged(float duration); + void clipDataChanged(Qt3DAnimation::QAnimationClipData clipData); protected: QAnimationClip(QAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAnimationClip) |