diff options
Diffstat (limited to 'src/quick/items/qquickitemviewtransition_p.h')
| -rw-r--r-- | src/quick/items/qquickitemviewtransition_p.h | 63 |
1 files changed, 14 insertions, 49 deletions
diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 43858db688..7a2d23c3cd 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_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 QQUICKITEMVIEWTRANSITION_P_P_H #define QQUICKITEMVIEWTRANSITION_P_P_H @@ -62,6 +26,8 @@ QT_REQUIRE_CONFIG(quick_viewtransitions); #include <private/qquicktransition_p.h> #include <private/qanimationjobutil_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickItem; @@ -70,7 +36,7 @@ class QQuickItemViewTransitionableItem; class QQuickItemViewTransitionJob; -class Q_QUICK_PRIVATE_EXPORT QQuickItemViewTransitionChangeListener +class Q_QUICK_EXPORT QQuickItemViewTransitionChangeListener { public: QQuickItemViewTransitionChangeListener() {} @@ -80,7 +46,7 @@ public: }; -class Q_QUICK_PRIVATE_EXPORT QQuickItemViewTransitioner +class Q_QUICK_EXPORT QQuickItemViewTransitioner { public: enum TransitionType { @@ -140,7 +106,7 @@ private: /* An item that can be transitioned using QQuickViewTransitionJob. */ -class Q_QUICK_PRIVATE_EXPORT QQuickItemViewTransitionableItem +class Q_QUICK_EXPORT QQuickItemViewTransitionableItem { public: QQuickItemViewTransitionableItem(QQuickItem *i); @@ -157,6 +123,7 @@ public: bool prepareTransition(QQuickItemViewTransitioner *transitioner, int index, const QRectF &viewBounds); void startTransition(QQuickItemViewTransitioner *transitioner, int index); + void completeTransition(QQuickTransition *quickTransition); SelfDeletable m_selfDeletable; QPointF nextTransitionTo; @@ -187,12 +154,12 @@ class QQuickViewTransitionAttached : public QObject { Q_OBJECT - Q_PROPERTY(int index READ index NOTIFY indexChanged) - Q_PROPERTY(QQuickItem* item READ item NOTIFY itemChanged) - Q_PROPERTY(QPointF destination READ destination NOTIFY destinationChanged) + Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) + Q_PROPERTY(QQuickItem* item READ item NOTIFY itemChanged FINAL) + Q_PROPERTY(QPointF destination READ destination NOTIFY destinationChanged FINAL) - Q_PROPERTY(QList<int> targetIndexes READ targetIndexes NOTIFY targetIndexesChanged) - Q_PROPERTY(QQmlListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged) + Q_PROPERTY(QList<int> targetIndexes READ targetIndexes NOTIFY targetIndexesChanged FINAL) + Q_PROPERTY(QQmlListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged FINAL) QML_NAMED_ELEMENT(ViewTransition) QML_ADDED_IN_VERSION(2, 0) @@ -225,12 +192,10 @@ private: QList<int> m_targetIndexes; QList<QObject *> m_targetItems; - QQuickItem *m_item; + QPointer<QQuickItem> m_item; int m_index; }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickViewTransitionAttached) - #endif // QQUICKITEMVIEWTRANSITION_P_P_H |