From 328c100ab3fc4d5ddccb0d19af9d7e87bd849f0b Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Tue, 21 Feb 2012 14:44:21 +1000 Subject: Separate view transition functionality into new file Move most of the view transition functionality from qquickitemview* into qquickitemviewtransition*. - Move QQuickViewTransitionAttached - Move QQuickItemViewTransitionManager, rename to QQuickItemViewTransitionJob - Move FxViewItem transition-specific features into new QQuickViewItem - Move transition-specific functions like transitionNextReposition() and canTransition() into QQuickItemViewTransitioner which holds all the transition objects now Also mention in docs that there's no defined order for choosing between multiple matching displaced transitions. Change-Id: I8701c0d40d2af152c5d432a4c8de646854c76ea2 Reviewed-by: Martin Jones --- src/quick/items/qquickitemview_p.h | 44 -------------------------------------- 1 file changed, 44 deletions(-) (limited to 'src/quick/items/qquickitemview_p.h') diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index 0d3cd1c3ce..63262f32ab 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -324,53 +324,9 @@ public: QString m_nextSection; }; -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(QList targetIndexes READ targetIndexes NOTIFY targetIndexesChanged) - Q_PROPERTY(QDeclarativeListProperty targetItems READ targetItems NOTIFY targetItemsChanged) - -public: - QQuickViewTransitionAttached(QObject *parent); - - int index() const { return m_index; } - QQuickItem *item() const { return m_item; } - QPointF destination() const { return m_destination; } - - QList targetIndexes() const { return m_targetIndexes; } - QDeclarativeListProperty targetItems(); - - static QQuickViewTransitionAttached *qmlAttachedProperties(QObject *); - -signals: - void indexChanged(); - void itemChanged(); - void destinationChanged(); - - void targetIndexesChanged(); - void targetItemsChanged(); - -private: - friend class FxViewItemTransitionManager; - int m_index; - QQuickItem *m_item; - QPointF m_destination; - - QList m_targetIndexes; - QList m_targetItems; -}; - QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickViewTransitionAttached) -QML_DECLARE_TYPEINFO(QQuickViewTransitionAttached, QML_HAS_ATTACHED_PROPERTIES) - QT_END_HEADER #endif // QQUICKITEMVIEW_P_H -- cgit v1.2.3