5 files changed, 28 insertions, 29 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"
diff --git a/src/templates/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h
index 2ce573b1..eec54b52 100644
--- a/src/templates/qquickcontainer_p.h
+++ b/src/templates/qquickcontainer_p.h
@@ -104,6 +104,9 @@ protected:
     void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE;
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE;
 
+    virtual void itemAdded(int index, QQuickItem *item);
+    virtual void itemRemoved(int index, QQuickItem *item);
+
 private:
     Q_DISABLE_COPY(QQuickContainer)
     Q_DECLARE_PRIVATE(QQuickContainer)
diff --git a/src/templates/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h
index 001e6956..38e5e055 100644
--- a/src/templates/qquickcontainer_p_p.h
+++ b/src/templates/qquickcontainer_p_p.h
@@ -68,11 +68,8 @@ public:
 
     QQuickItem *itemAt(int index) const;
     void insertItem(int index, QQuickItem *item);
-    virtual void itemInserted(int index, QQuickItem *item);
     void moveItem(int from, int to);
-    virtual void itemMoved(int from, int to);
     void removeItem(int index, QQuickItem *item);
-    virtual void itemRemoved(QQuickItem *item);
 
     void _q_currentItemChanged();
     void _q_currentIndexChanged();
diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp
index 381f064d..2f0dee54 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/templates/qquickswipeview.cpp
@@ -78,8 +78,6 @@ public:
     void resizeItem(QQuickItem *item);
     void resizeItems();
 
-    void itemInserted(int index, QQuickItem *item) Q_DECL_OVERRIDE;
-
     static QQuickSwipeViewPrivate *get(QQuickSwipeView *view);
 };
 
@@ -94,13 +92,6 @@ void QQuickSwipeViewPrivate::resizeItems()
     }
 }
 
-void QQuickSwipeViewPrivate::itemInserted(int, QQuickItem *item)
-{
-    Q_Q(QQuickSwipeView);
-    if (q->isComponentComplete())
-        item->setSize(QSizeF(contentItem->width(), contentItem->height()));
-}
-
 QQuickSwipeViewPrivate *QQuickSwipeViewPrivate::get(QQuickSwipeView *view)
 {
     return view->d_func();
@@ -131,6 +122,13 @@ void QQuickSwipeView::geometryChanged(const QRectF &newGeometry, const QRectF &o
     d->resizeItems();
 }
 
+void QQuickSwipeView::itemAdded(int, QQuickItem *item)
+{
+    Q_D(QQuickSwipeView);
+    if (isComponentComplete())
+        item->setSize(QSizeF(d->contentItem->width(), d->contentItem->height()));
+}
+
 /*!
     \qmlattachedproperty int Qt.labs.controls::SwipeView::index
 
diff --git a/src/templates/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h
index 6dbdcf09..a40c831e 100644
--- a/src/templates/qquickswipeview_p.h
+++ b/src/templates/qquickswipeview_p.h
@@ -66,6 +66,7 @@ public:
 
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+    void itemAdded(int index, QQuickItem *item) Q_DECL_OVERRIDE;
 
 private:
     Q_DISABLE_COPY(QQuickSwipeView)