diff options
Diffstat (limited to 'src/quick/util/qquickanimatorcontroller.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorcontroller.cpp | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp index e0fd8537a7..d7c25dadc1 100644 --- a/src/quick/util/qquickanimatorcontroller.cpp +++ b/src/quick/util/qquickanimatorcontroller.cpp @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Gunnar Sletta <gunnar@sletta.org> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick 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. +// Copyright (C) 2016 Gunnar Sletta <gunnar@sletta.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquickanimatorcontroller_p.h" @@ -72,7 +36,7 @@ static void qquickanimator_invalidate_jobs(QAbstractAnimationJob *job) void QQuickAnimatorController::windowNodesDestroyed() { - for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) { + for (const QSharedPointer<QAbstractAnimationJob> &toStop : std::as_const(m_rootsPendingStop)) { qquickanimator_invalidate_jobs(toStop.data()); toStop->stop(); } @@ -95,14 +59,14 @@ void QQuickAnimatorController::windowNodesDestroyed() void QQuickAnimatorController::advance() { bool running = false; - for (const QSharedPointer<QAbstractAnimationJob> &job : qAsConst(m_animationRoots)) { + for (const QSharedPointer<QAbstractAnimationJob> &job : std::as_const(m_animationRoots)) { if (job->isRunning()) { running = true; break; } } - for (QQuickAnimatorJob *job : qAsConst(m_runningAnimators)) + for (QQuickAnimatorJob *job : std::as_const(m_runningAnimators)) job->commit(); if (running) @@ -121,18 +85,18 @@ static void qquickanimator_sync_before_start(QAbstractAnimationJob *job) void QQuickAnimatorController::beforeNodeSync() { - for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) { + for (const QSharedPointer<QAbstractAnimationJob> &toStop : std::as_const(m_rootsPendingStop)) { toStop->stop(); m_animationRoots.remove(toStop.data()); } m_rootsPendingStop.clear(); - for (QQuickAnimatorJob *job : qAsConst(m_runningAnimators)) + for (QQuickAnimatorJob *job : std::as_const(m_runningAnimators)) job->preSync(); // Start pending jobs - for (const QSharedPointer<QAbstractAnimationJob> &job : qAsConst(m_rootsPendingStart)) { + for (const QSharedPointer<QAbstractAnimationJob> &job : std::as_const(m_rootsPendingStart)) { Q_ASSERT(!job->isRunning()); // We want to make sure that presync is called before @@ -154,7 +118,7 @@ void QQuickAnimatorController::beforeNodeSync() void QQuickAnimatorController::afterNodeSync() { - for (QQuickAnimatorJob *job : qAsConst(m_runningAnimators)) + for (QQuickAnimatorJob *job : std::as_const(m_runningAnimators)) job->postSync(); } |