1 files changed, 39 insertions, 39 deletions

diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 5bdc3c9269..cbb0fdcc0c 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -346,7 +346,7 @@ void tst_QListWidget::addItems()
                                  QString::number(testWidget->count() + 3),
                                  label};
     testWidget->addItems(stringList);
-    QCOMPARE(testWidget->count(), count + stringList.count());
+    QCOMPARE(testWidget->count(), count + stringList.size());
     QCOMPARE(testWidget->item(testWidget->count()-1)->text(), label);
 }
 
@@ -358,30 +358,30 @@ void tst_QListWidget::openPersistentEditor()
     QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->openPersistentEditor(item);
 
-    int childCount = testWidget->viewport()->children().count();
+    int childCount = testWidget->viewport()->children().size();
     testWidget->addItem(item);
     testWidget->openPersistentEditor(item);
-    QCOMPARE(childCount + 1, testWidget->viewport()->children().count());
+    QCOMPARE(childCount + 1, testWidget->viewport()->children().size());
 }
 
 void tst_QListWidget::closePersistentEditor()
 {
     // Boundary checking
-    int childCount = testWidget->viewport()->children().count();
+    int childCount = testWidget->viewport()->children().size();
     testWidget->closePersistentEditor(nullptr);
     QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
     testWidget->closePersistentEditor(item);
-    QCOMPARE(childCount, testWidget->viewport()->children().count());
+    QCOMPARE(childCount, testWidget->viewport()->children().size());
 
     // Create something
     testWidget->addItem(item);
     testWidget->openPersistentEditor(item);
 
     // actual test
-    childCount = testWidget->viewport()->children().count();
+    childCount = testWidget->viewport()->children().size();
     testWidget->closePersistentEditor(item);
     QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
-    QCOMPARE(testWidget->viewport()->children().count(), childCount - 1);
+    QCOMPARE(testWidget->viewport()->children().size(), childCount - 1);
 }
 
 void tst_QListWidget::setItemHidden()
@@ -531,7 +531,7 @@ void tst_QListWidget::editItem()
         item->setFlags(item->flags() | Qt::ItemIsEditable);
     testWidget->addItem(item);
 
-    int childCount = testWidget->viewport()->children().count();
+    int childCount = testWidget->viewport()->children().size();
     QWidget *existsAlready = testWidget->indexWidget(testWidget->model()->index(testWidget->row(item), 0));
     testWidget->editItem(item);
     Qt::ItemFlags flags = item->flags();
@@ -547,7 +547,7 @@ void tst_QListWidget::editItem()
         }
         QVERIFY(found);
     } else {
-        QCOMPARE(testWidget->viewport()->children().count(), childCount);
+        QCOMPARE(testWidget->viewport()->children().size(), childCount);
     }
 }
 
@@ -576,8 +576,8 @@ void tst_QListWidget::insertItem_data()
 
     QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0;
     QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0;
-    QTest::newRow("Insert beyond count") << initialItems << initialItems.count()+1 << "inserted" << initialItems.count();
-    QTest::newRow("Insert at count") << initialItems << initialItems.count() << "inserted" << initialItems.count();
+    QTest::newRow("Insert beyond count") << initialItems << initialItems.size()+1 << "inserted" << initialItems.size();
+    QTest::newRow("Insert at count") << initialItems << initialItems.size() << "inserted" << initialItems.size();
     QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1;
 }
 
@@ -589,7 +589,7 @@ void tst_QListWidget::insertItem()
     QFETCH(int, expectedIndex);
 
     testWidget->insertItems(0, initialItems);
-    QCOMPARE(testWidget->count(), initialItems.count());
+    QCOMPARE(testWidget->count(), initialItems.size());
 
     testWidget->insertItem(insertIndex, itemLabel);
 
@@ -598,7 +598,7 @@ void tst_QListWidget::insertItem()
     QCOMPARE(rcFirst[RowsInserted], expectedIndex);
     QCOMPARE(rcLast[RowsInserted], expectedIndex);
 
-    QCOMPARE(testWidget->count(), initialItems.count() + 1);
+    QCOMPARE(testWidget->count(), initialItems.size() + 1);
     QCOMPARE(testWidget->item(expectedIndex)->text(), itemLabel);
 }
 
