diff options
Diffstat (limited to 'src/animation/frontend/qanimationclip_p.h')
-rw-r--r-- | src/animation/frontend/qanimationclip_p.h | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/animation/frontend/qanimationclip_p.h b/src/animation/frontend/qanimationclip_p.h index 5e3df0e6e..514d568af 100644 --- a/src/animation/frontend/qanimationclip_p.h +++ b/src/animation/frontend/qanimationclip_p.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$ ** @@ -48,32 +51,26 @@ // We mean it. // -#include <Qt3DCore/private/qnode_p.h> -#include "qanimationclip.h" +#include <Qt3DAnimation/private/qabstractanimationclip_p.h> +#include <Qt3DAnimation/qanimationclip.h> QT_BEGIN_NAMESPACE namespace Qt3DAnimation { -class QAnimationClipPrivate : public Qt3DCore::QNodePrivate +class QAnimationClipPrivate : public QAbstractAnimationClipPrivate { public: QAnimationClipPrivate(); Q_DECLARE_PUBLIC(QAnimationClip) - void setDuration(float duration); - - QUrl m_source; - - // Set from the backend - float m_duration; + QAnimationClipData m_clipData; }; -struct QAnimationClipData +struct QAnimationClipChangeData { - QUrl source; - bool running; + QAnimationClipData clipData; }; } // namespace Qt3DAnimation |