From 958cd3ee1094a068b6d0ff27c73a4b3caff088ad Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 5 Oct 2022 07:29:16 +0200 Subject: 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()))).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 --- .../qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'tests/auto/qml/qqmlobjectmodel') diff --git a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp index 438dc3d3c2..4cbaa76225 100644 --- a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp +++ b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp @@ -65,81 +65,81 @@ void tst_QQmlObjectModel::changes() model.append(&item0); items.append(&item0); QCOMPARE(model.count(), ++count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 0, false)); // insert(0, item1) -> [item1, item0] model.insert(0, &item1); items.insert(0, &item1); QCOMPARE(model.count(), ++count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 0, false)); // append(item2) -> [item1, item0, item2] model.append(&item2); items.append(&item2); QCOMPARE(model.count(), ++count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 0, false)); // insert(2, item3) -> [item1, item0, item3, item2] model.insert(2, &item3); items.insert(2, &item3); QCOMPARE(model.count(), ++count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 0, false)); // move(0, 1) -> [item0, item1, item3, item2] model.move(0, 1); items.move(0, 1); QCOMPARE(model.count(), count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 1, true, 1)); // move(3, 2) -> [item0, item1, item2, item3] model.move(3, 2); items.move(3, 2); QCOMPARE(model.count(), count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 1, 1, true, 2)); // remove(0) -> [item1, item2, item3] model.remove(0); items.removeAt(0); QCOMPARE(model.count(), --count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 0, 1, false)); // remove(2) -> [item1, item2] model.remove(2); items.removeAt(2); QCOMPARE(model.count(), --count); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 0, 1, false)); // clear() -> [] model.clear(); items.clear(); QCOMPARE(model.count(), 0); QVERIFY(compareItems(&model, items)); - QCOMPARE(countSpy.count(), ++countSignals); - QCOMPARE(childrenSpy.count(), ++childrenSignals); - QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals); + QCOMPARE(countSpy.size(), ++countSignals); + QCOMPARE(childrenSpy.size(), ++childrenSignals); + QCOMPARE(modelUpdateSpy.size(), ++modelUpdateSignals); QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value(), 0, 2, false)); } -- cgit v1.2.3