@@ -671,8 +671,8 @@ void tst_QListWidget::insertItems()
     for (int i = 0; i < testWidget->count(); ++i)
         QCOMPARE(testWidget->item(i)->listWidget(), testWidget);
 
-    QCOMPARE(itemChangedSpy.count(), 0);
-    QCOMPARE(dataChangedSpy.count(), 0);
+    QCOMPARE(itemChangedSpy.size(), 0);
+    QCOMPARE(dataChangedSpy.size(), 0);
 }
 
 void tst_QListWidget::itemAssignment()
@@ -845,7 +845,7 @@ void tst_QListWidget::selectedItems()
 
     // check that the correct number of items and the expected items are there
     QList<QListWidgetItem *> selectedItems = testWidget->selectedItems();
-    QCOMPARE(selectedItems.size(), expectedRows.count());
+    QCOMPARE(selectedItems.size(), expectedRows.size());
     for (int row : expectedRows)
         QVERIFY(selectedItems.contains(testWidget->item(row)));
 
@@ -941,20 +941,20 @@ void tst_QListWidget::moveItemsPriv()
         else
             QCOMPARE(testWidget->item(dstRow)->text(), QString::number(srcRow));
 
-        QCOMPARE(beginMoveSpy.count(), 1);
+        QCOMPARE(beginMoveSpy.size(), 1);
         const QList<QVariant> &beginMoveArgs = beginMoveSpy.takeFirst();
         QCOMPARE(beginMoveArgs.at(1).toInt(), srcRow);
         QCOMPARE(beginMoveArgs.at(2).toInt(), srcRow);
         QCOMPARE(beginMoveArgs.at(4).toInt(), dstRow);
 
-        QCOMPARE(movedSpy.count(), 1);
+        QCOMPARE(movedSpy.size(), 1);
         const QList<QVariant> &movedArgs = movedSpy.takeFirst();
         QCOMPARE(movedArgs.at(1).toInt(), srcRow);
         QCOMPARE(movedArgs.at(2).toInt(), srcRow);
         QCOMPARE(movedArgs.at(4).toInt(), dstRow);
     } else {
-        QCOMPARE(beginMoveSpy.count(), 0);
-        QCOMPARE(movedSpy.count(), 0);
+        QCOMPARE(beginMoveSpy.size(), 0);
+        QCOMPARE(movedSpy.size(), 0);
     }
 }
 
@@ -1047,7 +1047,7 @@ void tst_QListWidget::sortItems()
 
     testWidget->sortItems(order);
 
-    QCOMPARE(testWidget->count(), expectedList.count());
+    QCOMPARE(testWidget->count(), expectedList.size());
     for (int i = 0; i < testWidget->count(); ++i)
         QCOMPARE(testWidget->item(i)->text(), expectedList.at(i).toString());
 
@@ -1117,7 +1117,7 @@ void tst_QListWidget::sortHiddenItems()
     tw->setSortingEnabled(true);
     tw->sortItems(order);
 
