1 files changed, 12 insertions, 50 deletions

diff --git a/src/qml/animations/qcontinuinganimationgroupjob.cpp b/src/qml/animations/qcontinuinganimationgroupjob.cpp
index 88c0e9e60e..892bfc6fdb 100644
--- a/src/qml/animations/qcontinuinganimationgroupjob.cpp
+++ b/src/qml/animations/qcontinuinganimationgroupjob.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla 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 Jolla Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "private/qcontinuinganimationgroupjob_p.h"
 #include "private/qanimationjobutil_p.h"
@@ -52,9 +16,8 @@ QContinuingAnimationGroupJob::~QContinuingAnimationGroupJob()
 
 void QContinuingAnimationGroupJob::updateCurrentTime(int /*currentTime*/)
 {
-    Q_ASSERT(firstChild());
-
-    for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) {
+    Q_ASSERT(!m_children.isEmpty());
+    for (QAbstractAnimationJob *animation : m_children) {
         if (animation->state() == state()) {
             RETURN_IF_DELETED(animation->setCurrentTime(m_currentTime));
         }
@@ -68,23 +31,23 @@ void QContinuingAnimationGroupJob::updateState(QAbstractAnimationJob::State newS
 
     switch (newState) {
     case Stopped:
-        for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling())
+        for (QAbstractAnimationJob *animation  : m_children)
             animation->stop();
         break;
     case Paused:
-        for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling())
+        for (QAbstractAnimationJob *animation  : m_children)
             if (animation->isRunning())
                 animation->pause();
         break;
     case Running:
-        if (!firstChild()) {
+        if (m_children.isEmpty()) {
             stop();
             return;
         }
-        for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) {
-            resetUncontrolledAnimationFinishTime(animation);
+        for (QAbstractAnimationJob *animation  : m_children) {
+            RETURN_IF_DELETED(resetUncontrolledAnimationFinishTime(animation));
             animation->setDirection(m_direction);
-            animation->start();
+            RETURN_IF_DELETED(animation->start());
         }
         break;
     }
@@ -93,9 +56,8 @@ void QContinuingAnimationGroupJob::updateState(QAbstractAnimationJob::State newS
 void QContinuingAnimationGroupJob::updateDirection(QAbstractAnimationJob::Direction direction)
 {
     if (!isStopped()) {
-        for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) {
+        for (QAbstractAnimationJob *animation  : m_children)
             animation->setDirection(direction);
-        }
     }
 }
 
@@ -104,7 +66,7 @@ void QContinuingAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimat
     Q_ASSERT(animation && (animation->duration() == -1));
     int uncontrolledRunningCount = 0;
 
-    for (QAbstractAnimationJob *child = firstChild(); child; child = child->nextSibling()) {
+    for (QAbstractAnimationJob *child : m_children) {
         if (child == animation)
             setUncontrolledAnimationFinishTime(animation, animation->currentTime());
         else if (uncontrolledAnimationFinishTime(child) == -1)