aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitemview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
-rw-r--r--src/quick/items/qquickitemview.cpp118
1 files changed, 59 insertions, 59 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 533e1f6852..418b3196ed 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -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
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qquickitemview_p_p.h"
-#include <QtQuick/private/qdeclarativetransition_p.h>
+#include <QtQuick/private/qquicktransition_p.h>
QT_BEGIN_NAMESPACE
@@ -253,7 +253,7 @@ void FxViewItemTransitionManager::startTransition(FxViewItem *item, FxViewItemTr
QQuickItemViewPrivate *vp = static_cast<QQuickItemViewPrivate*>(QObjectPrivate::get(item->itemView()));
- QDeclarativeTransition *trans = 0;
+ QQuickTransition *trans = 0;
switch (type) {
case NoTransition:
break;
@@ -312,16 +312,16 @@ void FxViewItemTransitionManager::startTransition(FxViewItem *item, FxViewItemTr
emit attached->targetItemsChanged();
}
- QDeclarativeStateOperation::ActionList actions;
- actions << QDeclarativeAction(item->item, QLatin1String("x"), QVariant(to.x()));
- actions << QDeclarativeAction(item->item, QLatin1String("y"), QVariant(to.y()));
+ QQuickStateOperation::ActionList actions;
+ actions << QQuickAction(item->item, QLatin1String("x"), QVariant(to.x()));
+ actions << QQuickAction(item->item, QLatin1String("y"), QVariant(to.y()));
- QDeclarativeTransitionManager::transition(actions, trans, item->item);
+ QQuickTransitionManager::transition(actions, trans, item->item);
}
void FxViewItemTransitionManager::finished()
{
- QDeclarativeTransitionManager::finished();
+ QQuickTransitionManager::finished();
m_active = false;
@@ -346,14 +346,14 @@ bool QQuickItemViewChangeSet::hasPendingChanges() const
return !pendingChanges.isEmpty();
}
-void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet)
+void QQuickItemViewChangeSet::applyChanges(const QQuickChangeSet &changeSet)
{
pendingChanges.apply(changeSet);
int moveId = -1;
int moveOffset = 0;
- foreach (const QDeclarativeChangeSet::Remove &r, changeSet.removes()) {
+ foreach (const QQuickChangeSet::Remove &r, changeSet.removes()) {
itemCount -= r.count;
if (moveId == -1 && newCurrentIndex >= r.index + r.count) {
newCurrentIndex -= r.count;
@@ -372,7 +372,7 @@ void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSe
currentChanged = true;
}
}
- foreach (const QDeclarativeChangeSet::Insert &i, changeSet.inserts()) {
+ foreach (const QQuickChangeSet::Insert &i, changeSet.inserts()) {
if (moveId == -1) {
if (itemCount && newCurrentIndex >= i.index) {
newCurrentIndex += i.count;
@@ -758,9 +758,9 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
\sa QtQuick2::ViewTransition::targetIndexes
*/
-QDeclarativeListProperty<QObject> QQuickViewTransitionAttached::targetItems()
+QQmlListProperty<QObject> QQuickViewTransitionAttached::targetItems()
{
- return QDeclarativeListProperty<QObject>(this, m_targetItems);
+ return QQmlListProperty<QObject>(this, m_targetItems);
}
QQuickViewTransitionAttached *QQuickViewTransitionAttached::qmlAttachedProperties(QObject *obj)
@@ -810,8 +810,8 @@ void QQuickItemView::setModel(const QVariant &model)
if (d->modelVariant == model)
return;
if (d->model) {
- disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
- this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+ disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+ this, SLOT(modelUpdated(QQuickChangeSet,bool)));
disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
@@ -873,14 +873,14 @@ void QQuickItemView::setModel(const QVariant &model)
polish();
}
}
- connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
- this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+ connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+ this, SLOT(modelUpdated(QQuickChangeSet,bool)));
emit countChanged();
}
emit modelChanged();
}
-QDeclarativeComponent *QQuickItemView::delegate() const
+QQmlComponent *QQuickItemView::delegate() const
{
Q_D(const QQuickItemView);
if (d->model) {
@@ -891,7 +891,7 @@ QDeclarativeComponent *QQuickItemView::delegate() const
return 0;
}
-void QQuickItemView::setDelegate(QDeclarativeComponent *delegate)
+void QQuickItemView::setDelegate(QQmlComponent *delegate)
{
Q_D(QQuickItemView);
if (delegate == this->delegate())
@@ -1026,7 +1026,7 @@ Qt::LayoutDirection QQuickItemView::effectiveLayoutDirection() const
}
-QDeclarativeComponent *QQuickItemView::header() const
+QQmlComponent *QQuickItemView::header() const
{
Q_D(const QQuickItemView);
return d->headerComponent;
@@ -1039,7 +1039,7 @@ QQuickItem *QQuickItemView::headerItem() const
return d->header ? d->header->item : 0;
}
-void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent)
+void QQuickItemView::setHeader(QQmlComponent *headerComponent)
{
Q_D(QQuickItemView);
if (d->headerComponent != headerComponent) {
@@ -1062,7 +1062,7 @@ void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent)
}
}
-QDeclarativeComponent *QQuickItemView::footer() const
+QQmlComponent *QQuickItemView::footer() const
{
Q_D(const QQuickItemView);
return d->footerComponent;
@@ -1075,7 +1075,7 @@ QQuickItem *QQuickItemView::footerItem() const
return d->footer ? d->footer->item : 0;
}
-void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent)
+void QQuickItemView::setFooter(QQmlComponent *footerComponent)
{
Q_D(QQuickItemView);
if (d->footerComponent != footerComponent) {
@@ -1095,14 +1095,14 @@ void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent)
}
}
-QDeclarativeComponent *QQuickItemView::highlight() const
+QQmlComponent *QQuickItemView::highlight() const
{
Q_D(const QQuickItemView);
const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
return d->highlightComponent;
}
-void QQuickItemView::setHighlight(QDeclarativeComponent *highlightComponent)
+void QQuickItemView::setHighlight(QQmlComponent *highlightComponent)
{
Q_D(QQuickItemView);
if (highlightComponent != d->highlightComponent) {
@@ -1225,13 +1225,13 @@ void QQuickItemView::setHighlightMoveDuration(int duration)
}
}
-QDeclarativeTransition *QQuickItemView::populateTransition() const
+QQuickTransition *QQuickItemView::populateTransition() const
{
Q_D(const QQuickItemView);
return d->populateTransition;
}
-void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setPopulateTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->populateTransition != transition) {
@@ -1240,13 +1240,13 @@ void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition)
}
}
-QDeclarativeTransition *QQuickItemView::addTransition() const
+QQuickTransition *QQuickItemView::addTransition() const
{
Q_D(const QQuickItemView);
return d->addTransition;
}
-void QQuickItemView::setAddTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setAddTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->addTransition != transition) {
@@ -1255,13 +1255,13 @@ void QQuickItemView::setAddTransition(QDeclarativeTransition *transition)
}
}
-QDeclarativeTransition *QQuickItemView::addDisplacedTransition() const
+QQuickTransition *QQuickItemView::addDisplacedTransition() const
{
Q_D(const QQuickItemView);
return d->addDisplacedTransition;
}
-void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setAddDisplacedTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->addDisplacedTransition != transition) {
@@ -1270,13 +1270,13 @@ void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transitio
}
}
-QDeclarativeTransition *QQuickItemView::moveTransition() const
+QQuickTransition *QQuickItemView::moveTransition() const
{
Q_D(const QQuickItemView);
return d->moveTransition;
}
-void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setMoveTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->moveTransition != transition) {
@@ -1285,13 +1285,13 @@ void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition)
}
}
-QDeclarativeTransition *QQuickItemView::moveDisplacedTransition() const
+QQuickTransition *QQuickItemView::moveDisplacedTransition() const
{
Q_D(const QQuickItemView);
return d->moveDisplacedTransition;
}
-void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setMoveDisplacedTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->moveDisplacedTransition != transition) {
@@ -1300,13 +1300,13 @@ void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transiti
}
}
-QDeclarativeTransition *QQuickItemView::removeTransition() const
+QQuickTransition *QQuickItemView::removeTransition() const
{
Q_D(const QQuickItemView);
return d->removeTransition;
}
-void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setRemoveTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->removeTransition != transition) {
@@ -1315,13 +1315,13 @@ void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition)
}
}
-QDeclarativeTransition *QQuickItemView::removeDisplacedTransition() const
+QQuickTransition *QQuickItemView::removeDisplacedTransition() const
{
Q_D(const QQuickItemView);
return d->removeDisplacedTransition;
}
-void QQuickItemView::setRemoveDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setRemoveDisplacedTransition(QQuickTransition *transition)
{
Q_D(QQuickItemView);
if (d->removeDisplacedTransition != transition) {
@@ -1522,7 +1522,7 @@ void QQuickItemViewPrivate::transitionNextReposition(FxViewItem *item, FxViewIte
}
}
-int QQuickItemViewPrivate::findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const
+int QQuickItemViewPrivate::findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const
{
for (int i=0; i<changes.count(); i++) {
for (int j=changes[i].index; j<changes[i].index + changes[i].count; j++) {
@@ -1621,7 +1621,7 @@ void QQuickItemView::destroyRemoved()
polish();
}
-void QQuickItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickItemView::modelUpdated(const QQuickChangeSet &changeSet, bool reset)
{
Q_D(QQuickItemView);
if (reset) {
@@ -2354,7 +2354,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
|| !currentChanges.pendingChanges.inserts().isEmpty();
FxViewItem *prevFirstVisible = firstVisibleItem();
- QDeclarativeNullableValue<qreal> prevViewPos;
+ QQmlNullableValue<qreal> prevViewPos;
int prevFirstVisibleIndex = -1;
if (prevFirstVisible) {
prevViewPos = prevFirstVisible->position();
@@ -2365,8 +2365,8 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
totalInsertionResult->visiblePos = prevViewPos;
totalRemovalResult->visiblePos = prevViewPos;
- const QVector<QDeclarativeChangeSet::Remove> &removals = currentChanges.pendingChanges.removes();
- const QVector<QDeclarativeChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts();
+ const QVector<QQuickChangeSet::Remove> &removals = currentChanges.pendingChanges.removes();
+ const QVector<QQuickChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts();
ChangeResult insertionResult(prevViewPos);
ChangeResult removalResult(prevViewPos);
@@ -2385,7 +2385,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
}
}
if (runDelayedRemoveTransition) {
- QDeclarativeChangeSet::Remove removal;
+ QQuickChangeSet::Remove removal;
for (QList<FxViewItem*>::Iterator it = visibleItems.begin(); it != visibleItems.end();) {
FxViewItem *item = *it;
if (item->index == -1 && !item->attached->delayRemove()) {
@@ -2453,7 +2453,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
// Whatever removed/moved items remain are no longer visible items.
prepareRemoveTransitions(&currentChanges.removedItems);
- for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin();
+ for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin();
it != currentChanges.removedItems.end(); ++it) {
releaseItem(it.value());
}
@@ -2483,7 +2483,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
return visibleAffected;
}
-bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount)
+bool QQuickItemViewPrivate::applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount)
{
Q_Q(QQuickItemView);
bool visibleAffected = false;
@@ -2533,7 +2533,7 @@ bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remo
return visibleAffected;
}
-void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult)
+void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult)
{
if (removeResult->visiblePos.isValid()) {
if (item->position() < removeResult->visiblePos)
@@ -2546,7 +2546,7 @@ void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChang
transitionNextReposition(item, FxViewItemTransitionManager::MoveTransition, true);
} else {
// track item so it is released later
- currentChanges.removedItems.insertMulti(QDeclarativeChangeSet::MoveKey(), item);
+ currentChanges.removedItems.insertMulti(QQuickChangeSet::MoveKey(), item);
}
if (!removeResult->changedFirstItem && item == *visibleItems.constBegin())
removeResult->changedFirstItem = true;
@@ -2558,7 +2558,7 @@ void QQuickItemViewPrivate::repositionFirstItem(FxViewItem *prevVisibleItemsFirs
ChangeResult *insertionResult,
ChangeResult *removalResult)
{
- const QDeclarativeNullableValue<qreal> prevViewPos = insertionResult->visiblePos;
+ const QQmlNullableValue<qreal> prevViewPos = insertionResult->visiblePos;
// reposition visibleItems.first() correctly so that the content y doesn't jump
if (visibleItems.count()) {
@@ -2629,13 +2629,13 @@ void QQuickItemViewPrivate::prepareVisibleItemTransitions()
}
}
-void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems)
+void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems)
{
removeTransitionIndexes.clear();
removeTransitionTargets.clear();
if (canTransition(FxViewItemTransitionManager::RemoveTransition, true)) {
- for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin();
+ for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin();
it != removedItems->end(); ) {
bool isRemove = it.key().moveId < 0;
if (isRemove) {
@@ -2710,7 +2710,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous)
if (QQuickItem *item = model->item(modelIndex, asynchronous)) {
item->setParentItem(q->contentItem());
- QDeclarative_setParent_noEvent(item, q->contentItem());
+ QQml_setParent_noEvent(item, q->contentItem());
requestedIndex = -1;
FxViewItem *viewItem = requestedItem;
if (!viewItem)
@@ -2757,7 +2757,7 @@ void QQuickItemView::initItem(int index, QQuickItem *item)
if (d->requestedAsync)
item->setVisible(false);
item->setParentItem(contentItem());
- QDeclarative_setParent_noEvent(item, contentItem());
+ QQml_setParent_noEvent(item, contentItem());
d->requestedItem = d->newViewItem(index, item);
}
}
@@ -2790,18 +2790,18 @@ QQuickItem *QQuickItemViewPrivate::createHighlightItem()
return createComponentItem(highlightComponent, true, true);
}
-QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault)
+QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault)
{
Q_Q(QQuickItemView);
QQuickItem *item = 0;
if (component) {
- QDeclarativeContext *creationContext = component->creationContext();
- QDeclarativeContext *context = new QDeclarativeContext(
+ QQmlContext *creationContext = component->creationContext();
+ QQmlContext *context = new QQmlContext(
creationContext ? creationContext : qmlContext(q));
QObject *nobj = component->create(context);
if (nobj) {
- QDeclarative_setParent_noEvent(context, nobj);
+ QQml_setParent_noEvent(context, nobj);
item = qobject_cast<QQuickItem *>(nobj);
if (!item)
delete nobj;
@@ -2812,7 +2812,7 @@ QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *co
item = new QQuickItem;
}
if (item) {
- QDeclarative_setParent_noEvent(item, q->contentItem());
+ QQml_setParent_noEvent(item, q->contentItem());
item->setParentItem(q->contentItem());
if (receiveItemGeometryChanges) {
QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:41:44 +0000