diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qsensor/test_backends.cpp | 11 | ||||
-rw-r--r-- | tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp | 3 | ||||
-rw-r--r-- | tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/tests/auto/qsensor/test_backends.cpp b/tests/auto/qsensor/test_backends.cpp index 4dde98fe..991f0874 100644 --- a/tests/auto/qsensor/test_backends.cpp +++ b/tests/auto/qsensor/test_backends.cpp @@ -56,26 +56,25 @@ class BackendFactory : public QSensorBackendFactory { QSensorBackend *createBackend(QSensor *sensor) override { - foreach (const Record &record, records) { - if (sensor->identifier() == record.type) { + for (const Record &record : records) { + if (sensor->identifier() == record.type) return record.func(sensor); - } } return 0; - }; + } }; static BackendFactory factory; void register_test_backends() { - foreach (const Record &record, records) { + for (const Record &record : records) { QSensorManager::registerBackend(record.type, record.type, &factory); } } void unregister_test_backends() { - foreach (const Record &record, records) { + for (const Record &record : records) { QSensorManager::unregisterBackend(record.type, record.type); } } diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp index 1aaa13e8..2d5ac2a3 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp @@ -56,9 +56,8 @@ handled through the detected(const QString &) signal. QStringList QTestSensorGestureDupPlugin::gestureSignals() const { QStringList list; - Q_FOREACH (const QSensorGestureRecognizer* rec,recognizersList) { + for (const QSensorGestureRecognizer* rec : recognizersList) list.append(rec->gestureSignals()); - } return list; } diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp index 99884ccb..dcf1f523 100644 --- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp +++ b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp @@ -286,7 +286,7 @@ void Tst_qsensorgestureTest::tst_sensor_gesture_signals() testidList << "QtSensors.test"; testidList << "QtSensors.test2"; - Q_FOREACH (const QString &plugin, testidList) { + for (const QString &plugin : testidList) { QScopedPointer<QSensorGesture> thisGesture(new QSensorGesture(QStringList() << plugin)); |