1 files changed, 38 insertions, 86 deletions

diff --git a/src/qml/animations/qanimationgroupjob.cpp b/src/qml/animations/qanimationgroupjob.cpp
index 66599561fc..d9b7e3f78d 100644
--- a/src/qml/animations/qanimationgroupjob.cpp
+++ b/src/qml/animations/qanimationgroupjob.cpp
@@ -1,60 +1,44 @@
-/****************************************************************************
-**
-** 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
 
 #include "private/qanimationgroupjob_p.h"
 
 QT_BEGIN_NAMESPACE
 
 QAnimationGroupJob::QAnimationGroupJob()
-    : QAbstractAnimationJob(), m_firstChild(nullptr), m_lastChild(nullptr)
 {
     m_isGroup = true;
 }
 
+void QAnimationGroupJob::ungroupChild(QAbstractAnimationJob *animation)
+{
+    Q_ASSERT(animation);
+    Q_ASSERT(animation->m_group == this);
+    m_children.remove(animation);
+    animation->m_group = nullptr;
+}
+
+void QAnimationGroupJob::handleAnimationRemoved(QAbstractAnimationJob *animation)
+{
+    resetUncontrolledAnimationFinishTime(animation);
+    if (m_children.isEmpty()) {
+        m_currentTime = 0;
+        stop();
+    }
+}
+
 QAnimationGroupJob::~QAnimationGroupJob()
 {
-    clear();
+    while (QAbstractAnimationJob *animation = m_children.first()) {
+        ungroupChild(animation);
+        handleAnimationRemoved(animation);
+        delete animation;
+    }
 }
 
 void QAnimationGroupJob::topLevelAnimationLoopChanged()
 {
-    for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling())
+    for (QAbstractAnimationJob *animation : m_children)
         animation->fireTopLevelAnimationLoopChanged();
 }
 
@@ -63,15 +47,9 @@ void QAnimationGroupJob::appendAnimation(QAbstractAnimationJob *animation)
     if (QAnimationGroupJob *oldGroup = animation->m_group)
         oldGroup->removeAnimation(animation);
 
-    Q_ASSERT(!animation->previousSibling() && !animation->nextSibling());
-
-    if (m_lastChild)
-        m_lastChild->m_nextSibling = animation;
-    else
-        m_firstChild = animation;
-    animation->m_previousSibling = m_lastChild;
-    m_lastChild = animation;
+    Q_ASSERT(!animation->isInList());
 
+    m_children.append(animation);
     animation->m_group = this;
     animationInserted(animation);
 }
@@ -81,56 +59,34 @@ void QAnimationGroupJob::prependAnimation(QAbstractAnimationJob *animation)
     if (QAnimationGroupJob *oldGroup = animation->m_group)
         oldGroup->removeAnimation(animation);
 
-    Q_ASSERT(!previousSibling() && !nextSibling());
-
-    if (m_firstChild)
-        m_firstChild->m_previousSibling = animation;
-    else
-        m_lastChild = animation;
-    animation->m_nextSibling = m_firstChild;
-    m_firstChild = animation;
+    Q_ASSERT(!animation->isInList());
 
+    m_children.prepend(animation);
     animation->m_group = this;
     animationInserted(animation);
 }
 
 void QAnimationGroupJob::removeAnimation(QAbstractAnimationJob *animation)
 {
-    Q_ASSERT(animation);
-    Q_ASSERT(animation->m_group == this);
-    QAbstractAnimationJob *prev = animation->previousSibling();
-    QAbstractAnimationJob *next = animation->nextSibling();
-
-    if (prev)
-        prev->m_nextSibling = next;
-    else
-        m_firstChild = next;
-
-    if (next)
-        next->m_previousSibling = prev;
-    else
-        m_lastChild = prev;
-
-    animation->m_previousSibling = nullptr;
-    animation->m_nextSibling = nullptr;
-
-    animation->m_group = nullptr;
+    QAbstractAnimationJob *prev = m_children.prev(animation);
+    QAbstractAnimationJob *next = m_children.next(animation);
+    ungroupChild(animation);
     animationRemoved(animation, prev, next);
 }
 
 void QAnimationGroupJob::clear()
 {
-    while (QAbstractAnimationJob *child = firstChild()) {
+    while (QAbstractAnimationJob *child = m_children.first()) {
         removeAnimation(child);
         delete child;
     }
-    m_firstChild = nullptr;
-    m_lastChild = nullptr;
+
+    Q_ASSERT(m_children.isEmpty());
 }
 
 void QAnimationGroupJob::resetUncontrolledAnimationsFinishTime()
 {
-    for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) {
+    for (QAbstractAnimationJob *animation : m_children) {
         if (animation->duration() == -1 || animation->loopCount() < 0) {
             resetUncontrolledAnimationFinishTime(animation);
         }
@@ -154,11 +110,7 @@ void QAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimationJob *an
 
 void QAnimationGroupJob::animationRemoved(QAbstractAnimationJob* anim, QAbstractAnimationJob* , QAbstractAnimationJob* )
 {
-    resetUncontrolledAnimationFinishTime(anim);
-    if (!firstChild()) {
-        m_currentTime = 0;
-        stop();
-    }
+    handleAnimationRemoved(anim);
 }
 
 void QAnimationGroupJob::debugChildren(QDebug d) const
@@ -169,7 +121,7 @@ void QAnimationGroupJob::debugChildren(QDebug d) const
         ++indentLevel;
 
     QByteArray ind(indentLevel, ' ');
-    for (QAbstractAnimationJob *child = firstChild(); child; child = child->nextSibling())
+    for (const QAbstractAnimationJob *child : m_children)
         d << "\n" << ind.constData() << child;
 }