diff options
Diffstat (limited to 'src/corelib/animation/qsequentialanimationgroup_p.h')
-rw-r--r-- | src/corelib/animation/qsequentialanimationgroup_p.h | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h index b788771fe5..cbdf204d0a 100644 --- a/src/corelib/animation/qsequentialanimationgroup_p.h +++ b/src/corelib/animation/qsequentialanimationgroup_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 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 #ifndef QSEQUENTIALANIMATIONGROUP_P_H #define QSEQUENTIALANIMATIONGROUP_P_H @@ -53,6 +17,7 @@ #include "qsequentialanimationgroup.h" #include "private/qanimationgroup_p.h" +#include "private/qproperty_p.h" QT_REQUIRE_CONFIG(animation); @@ -62,10 +27,7 @@ class QSequentialAnimationGroupPrivate : public QAnimationGroupPrivate { Q_DECLARE_PUBLIC(QSequentialAnimationGroup) public: - QSequentialAnimationGroupPrivate() - : currentAnimation(nullptr), currentAnimationIndex(-1), lastLoop(0) - { } - + QSequentialAnimationGroupPrivate() : currentAnimationIndex(-1), lastLoop(0) { } struct AnimationIndex { @@ -82,12 +44,15 @@ public: void setCurrentAnimation(int index, bool intermediate = false); void activateCurrentAnimation(bool intermediate = false); - void animationInsertedAt(int index) override; - void animationRemoved(int index, QAbstractAnimation *anim) override; + void animationInsertedAt(qsizetype index) override; + void animationRemoved(qsizetype index, QAbstractAnimation *anim) override; bool atEnd() const; - QAbstractAnimation *currentAnimation; + Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(QSequentialAnimationGroupPrivate, QAbstractAnimation *, + currentAnimation, + nullptr // initial value + ) int currentAnimationIndex; // this is the actual duration of uncontrolled animations |