diff options
Diffstat (limited to 'tests')
4 files changed, 11 insertions, 14 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)); diff --git a/tests/manual/sensor_explorer/explorer.cpp b/tests/manual/sensor_explorer/explorer.cpp index d2a85f91..112829c7 100644 --- a/tests/manual/sensor_explorer/explorer.cpp +++ b/tests/manual/sensor_explorer/explorer.cpp @@ -62,9 +62,9 @@ void Explorer::loadSensors() // Clear out anything that's in there now ui.sensors->clear(); - foreach (const QByteArray &type, QSensor::sensorTypes()) { + for (const QByteArray &type : QSensor::sensorTypes()) { qDebug() << "Found type" << type; - foreach (const QByteArray &identifier, QSensor::sensorsForType(type)) { + for (const QByteArray &identifier : QSensor::sensorsForType(type)) { qDebug() << "Found identifier" << identifier; // Don't put in sensors we can't connect to QSensor sensor(type); @@ -231,7 +231,7 @@ void Explorer::loadSensorProperties() if (typeName == "qrangelist") { qrangelist rl = v.value<qrangelist>(); QStringList out; - foreach (const qrange &r, rl) { + for (const qrange &r : rl) { if (r.first == r.second) out << QString("%1 Hz").arg(r.first); else @@ -241,9 +241,8 @@ void Explorer::loadSensorProperties() } else if (typeName == "qoutputrangelist") { qoutputrangelist rl = v.value<qoutputrangelist>(); QStringList out; - foreach (const qoutputrange &r, rl) { + for (const qoutputrange &r : rl) out << QString("(%1, %2) += %3").arg(r.minimum).arg(r.maximum).arg(r.accuracy); - } val = out.join(", "); } else { val = v.toString(); |