diff options
Diffstat (limited to 'src/templates/qquickcontainer.cpp')
-rw-r--r-- | src/templates/qquickcontainer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp index 46c3f707..5bd3e8f3 100644 --- a/src/templates/qquickcontainer.cpp +++ b/src/templates/qquickcontainer.cpp @@ -87,6 +87,7 @@ QQuickItem *QQuickContainerPrivate::itemAt(int index) const void QQuickContainerPrivate::insertItem(int index, QQuickItem *item) { + Q_Q(QQuickContainer); contentData.append(item); if (exclusiveGroup && !exclusiveGroup->isCheckable(item)) return; @@ -96,7 +97,7 @@ void QQuickContainerPrivate::insertItem(int index, QQuickItem *item) if (exclusiveGroup) exclusiveGroup->addCheckable(item); - itemInserted(index, item); + q->itemAdded(index, item); if (contentModel->count() == 1 && currentIndex == -1) { Q_Q(QQuickContainer); @@ -104,19 +105,10 @@ void QQuickContainerPrivate::insertItem(int index, QQuickItem *item) } } -void QQuickContainerPrivate::itemInserted(int, QQuickItem *) -{ -} - void QQuickContainerPrivate::moveItem(int from, int to) { - contentModel->move(from, to); - itemMoved(from, to); -} - -void QQuickContainerPrivate::itemMoved(int from, int to) -{ Q_Q(QQuickContainer); + contentModel->move(from, to); updatingCurrent = true; if (exclusiveGroup) { q->setCurrentIndex(contentModel->indexOf(exclusiveGroup->current(), Q_NULLPTR)); @@ -133,11 +125,11 @@ void QQuickContainerPrivate::itemMoved(int from, int to) void QQuickContainerPrivate::removeItem(int index, QQuickItem *item) { + Q_Q(QQuickContainer); contentData.removeOne(item); if (exclusiveGroup && !exclusiveGroup->isCheckable(item)) return; - Q_Q(QQuickContainer); bool currentChanged = false; if (index == currentIndex) { q->setCurrentIndex(currentIndex - 1); @@ -152,16 +144,12 @@ void QQuickContainerPrivate::removeItem(int index, QQuickItem *item) if (exclusiveGroup) exclusiveGroup->removeCheckable(item); - itemRemoved(item); + q->itemRemoved(index, item); if (currentChanged) emit q->currentIndexChanged(); } -void QQuickContainerPrivate::itemRemoved(QQuickItem *) -{ -} - void QQuickContainerPrivate::_q_currentItemChanged() { Q_Q(QQuickContainer); @@ -541,6 +529,18 @@ void QQuickContainer::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem } } +void QQuickContainer::itemAdded(int index, QQuickItem *item) +{ + Q_UNUSED(index); + Q_UNUSED(item); +} + +void QQuickContainer::itemRemoved(int index, QQuickItem *item) +{ + Q_UNUSED(index); + Q_UNUSED(item); +} + QT_END_NAMESPACE #include "moc_qquickcontainer_p.cpp" |