diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-08-14 11:08:18 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-08-15 07:56:46 +0000 |
| commit | a0ade068004ad869d6235ae8d6cd5e2050bf765d (patch) | |
| tree | 42c949ba2fa7fcd4ab5356293d1ef3cad1c436f6 /tests/auto/qbluetoothtransfermanager | |
| parent | 84f0e76c647e7f09529b79525b2d4fbc698576d8 (diff) | |
Replace foreach with for loop and set QT_NO_FOREACH
To avoid unnecessary copies, const is used wherever possible.
Change-Id: Ic743716512751cfd24fad5bd37c244b115dd26fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/qbluetoothtransfermanager')
| -rw-r--r-- | tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp index f69644c6..6b0481a5 100644 --- a/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp +++ b/tests/auto/qbluetoothtransfermanager/tst_qbluetoothtransfermanager.cpp @@ -143,14 +143,15 @@ void tst_QBluetoothTransferManager::tst_request() QFETCH(tst_QBluetoothTransferManager_QParameterMap, parameters); QBluetoothTransferRequest transferRequest(address); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + const QList<QBluetoothTransferRequest::Attribute> attributes = parameters.keys(); + for (QBluetoothTransferRequest::Attribute key : attributes) QCOMPARE(transferRequest.attribute(key), QVariant()); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + for (QBluetoothTransferRequest::Attribute key : attributes) transferRequest.setAttribute((QBluetoothTransferRequest::Attribute)key, parameters[key]); QCOMPARE(transferRequest.address(), address); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + for (QBluetoothTransferRequest::Attribute key : attributes) QCOMPARE(transferRequest.attribute(key), parameters[key]); //test copy constructor @@ -158,17 +159,17 @@ void tst_QBluetoothTransferManager::tst_request() QVERIFY(constructorCopy == transferRequest); QVERIFY(!(constructorCopy != transferRequest)); QCOMPARE(constructorCopy.address(), address); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + for (QBluetoothTransferRequest::Attribute key : attributes) QCOMPARE(constructorCopy.attribute(key), parameters[key]); //test assignment operator QBluetoothTransferRequest request; QVERIFY(request.address().isNull()); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + for (QBluetoothTransferRequest::Attribute key : attributes) QCOMPARE(request.attribute(key), QVariant()); request = transferRequest; QCOMPARE(request.address(), address); - foreach (QBluetoothTransferRequest::Attribute key, parameters.keys()) + for (QBluetoothTransferRequest::Attribute key : attributes) QCOMPARE(request.attribute(key), parameters[key]); //test that it's a true and independent copy |