Port from container::count() and length() to size() - V5

This is the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.

Like in dev, added two NOLINTNEXTLINEs in tst_qbitarray and
tst_qcontiguouscache, to avoid porting calls that explicitly test
count().

Change-Id: I9621dee5ed328b47e78919a34c307105e4311903
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 38 insertions, 38 deletions

diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 200b7a5f51..a6047d80bf 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -732,7 +732,7 @@ void tst_QTouchEvent::basicRawEventTranslation()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(!touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchBeginPoints.count(), 1);
+    QCOMPARE(touchWidget.touchBeginPoints.size(), 1);
     QCOMPARE(touchWidget.timestamp, timestamp);
     QEventPoint touchBeginPoint = touchWidget.touchBeginPoints.first();
     QCOMPARE(touchBeginPoint.id(), 0);
@@ -762,7 +762,7 @@ void tst_QTouchEvent::basicRawEventTranslation()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 1);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 1);
     QEventPoint touchUpdatePoint = touchWidget.touchUpdatePoints.first();
     QCOMPARE(touchUpdatePoint.id(), 0);
     QCOMPARE(touchUpdatePoint.state(), rawTouchPoint.state());
@@ -790,7 +790,7 @@ void tst_QTouchEvent::basicRawEventTranslation()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchEndPoints.count(), 1);
+    QCOMPARE(touchWidget.touchEndPoints.size(), 1);
     QEventPoint touchEndPoint = touchWidget.touchEndPoints.first();
     QCOMPARE(touchEndPoint.id(), 0);
     QCOMPARE(touchEndPoint.state(), rawTouchPoint.state());
@@ -859,8 +859,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     QVERIFY(rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchBeginPoints.count(), 1);
-    QCOMPARE(rightWidget.touchBeginPoints.count(), 1);
+    QCOMPARE(leftWidget.touchBeginPoints.size(), 1);
+    QCOMPARE(rightWidget.touchBeginPoints.size(), 1);
     const int touchPointId0 = 0;
     const int touchPointId1 = touchPointId0 + 1;
     {
@@ -907,8 +907,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     QVERIFY(rightWidget.seenTouchBegin);
     QVERIFY(rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchUpdatePoints.count(), 1);
-    QCOMPARE(rightWidget.touchUpdatePoints.count(), 1);
+    QCOMPARE(leftWidget.touchUpdatePoints.size(), 1);
+    QCOMPARE(rightWidget.touchUpdatePoints.size(), 1);
     {
         const QEventPoint &leftTouchPoint = leftWidget.touchUpdatePoints.first();
         QCOMPARE(leftTouchPoint.id(), touchPointId0);
@@ -953,8 +953,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     QVERIFY(rightWidget.seenTouchBegin);
     QVERIFY(rightWidget.seenTouchUpdate);
     QVERIFY(rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchEndPoints.count(), 1);
-    QCOMPARE(rightWidget.touchEndPoints.count(), 1);
+    QCOMPARE(leftWidget.touchEndPoints.size(), 1);
+    QCOMPARE(rightWidget.touchEndPoints.size(), 1);
     {
         const QEventPoint &leftTouchPoint = leftWidget.touchEndPoints.first();
         QCOMPARE(leftTouchPoint.id(), touchPointId0);
@@ -1012,7 +1012,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(!touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchBeginPoints.count(), 1);
+    QCOMPARE(touchWidget.touchBeginPoints.size(), 1);
     QCOMPARE(touchWidget.timestamp, timestamp);
     QEventPoint touchBeginPoint = touchWidget.touchBeginPoints.first();
     QCOMPARE(touchBeginPoint.id(), 1);
@@ -1027,7 +1027,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QWindowSystemInterface::handleTouchEvent(window, ++timestamp, secondaryTouchScreenDevice, nativeTouchPoints);
     QCoreApplication::processEvents();
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchBeginPoints.count(), 1);
+    QCOMPARE(touchWidget.touchBeginPoints.size(), 1);
     QCOMPARE(touchWidget.timestamp, timestamp);
     touchBeginPoint = touchWidget.touchBeginPoints[0];
     QCOMPARE(touchBeginPoint.id(), 10);
@@ -1042,7 +1042,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QWindowSystemInterface::handleTouchEvent(window, ++timestamp, secondaryTouchScreenDevice, nativeTouchPoints);
     QCoreApplication::processEvents();
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchBeginPoints.count(), 1);
+    QCOMPARE(touchWidget.touchBeginPoints.size(), 1);
     QCOMPARE(touchWidget.timestamp, timestamp);
     touchBeginPoint = touchWidget.touchBeginPoints[0];
     QCOMPARE(touchBeginPoint.id(), 11);
@@ -1058,7 +1058,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 1);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 1);
     QEventPoint touchUpdatePoint = touchWidget.touchUpdatePoints.first();
     QCOMPARE(touchUpdatePoint.id(), 1);
     QCOMPARE(touchUpdatePoint.state(), QEventPoint::State::Updated);