-    QCOMPARE(tw->count(), expectedList.count());
+    QCOMPARE(tw->count(), expectedList.size());
     for (int i = 0; i < tw->count(); ++i) {
         QCOMPARE(tw->item(i)->text(), expectedList.at(i));
         QCOMPARE(tw->item(i)->isHidden(), !expectedVisibility.at(i));
@@ -1214,17 +1214,17 @@ void tst_QListWidget::setData()
     QFETCH(QVariantList, values);
     QFETCH(int, expectedSignalCount);
 
-    QCOMPARE(roles.count(), values.count());
+    QCOMPARE(roles.size(), values.size());
 
     for (int manipulateModel = 0; manipulateModel < 2; ++manipulateModel) {
         testWidget->clear();
         testWidget->insertItems(0, initialItems);
-        QCOMPARE(testWidget->count(), initialItems.count());
+        QCOMPARE(testWidget->count(), initialItems.size());
 
         QSignalSpy itemChanged(testWidget, &QListWidget::itemChanged);
         QSignalSpy dataChanged(testWidget->model(), &QAbstractItemModel::dataChanged);
 
-        for (int i = 0; i < roles.count(); ++i) {
+        for (int i = 0; i < roles.size(); ++i) {
             if (manipulateModel)
                 testWidget->model()->setData(
                     testWidget->model()->index(itemIndex, 0, testWidget->rootIndex()),
@@ -1235,12 +1235,12 @@ void tst_QListWidget::setData()
         }
 
         // make sure the data is actually set
-        for (int i = 0; i < roles.count(); ++i)
+        for (int i = 0; i < roles.size(); ++i)
             QCOMPARE(testWidget->item(itemIndex)->data(roles.at(i)), values.at(i));
 
         // make sure we get the right number of emits
-        QCOMPARE(itemChanged.count(), expectedSignalCount);
-        QCOMPARE(dataChanged.count(), expectedSignalCount);
+        QCOMPARE(itemChanged.size(), expectedSignalCount);
+        QCOMPARE(dataChanged.size(), expectedSignalCount);
     }
 }
 
@@ -1382,7 +1382,7 @@ void tst_QListWidget::insertItemsWithSorting()
                     w.addItem(str);
                 break;
         }
-        QCOMPARE(w.count(), expectedItems.count());
+        QCOMPARE(w.count(), expectedItems.size());
         for (int i = 0; i < w.count(); ++i)
             QCOMPARE(w.item(i)->text(), expectedItems.at(i));
 
@@ -1526,7 +1526,7 @@ void tst_QListWidget::changeDataWithSorting()
 
     QListWidgetItem *item = w.item(itemIndex);
     item->setText(newValue);
-    for (int i = 0; i < expectedItems.count(); ++i) {
+    for (int i = 0; i < expectedItems.size(); ++i) {
         QCOMPARE(w.item(i)->text(), expectedItems.at(i));
         for (int j = 0; j < persistent.size(); ++j) {
             if (persistent.at(j).row() == i) // the same toplevel row
@@ -1537,8 +1537,8 @@ void tst_QListWidget::changeDataWithSorting()
     for (int k = 0; k < persistent.size(); ++k)
         QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
 
-    QCOMPARE(dataChangedSpy.count(), 1);
-    QCOMPARE(layoutChangedSpy.count(), reorderingExpected ? 1 : 0);
+    QCOMPARE(dataChangedSpy.size(), 1);
+    QCOMPARE(layoutChangedSpy.size(), reorderingExpected ? 1 : 0);
 }
 
 void tst_QListWidget::itemWidget()
@@ -1617,7 +1617,7 @@ void tst_QListWidget::insertUnchanged()
     QListWidget w;
     QSignalSpy itemChangedSpy(&w, &QListWidget::itemChanged);
     QListWidgetItem item("foo", &w);
-    QCOMPARE(itemChangedSpy.count(), 0);
+    QCOMPARE(itemChangedSpy.size(), 0);
 }
 
 void tst_QListWidget::setSortingEnabled()
@@ -1708,12 +1708,12 @@ void tst_QListWidget::QTBUG8086_currentItemChangedOnClick()
 
     QVERIFY(QTest::qWaitForWindowExposed(&win));
 
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     QTest::mouseClick(list.viewport(), Qt::LeftButton, {},
                       list.visualItemRect(list.item(2)).center());
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 
@@ -1812,14 +1812,14 @@ void tst_QListWidget::QTBUG50891_ensureSelectionModelSignalConnectionsAreSet()
     QSignalSpy currentItemChangedSpy(&list, &QListWidget::currentItemChanged);
     QSignalSpy itemSelectionChangedSpy(&list, &QListWidget::itemSelectionChanged);
 
-    QCOMPARE(currentItemChangedSpy.count(), 0);
-    QCOMPARE(itemSelectionChangedSpy.count(), 0);
+    QCOMPARE(currentItemChangedSpy.size(), 0);
+    QCOMPARE(itemSelectionChangedSpy.size(), 0);
 
     QTest::mouseClick(list.viewport(), Qt::LeftButton, {},
                       list.visualItemRect(list.item(2)).center());
 
-    QCOMPARE(currentItemChangedSpy.count(), 1);
-    QCOMPARE(itemSelectionChangedSpy.count(), 1);
+    QCOMPARE(currentItemChangedSpy.size(), 1);
+    QCOMPARE(itemSelectionChangedSpy.size(), 1);
 
 }