diff options
Diffstat (limited to 'src/qml/animations/qanimationgroupjob_p.h')
-rw-r--r-- | src/qml/animations/qanimationgroupjob_p.h | 64 |
1 files changed, 17 insertions, 47 deletions
diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h index a27c9195dd..d276f63868 100644 --- a/src/qml/animations/qanimationgroupjob_p.h +++ b/src/qml/animations/qanimationgroupjob_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $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 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.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-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 (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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QANIMATIONGROUPJOB_P_H #define QANIMATIONGROUPJOB_P_H @@ -51,17 +15,20 @@ // We mean it. // -#include "private/qabstractanimationjob_p.h" +#include <QtQml/private/qabstractanimationjob_p.h> +#include <QtQml/private/qdoubleendedlist_p.h> #include <QtCore/qdebug.h> QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob +class Q_QML_EXPORT QAnimationGroupJob : public QAbstractAnimationJob { Q_DISABLE_COPY(QAnimationGroupJob) public: + using Children = QDoubleEndedList<QAbstractAnimationJob>; + QAnimationGroupJob(); ~QAnimationGroupJob() override; @@ -69,8 +36,8 @@ public: void prependAnimation(QAbstractAnimationJob *animation); void removeAnimation(QAbstractAnimationJob *animation); - QAbstractAnimationJob *firstChild() const { return m_firstChild; } - QAbstractAnimationJob *lastChild() const { return m_lastChild; } + Children *children() { return &m_children; } + const Children *children() const { return &m_children; } virtual void clear(); @@ -85,15 +52,18 @@ protected: //TODO: confirm location of these (should any be moved into QAbstractAnimationJob?) void resetUncontrolledAnimationsFinishTime(); void resetUncontrolledAnimationFinishTime(QAbstractAnimationJob *anim); - int uncontrolledAnimationFinishTime(QAbstractAnimationJob *anim) const { return anim->m_uncontrolledFinishTime; } + int uncontrolledAnimationFinishTime(const QAbstractAnimationJob *anim) const + { + return anim->m_uncontrolledFinishTime; + } void setUncontrolledAnimationFinishTime(QAbstractAnimationJob *anim, int time); void debugChildren(QDebug d) const; -private: - //definition - QAbstractAnimationJob *m_firstChild = nullptr; - QAbstractAnimationJob *m_lastChild = nullptr; + void ungroupChild(QAbstractAnimationJob *animation); + void handleAnimationRemoved(QAbstractAnimationJob *animation); + + Children m_children; }; QT_END_NAMESPACE |