@@ -1073,7 +1073,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchEndPoints.count(), 1);
+    QCOMPARE(touchWidget.touchEndPoints.size(), 1);
     QEventPoint touchEndPoint = touchWidget.touchEndPoints.first();
     QCOMPARE(touchEndPoint.id(), 1);
     QCOMPARE(touchEndPoint.state(), QEventPoint::State::Released);
@@ -1098,7 +1098,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 2);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 2);
     QCOMPARE(touchWidget.touchUpdatePoints[0].id(), 10);
     QCOMPARE(touchWidget.touchUpdatePoints[1].id(), 11);
 
@@ -1113,7 +1113,7 @@ void tst_QTouchEvent::touchOnMultipleTouchscreens()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchEndPoints.count(), 1);
+    QCOMPARE(touchWidget.touchEndPoints.size(), 1);
     touchEndPoint = touchWidget.touchEndPoints.first();
     QCOMPARE(touchEndPoint.id(), 11);
     QCOMPARE(touchEndPoint.state(), QEventPoint::State::Released);
@@ -1188,8 +1188,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchPad()
     QVERIFY(!rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchBeginPoints.count(), 2);
-    QCOMPARE(rightWidget.touchBeginPoints.count(), 0);
+    QCOMPARE(leftWidget.touchBeginPoints.size(), 2);
+    QCOMPARE(rightWidget.touchBeginPoints.size(), 0);
     {
         QEventPoint leftTouchPoint = leftWidget.touchBeginPoints.at(0);
         qCDebug(lcTests) << "lastNormalizedPositions after press" << leftWidget.lastNormalizedPositions;
@@ -1250,8 +1250,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchPad()
     QVERIFY(!rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchUpdatePoints.count(), 2);
-    QCOMPARE(rightWidget.touchUpdatePoints.count(), 0);
+    QCOMPARE(leftWidget.touchUpdatePoints.size(), 2);
+    QCOMPARE(rightWidget.touchUpdatePoints.size(), 0);
     {
         QEventPoint leftTouchPoint = leftWidget.touchUpdatePoints.at(0);
         qCDebug(lcTests) << "lastNormalizedPositions after update" << leftWidget.lastNormalizedPositions;
@@ -1312,8 +1312,8 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchPad()
     QVERIFY(!rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchEndPoints.count(), 2);
-    QCOMPARE(rightWidget.touchEndPoints.count(), 0);
+    QCOMPARE(leftWidget.touchEndPoints.size(), 2);
+    QCOMPARE(rightWidget.touchEndPoints.size(), 0);
     {
         QEventPoint leftTouchPoint = leftWidget.touchEndPoints.at(0);
         qCDebug(lcTests) << "lastNormalizedPositions after release" << leftWidget.lastNormalizedPositions;
@@ -1396,16 +1396,16 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(!touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchBeginPoints.count(), 2);
+    QCOMPARE(touchWidget.touchBeginPoints.size(), 2);
 
-    for (int i = 0; i < touchWidget.touchBeginPoints.count(); ++i) {
+    for (int i = 0; i < touchWidget.touchBeginPoints.size(); ++i) {
         QEventPoint touchBeginPoint = touchWidget.touchBeginPoints.at(i);
         QCOMPARE(touchBeginPoint.id(), i);
         QCOMPARE(touchBeginPoint.state(), rawTouchPoints[i].state());
     }
 
     // moving the point should translate to TouchUpdate
-    for (int i = 0; i < rawTouchPoints.count(); ++i) {
+    for (int i = 0; i < rawTouchPoints.size(); ++i) {
         auto &p = rawTouchPoints[i];
         QMutableEventPoint::setState(p, QEventPoint::State::Updated);
         QMutableEventPoint::setGlobalPosition(p, p.globalPosition() + delta);
@@ -1417,7 +1417,7 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 2);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 2);
     QCOMPARE(touchWidget.touchUpdatePoints.at(0).id(), 0);
     QCOMPARE(touchWidget.touchUpdatePoints.at(1).id(), 1);
 
@@ -1432,7 +1432,7 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QCOMPARE(touchWidget.seenTouchEnd, false);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 2);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 2);
     QCOMPARE(touchWidget.touchUpdatePoints[0].id(), 0);
     QCOMPARE(touchWidget.touchUpdatePoints[1].id(), 1);
 
@@ -1446,7 +1446,7 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(!touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 2);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 2);
     QCOMPARE(touchWidget.touchUpdatePoints[0].id(), 0);
     QCOMPARE(touchWidget.touchUpdatePoints[1].id(), 42);
 
@@ -1460,7 +1460,7 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     QVERIFY(touchWidget.seenTouchBegin);
     QVERIFY(touchWidget.seenTouchUpdate);
     QVERIFY(touchWidget.seenTouchEnd);
-    QCOMPARE(touchWidget.touchUpdatePoints.count(), 2);
+    QCOMPARE(touchWidget.touchUpdatePoints.size(), 2);
     QCOMPARE(touchWidget.touchUpdatePoints[0].id(), 0);
     QCOMPARE(touchWidget.touchUpdatePoints[1].id(), 42);
 }
