From 4d975c3ffc47e4d67609bf3dd9eb487ba7fdf376 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Apr 2022 14:12:32 +0200 Subject: Port simple cases of count() to size() The count() methods on QByteArray and QString are deprecated. The ones on other Qt containers will likely follow soon, so port them all to size(). The changes which also require int -> qsizetype will come in a follow-up patch. Pick-to: 6.3 Change-Id: I23e364019b9cfc457d93f4a3bb4660fe8d790da8 Reviewed-by: Ivan Solovev Reviewed-by: Juha Vuolle Reviewed-by: Qt CI Bot --- .../tst_qbluetoothservicediscoveryagent.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp') diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index e1ef9591..83c79503 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -133,7 +133,7 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase() } // Expect finished signal with no error - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); devices = discoveryAgent.discoveredDevices(); @@ -153,12 +153,12 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryStop() discoveryAgent.start(QBluetoothServiceDiscoveryAgent::FullDiscovery); QVERIFY(discoveryAgent.isActive()); discoveryAgent.stop(); - QTRY_COMPARE(canceledSpy.count(), 1); + QTRY_COMPARE(canceledSpy.size(), 1); QVERIFY(!discoveryAgent.isActive()); // Wait a bit to see that there are no latent signals QTest::qWait(200); - QCOMPARE(canceledSpy.count(), 1); - QCOMPARE(finishedSpy.count(), 0); + QCOMPARE(canceledSpy.size(), 1); + QCOMPARE(finishedSpy.size(), 0); } @@ -431,13 +431,13 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery() // Expect finished signal with no error if (scanTime) - QVERIFY(finishedSpy.count() == 1); + QVERIFY(finishedSpy.size() == 1); QVERIFY(errorSpy.isEmpty()); //if (!discoveryAgent.discoveredServices().isEmpty() && expected_failures++ <2){ if (discoveredSpy.isEmpty()) { - qDebug() << "Device failed to return any results, skipping device" << discoveryAgent.discoveredServices().count(); + qDebug() << "Device failed to return any results, skipping device" << discoveryAgent.discoveredServices().size(); return; } -- cgit v1.2.3