aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/quicktemplates2/qquickcontainer.cpp17
-rw-r--r--src/quicktemplates2/qquickcontainer_p.h3
-rw-r--r--src/quicktemplates2/qquickdialogbuttonbox.cpp2
-rw-r--r--tests/auto/controls/data/tst_container.qml6
-rw-r--r--tests/auto/controls/data/tst_splitview.qml4
-rw-r--r--tests/auto/controls/data/tst_swipeview.qml14
-rw-r--r--tests/auto/controls/data/tst_tabbar.qml22
7 files changed, 22 insertions, 46 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index f38c2b09..505ac321 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -551,23 +551,6 @@ void QQuickContainer::moveItem(int from, int to)
}
/*!
- \deprecated
- \qmlmethod void QtQuick.Controls::Container::removeItem(int index)
-
- Use Container::removeItem(Item) or Container::takeItem(int) instead.
-*/
-void QQuickContainer::removeItem(const QVariant &var)
-{
- if (var.userType() == QMetaType::Nullptr)
- return;
-
- if (QQuickItem *item = var.value<QQuickItem *>())
- removeItem(item);
- else
- takeItem(var.toInt());
-}
-
-/*!
\since QtQuick.Controls 2.3 (Qt 5.10)
\qmlmethod void QtQuick.Controls::Container::removeItem(Item item)
diff --git a/src/quicktemplates2/qquickcontainer_p.h b/src/quicktemplates2/qquickcontainer_p.h
index 310aacd1..9deba199 100644
--- a/src/quicktemplates2/qquickcontainer_p.h
+++ b/src/quicktemplates2/qquickcontainer_p.h
@@ -78,8 +78,7 @@ public:
Q_INVOKABLE void addItem(QQuickItem *item);
Q_INVOKABLE void insertItem(int index, QQuickItem *item);
Q_INVOKABLE void moveItem(int from, int to);
- Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove
- void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE
+ Q_INVOKABLE void removeItem(QQuickItem *item);
// 2.3 (Qt 5.10)
Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index);
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index 651f78dc..df253add 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -435,7 +435,7 @@ void QQuickDialogButtonBoxPrivate::removeStandardButtons()
if (attached) {
QQuickDialogButtonBoxAttachedPrivate *p = QQuickDialogButtonBoxAttachedPrivate::get(attached);
if (p->standardButton != QPlatformDialogHelper::NoButton) {
- q->removeItem(i);
+ q->removeItem(button);
button->deleteLater();
}
}
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml
index 134dbb38..c04a3402 100644
--- a/tests/auto/controls/data/tst_container.qml
+++ b/tests/auto/controls/data/tst_container.qml
@@ -212,11 +212,5 @@ TestCase {
compare(control.count, 1)
wait(1)
verify(item3)
-
- // deprecated removeItem(int) does not destroy
- control.removeItem(0)
- compare(control.count, 0)
- wait(1)
- verify(item3)
}
}
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index ae8179b2..d78ef95a 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -1609,7 +1609,7 @@ TestCase {
verify(control)
while (control.count > 0)
- var itemToRemove = control.removeItem(0)
+ var itemToRemove = control.removeItem(control.itemAt(0))
// Shouldn't crash.
}
@@ -1940,7 +1940,7 @@ TestCase {
verify(firstHandle.SplitHandle.pressed)
// Then, remove it by removing the first item.
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
handles = findHandles(control)
firstHandle = null
compare(handles.length, 1)
diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index 5775491c..41826117 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -224,7 +224,7 @@ TestCase {
compare(control.itemAt(3).text, "2")
compare(control.itemAt(4).text, "5")
- control.removeItem(control.count - 1)
+ control.removeItem(control.itemAt(control.count - 1))
compare(control.count, 4)
compare(control.currentIndex, 3)
compare(control.currentItem.text, "2")
@@ -233,7 +233,7 @@ TestCase {
compare(control.itemAt(2).text, "3")
compare(control.itemAt(3).text, "2")
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 3)
compare(control.currentIndex, 2)
compare(control.currentItem.text, "2")
@@ -241,7 +241,7 @@ TestCase {
compare(control.itemAt(1).text, "3")
compare(control.itemAt(2).text, "2")
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(control.count, 2)
compare(control.currentIndex, 1)
compare(control.currentItem.text, "2")
@@ -250,14 +250,14 @@ TestCase {
currentItemChangedSpy.clear()
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(control.count, 1)
compare(control.currentIndex, 0)
compare(currentItemChangedSpy.count, 1)
compare(control.currentItem.text, "1")
compare(control.itemAt(0).text, "1")
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(currentItemChangedSpy.count, 2)
@@ -302,7 +302,7 @@ TestCase {
verify(compareObjectNames(control.contentData, ["object", "page1", "timer", "page2", "", "page3", "page4"]))
verify(compareObjectNames(control.contentChildren, ["page4", "page2", "page1", "page3"]))
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
verify(compareObjectNames(control.contentData, ["object", "page1", "timer", "page2", "", "page3"]))
verify(compareObjectNames(control.contentChildren, ["page2", "page1", "page3"]))
}
@@ -538,7 +538,7 @@ TestCase {
compare(page.isNextItem, false);
compare(page.isPreviousItem, false);
- control.removeItem(0);
+ control.removeItem(control.itemAt(0));
compare(control.count, 0);
compare(page.parent, null);
compare(page.view, null);
diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml
index 42e767f2..ce42632f 100644
--- a/tests/auto/controls/data/tst_tabbar.qml
+++ b/tests/auto/controls/data/tst_tabbar.qml
@@ -230,7 +230,7 @@ TestCase {
compare(control.itemAt(4).text, "5")
compare(contentChildrenSpy.count, 7)
- control.removeItem(control.count - 1)
+ control.removeItem(control.itemAt(control.count - 1))
compare(control.count, 4)
compare(control.currentIndex, 3)
compare(control.currentItem.text, "2")
@@ -240,7 +240,7 @@ TestCase {
compare(control.itemAt(3).text, "2")
compare(contentChildrenSpy.count, 8)
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 3)
compare(control.currentIndex, 2)
compare(control.currentItem.text, "2")
@@ -249,7 +249,7 @@ TestCase {
compare(control.itemAt(2).text, "2")
compare(contentChildrenSpy.count, 9)
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(control.count, 2)
compare(control.currentIndex, 1)
compare(control.currentItem.text, "2")
@@ -257,14 +257,14 @@ TestCase {
compare(control.itemAt(1).text, "2")
compare(contentChildrenSpy.count, 10)
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(control.count, 1)
compare(control.currentIndex, 0)
compare(control.currentItem.text, "1")
compare(control.itemAt(0).text, "1")
compare(contentChildrenSpy.count, 11)
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(contentChildrenSpy.count, 12)
@@ -280,15 +280,15 @@ TestCase {
compare(control.count, 3)
compare(control.currentIndex, 1)
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(control.count, 2)
compare(control.currentIndex, 0)
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 1)
compare(control.currentIndex, 0)
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(control.count, 0)
compare(control.currentIndex, -1)
}
@@ -338,7 +338,7 @@ TestCase {
verify(compareObjectNames(control.contentChildren, ["button4", "button2", "button1", "button3"]))
compare(contentChildrenSpy.count, 4)
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
verify(compareObjectNames(control.contentData, ["object", "button1", "timer", "button2", "", "button3"]))
verify(compareObjectNames(control.contentChildren, ["button2", "button1", "button3"]))
compare(contentChildrenSpy.count, 5)
@@ -705,7 +705,7 @@ TestCase {
compare(tab1.index, 3)
// remove from the beginning
- control.removeItem(0)
+ control.removeItem(control.itemAt(0))
compare(tab2.index, -1)
compare(tab2.tabBar, null)
compare(tab2.position, TabBar.Header)
@@ -715,7 +715,7 @@ TestCase {
compare(tab1.index, 2)
// remove from the middle
- control.removeItem(1)
+ control.removeItem(control.itemAt(1))
compare(tab3.index, -1)
compare(tab3.tabBar, null)
compare(tab3.position, TabBar.Header)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 07:12:11 +0000