diff options
Diffstat (limited to 'src/corelib/animation/qanimationgroup.cpp')
-rw-r--r-- | src/corelib/animation/qanimationgroup.cpp | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp index f86e927e8c..d2572a7462 100644 --- a/src/corelib/animation/qanimationgroup.cpp +++ b/src/corelib/animation/qanimationgroup.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore 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 /*! \class QAnimationGroup @@ -174,7 +138,7 @@ int QAnimationGroup::indexOfAnimation(QAbstractAnimation *animation) const void QAnimationGroup::addAnimation(QAbstractAnimation *animation) { Q_D(QAnimationGroup); - insertAnimation(d->animations.count(), animation); + insertAnimation(d->animations.size(), animation); } /*! @@ -222,7 +186,7 @@ void QAnimationGroup::removeAnimation(QAbstractAnimation *animation) qWarning("QAnimationGroup::remove: cannot remove null animation"); return; } - int index = d->animations.indexOf(animation); + qsizetype index = d->animations.indexOf(animation); if (index == -1) { qWarning("QAnimationGroup::remove: animation is not part of this group"); return; @@ -297,7 +261,7 @@ void QAnimationGroupPrivate::clear(bool onDestruction) const QList<QAbstractAnimation *> animationsCopy = animations; // taking a copy animations.clear(); // Clearing backwards so the indices doesn't change while we remove animations. - for (int i = animationsCopy.count() - 1; i >= 0; --i) { + for (qsizetype i = animationsCopy.size() - 1; i >= 0; --i) { QAbstractAnimation *animation = animationsCopy.at(i); animation->setParent(nullptr); QAbstractAnimationPrivate::get(animation)->group = nullptr; @@ -311,7 +275,7 @@ void QAnimationGroupPrivate::clear(bool onDestruction) } } -void QAnimationGroupPrivate::animationRemoved(int index, QAbstractAnimation *) +void QAnimationGroupPrivate::animationRemoved(qsizetype index, QAbstractAnimation *) { Q_Q(QAnimationGroup); Q_UNUSED(index); |