aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-05 07:29:16 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-07 23:38:48 +0200
commit958cd3ee1094a068b6d0ff27c73a4b3caff088ad (patch)
tree6d3816fedf5dab2307675fd6ef70d39758e246f5 /tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
parente8e03215654ca730243336a80453cf9396cbdf58 (diff)
Port from container::count() and length() to size()
This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicktableview/tst_qquicktableview.cpp')
-rw-r--r--tests/auto/quick/qquicktableview/tst_qquicktableview.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
index 6c41f00c7d..67a77fd621 100644
--- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
@@ -297,7 +297,7 @@ void tst_QQuickTableView::emptyModel()
tableView->setModel(model);
WAIT_UNTIL_POLISHED;
- QCOMPARE(tableViewPrivate->loadedItems.count(), 0);
+ QCOMPARE(tableViewPrivate->loadedItems.size(), 0);
}
void tst_QQuickTableView::checkPreload_data()
@@ -739,7 +739,7 @@ void tst_QQuickTableView::checkForceLayoutWhenAllItemsAreHidden()
// Check that the we have no items loaded
QCOMPARE(tableViewPrivate->loadedColumns.count(), 0);
QCOMPARE(tableViewPrivate->loadedRows.count(), 0);
- QCOMPARE(tableViewPrivate->loadedItems.count(), 0);
+ QCOMPARE(tableViewPrivate->loadedItems.size(), 0);
// Tell all columns to be visible
view->rootObject()->setProperty(propertyName, 10);
@@ -747,7 +747,7 @@ void tst_QQuickTableView::checkForceLayoutWhenAllItemsAreHidden()
QCOMPARE(tableViewPrivate->loadedRows.count(), rows);
QCOMPARE(tableViewPrivate->loadedColumns.count(), columns);
- QCOMPARE(tableViewPrivate->loadedItems.count(), rows * columns);
+ QCOMPARE(tableViewPrivate->loadedItems.size(), rows * columns);
}
void tst_QQuickTableView::checkContentWidthAndHeight()
@@ -1131,7 +1131,7 @@ void tst_QQuickTableView::noDelegate()
WAIT_UNTIL_POLISHED;
items = tableViewPrivate->loadedItems;
- QCOMPARE(items.count(), rows * columns);
+ QCOMPARE(items.size(), rows * columns);
// And then unset the delegate again, and check
// that we end up with no items.
@@ -1220,11 +1220,11 @@ void tst_QQuickTableView::countDelegateItems()
// Check that tableview internals contain the expected number of items
auto const items = tableViewPrivate->loadedItems;
- QCOMPARE(items.count(), count);
+ QCOMPARE(items.size(), count);
// Check that this also matches the items found in the view
auto foundItems = findItems<QQuickItem>(tableView, kDelegateObjectName);
- QCOMPARE(foundItems.count(), count);
+ QCOMPARE(foundItems.size(), count);
}
void tst_QQuickTableView::checkLayoutOfEqualSizedDelegateItems_data()
@@ -2337,7 +2337,7 @@ void tst_QQuickTableView::checkRebuildViewportOnly()
// Set reuse items to false, just to make it easier to
// check the number of items created during a rebuild.
tableView->setReuseItems(false);
- const int itemCountBeforeRebuild = tableViewPrivate->loadedItems.count();
+ const int itemCountBeforeRebuild = tableViewPrivate->loadedItems.size();
// Since all cells have the same size, we expect that we end up creating
// the same amount of items that were already showing before, even after
@@ -2492,8 +2492,8 @@ void tst_QQuickTableView::hideRowsAndColumns()
WAIT_UNTIL_POLISHED;
- const int expectedRowCount = modelSize - rowsToHideList.count();
- const int expectedColumnCount = modelSize - columnsToHideList.count();
+ const int expectedRowCount = modelSize - rowsToHideList.size();
+ const int expectedColumnCount = modelSize - columnsToHideList.size();
QCOMPARE(tableViewPrivate->loadedRows.count(), expectedRowCount);
QCOMPARE(tableViewPrivate->loadedColumns.count(), expectedColumnCount);
@@ -2523,7 +2523,7 @@ void tst_QQuickTableView::hideAndShowFirstColumn()
WAIT_UNTIL_POLISHED;
- const int expectedColumnCount = modelSize - columnsToHideList.count();
+ const int expectedColumnCount = modelSize - columnsToHideList.size();
QCOMPARE(tableViewPrivate->loadedColumns.count(), expectedColumnCount);
QCOMPARE(tableViewPrivate->leftColumn(), 1);
QCOMPARE(tableView->contentX(), 0);
@@ -2561,7 +2561,7 @@ void tst_QQuickTableView::hideAndShowFirstRow()
WAIT_UNTIL_POLISHED;
- const int expectedRowsCount = modelSize - rowsToHideList.count();
+ const int expectedRowsCount = modelSize - rowsToHideList.size();
QCOMPARE(tableViewPrivate->loadedRows.count(), expectedRowsCount);
QCOMPARE(tableViewPrivate->topRow(), 1);
QCOMPARE(tableView->contentY(), 0);
@@ -3886,10 +3886,10 @@ void tst_QQuickTableView::leftRightTopBottomProperties()
QCOMPARE(tableView->rightColumn(), expectedTable.right());
QCOMPARE(tableView->bottomRow(), expectedTable.bottom());
- QCOMPARE(leftSpy.count(), expectedSignalCount.left());
- QCOMPARE(rightSpy.count(), expectedSignalCount.right());
- QCOMPARE(topSpy.count(), expectedSignalCount.top());
- QCOMPARE(bottomSpy.count(), expectedSignalCount.bottom());
+ QCOMPARE(leftSpy.size(), expectedSignalCount.left());
+ QCOMPARE(rightSpy.size(), expectedSignalCount.right());
+ QCOMPARE(topSpy.size(), expectedSignalCount.top());
+ QCOMPARE(bottomSpy.size(), expectedSignalCount.bottom());
}
void tst_QQuickTableView::checkContentSize_data()