aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitemview_p_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
-rw-r--r--src/quick/items/qquickitemview_p_p.h56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 05927c0d68..a4892e8972 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -46,8 +46,8 @@
#include "qquickflickable_p_p.h"
#include "qquickvisualdatamodel_p.h"
#include "qquickvisualitemmodel_p.h"
-#include <private/qdeclarativetransitionmanager_p_p.h>
-#include <private/qdeclarativechangeset_p.h>
+#include <private/qquicktransitionmanager_p_p.h>
+#include <private/qquickchangeset_p.h>
QT_BEGIN_HEADER
@@ -58,7 +58,7 @@ QT_MODULE(Declarative)
class FxViewItem;
-class FxViewItemTransitionManager : public QDeclarativeTransitionManager
+class FxViewItemTransitionManager : public QQuickTransitionManager
{
public:
enum TransitionType {
@@ -142,12 +142,12 @@ public:
void prepare(int currentIndex, int count);
void reset();
- void applyChanges(const QDeclarativeChangeSet &changeSet);
+ void applyChanges(const QQuickChangeSet &changeSet);
int itemCount;
int newCurrentIndex;
- QDeclarativeChangeSet pendingChanges;
- QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> removedItems;
+ QQuickChangeSet pendingChanges;
+ QHash<QQuickChangeSet::MoveKey, FxViewItem *> removedItems;
bool active : 1;
bool currentChanged : 1;
@@ -162,7 +162,7 @@ public:
QQuickItemViewPrivate();
struct ChangeResult {
- QDeclarativeNullableValue<qreal> visiblePos;
+ QQmlNullableValue<qreal> visiblePos;
bool changedFirstItem;
qreal sizeChangesBeforeVisiblePos;
qreal sizeChangesAfterVisiblePos;
@@ -174,7 +174,7 @@ public:
sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0),
countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {}
- ChangeResult(const QDeclarativeNullableValue<qreal> &p)
+ ChangeResult(const QQmlNullableValue<qreal> &p)
: visiblePos(p), changedFirstItem(false),
sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0),
countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {}
@@ -228,7 +228,7 @@ public:
virtual void releaseItem(FxViewItem *item);
QQuickItem *createHighlightItem();
- QQuickItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
+ QQuickItem *createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
void updateCurrent(int modelIndex);
void updateTrackedItem();
@@ -238,19 +238,19 @@ public:
void positionViewAtIndex(int index, int mode);
void applyPendingChanges();
bool applyModelChanges(ChangeResult *insertionResult, ChangeResult *removalResult);
- bool applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount);
- void removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult);
+ bool applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount);
+ void removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult);
void repositionFirstItem(FxViewItem *prevVisibleItemsFirst, qreal prevVisibleItemsFirstPos,
FxViewItem *prevFirstVisible, ChangeResult *insertionResult, ChangeResult *removalResult);
void prepareVisibleItemTransitions();
- void prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems);
+ void prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems);
bool prepareNonVisibleItemTransition(FxViewItem *item, const QRectF &viewBounds);
bool canTransition(FxViewItemTransitionManager::TransitionType type, bool asTarget) const;
bool hasItemTransitions() const;
void transitionNextReposition(FxViewItem *item, FxViewItemTransitionManager::TransitionType type, bool isTarget);
- int findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const;
+ int findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const;
void checkVisible() const;
void showVisibleItems() const;
@@ -262,7 +262,7 @@ public:
hData.markExtentsDirty();
}
- QDeclarativeGuard<QQuickVisualModel> model;
+ QQmlGuard<QQuickVisualModel> model;
QVariant modelVariant;
int itemCount;
int buffer;
@@ -282,25 +282,25 @@ public:
QQuickItemViewChangeSet currentChanges;
// XXX split into struct
- QDeclarativeComponent *highlightComponent;
+ QQmlComponent *highlightComponent;
FxViewItem *highlight;
int highlightRange; // enum value
qreal highlightRangeStart;
qreal highlightRangeEnd;
int highlightMoveDuration;
- QDeclarativeComponent *headerComponent;
+ QQmlComponent *headerComponent;
FxViewItem *header;
- QDeclarativeComponent *footerComponent;
+ QQmlComponent *footerComponent;
FxViewItem *footer;
- QDeclarativeTransition *populateTransition;
- QDeclarativeTransition *addTransition;
- QDeclarativeTransition *addDisplacedTransition;
- QDeclarativeTransition *moveTransition;
- QDeclarativeTransition *moveDisplacedTransition;
- QDeclarativeTransition *removeTransition;
- QDeclarativeTransition *removeDisplacedTransition;
+ QQuickTransition *populateTransition;
+ QQuickTransition *addTransition;
+ QQuickTransition *addDisplacedTransition;
+ QQuickTransition *moveTransition;
+ QQuickTransition *moveDisplacedTransition;
+ QQuickTransition *removeTransition;
+ QQuickTransition *removeDisplacedTransition;
QList<int> addTransitionIndexes;
QList<int> moveTransitionIndexes;
@@ -311,8 +311,8 @@ public:
struct MovedItem {
FxViewItem *item;
- QDeclarativeChangeSet::MoveKey moveKey;
- MovedItem(FxViewItem *i, QDeclarativeChangeSet::MoveKey k)
+ QQuickChangeSet::MoveKey moveKey;
+ MovedItem(FxViewItem *i, QQuickChangeSet::MoveKey k)
: item(i), moveKey(k) {}
};
QList<FxViewItem *> releasePendingTransition;
@@ -372,7 +372,7 @@ protected:
virtual void layoutVisibleItems(int fromModelIndex = 0) = 0;
virtual void changedVisibleIndex(int newIndex) = 0;
- virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult,
+ virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult,
QList<FxViewItem *> *newItems, QList<MovedItem> *movingIntoView) = 0;
virtual bool needsRefillForAddedOrRemovedIndex(int) const { return false; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 15:44:45 +0000