@@ -1824,25 +1824,25 @@ void tst_QTouchEvent::testQGuiAppDelivery()
     // Now the real thing.
     QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchBegin
     QCoreApplication::processEvents();
-    QCOMPARE(filter.d.count(), 1);
+    QCOMPARE(filter.d.size(), 1);
     QCOMPARE(filter.d.contains(touchScreenDevice), true);
-    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 1);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.size(), 1);
     QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchBegin);
 
     points[0].state = QEventPoint::State::Updated;
     QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchUpdate
     QCoreApplication::processEvents();
-    QCOMPARE(filter.d.count(), 1);
+    QCOMPARE(filter.d.size(), 1);
     QCOMPARE(filter.d.contains(touchScreenDevice), true);
-    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 2);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.size(), 2);
     QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchUpdate);
 
     points[0].state = QEventPoint::State::Released;
     QWindowSystemInterface::handleTouchEvent(&w, touchScreenDevice, points); // TouchEnd
     QCoreApplication::processEvents();
-    QCOMPARE(filter.d.count(), 1);
+    QCOMPARE(filter.d.size(), 1);
     QCOMPARE(filter.d.contains(touchScreenDevice), true);
-    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 3);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.size(), 3);
     QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchEnd);
 }
 
@@ -1885,8 +1885,8 @@ void tst_QTouchEvent::testMultiDevice()
 
     QCOMPARE(filter.d.value(touchScreenDevice).lastSeenType, QEvent::TouchBegin);
     QCOMPARE(filter.d.value(deviceTwo).lastSeenType, QEvent::TouchBegin);
-    QCOMPARE(filter.d.value(touchScreenDevice).points.count(), 1);
-    QCOMPARE(filter.d.value(deviceTwo).points.count(), 2);
+    QCOMPARE(filter.d.value(touchScreenDevice).points.size(), 1);
+    QCOMPARE(filter.d.value(deviceTwo).points.size(), 2);
 
     QCOMPARE(filter.d.value(touchScreenDevice).points.at(0).globalPosition(), area0.center());
     // This fails because QGuiApplicationPrivate::processTouchEvent() sends synth-mouse events
@@ -1941,7 +1941,7 @@ void tst_QTouchEvent::grabbers()
 
     // Ensure that grabbers are persistent between events, within the stored touchpoints
     QCOMPARE(devPriv->pointById(0)->exclusiveGrabber, grabExclusive ? &w : nullptr);
-    QCOMPARE(devPriv->pointById(0)->passiveGrabbers.count(), grabPassive ? 1 : 0);
+    QCOMPARE(devPriv->pointById(0)->passiveGrabbers.size(), grabPassive ? 1 : 0);
     if (grabPassive)
         QCOMPARE(devPriv->pointById(0)->passiveGrabbers.first(), &w);