diff options
Diffstat (limited to 'src/quick/util/qquickanimationcontroller_p.h')
| -rw-r--r-- | src/quick/util/qquickanimationcontroller_p.h | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h index de308735ef..6ce1fcc7a3 100644 --- a/src/quick/util/qquickanimationcontroller_p.h +++ b/src/quick/util/qquickanimationcontroller_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 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. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICKANIMATIONCONTROLLER_H #define QQUICKANIMATIONCONTROLLER_H @@ -52,15 +16,17 @@ // #include <qqml.h> +#include <private/qqmlfinalizer_p.h> #include "qquickanimation_p.h" QT_BEGIN_NAMESPACE class QQuickAnimationControllerPrivate; -class Q_AUTOTEST_EXPORT QQuickAnimationController : public QObject, public QQmlParserStatus +class Q_QUICK_EXPORT QQuickAnimationController : public QObject, public QQmlFinalizerHook { Q_OBJECT - Q_INTERFACES(QQmlParserStatus) + Q_DISABLE_COPY_MOVE(QQuickAnimationController) + Q_INTERFACES(QQmlFinalizerHook) Q_DECLARE_PRIVATE(QQuickAnimationController) Q_CLASSINFO("DefaultProperty", "animation") @@ -80,8 +46,7 @@ public: QQuickAbstractAnimation *animation() const; void setAnimation(QQuickAbstractAnimation *animation); - void classBegin() override; - void componentComplete() override {} + void componentFinalized() override; Q_SIGNALS: void progressChanged(); void animationChanged(); @@ -90,12 +55,9 @@ public Q_SLOTS: void completeToBeginning(); void completeToEnd(); private Q_SLOTS: - void componentFinalized(); void updateProgress(); }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAnimationController) - #endif // QQUICKANIMATIONCONTROLLER_H |