summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/sensors/sensorgestures/mainwindow.cpp2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp7
-rw-r--r--src/sensors/gestures/qsensorgesture.cpp14
-rw-r--r--src/sensors/gestures/qsensorgesturemanagerprivate.cpp16
-rw-r--r--src/sensors/qsensor.cpp2
-rw-r--r--src/sensors/qsensormanager.cpp11
-rw-r--r--src/sensorsquick/qmlsensorglobal.cpp4
-rw-r--r--tests/auto/qsensor/test_backends.cpp11
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp3
-rw-r--r--tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp2
-rw-r--r--tests/manual/sensor_explorer/explorer.cpp9
11 files changed, 34 insertions, 47 deletions
diff --git a/examples/sensors/sensorgestures/mainwindow.cpp b/examples/sensors/sensorgestures/mainwindow.cpp
index 54d1399d..5d1c3671 100644
--- a/examples/sensors/sensorgestures/mainwindow.cpp
+++ b/examples/sensors/sensorgestures/mainwindow.cpp
@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent)
QSensorGestureManager manager;
- Q_FOREACH (const QString &gesture, manager.gestureIds()) {
+ for (const QString &gesture : manager.gestureIds()) {
QTreeWidgetItem *gestureId = new QTreeWidgetItem(ui->treeWidget);
QStringList recognizerSignals = manager.recognizerSignals(gesture);
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
index 4d9edb25..b0298485 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
@@ -138,10 +138,9 @@ void QWhipSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading)
zList.removeLast();
qreal averageZ = 0;
- Q_FOREACH (qreal az, zList) {
+ for (const qreal& az : qAsConst<QList<qreal>>(zList))
averageZ += az;
- }
-// averageZ += z;
+
averageZ /= zList.count();
zList.insert(0,z);
@@ -212,7 +211,7 @@ void QWhipSensorGestureRecognizer::checkForWhip()
whipOk = false;
int check = 0;
- Q_FOREACH (qreal az, zList) {
+ for (const qreal& az : qAsConst<QList<qreal>>(zList)) {
if (az < -10)
check++;
}
diff --git a/src/sensors/gestures/qsensorgesture.cpp b/src/sensors/gestures/qsensorgesture.cpp
index 8d5e2ddf..8d345381 100644
--- a/src/sensors/gestures/qsensorgesture.cpp
+++ b/src/sensors/gestures/qsensorgesture.cpp
@@ -84,7 +84,7 @@ QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) :
QObject(parent)
{
d_ptr = new QSensorGesturePrivate();
- Q_FOREACH (const QString &id, ids) {
+ for (const QString &id : ids) {
QSensorGestureRecognizer * rec = QSensorGestureManager::sensorGestureRecognizer(id);
if (rec != 0) {
d_ptr->m_sensorRecognizers.append(rec);
@@ -101,8 +101,8 @@ QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) :
builder.setSuperClass(&QObject::staticMetaObject);
builder.setClassName("QSensorGesture");
- Q_FOREACH (QSensorGestureRecognizer *recognizer, d_ptr->m_sensorRecognizers) {
- Q_FOREACH (const QString &gesture, recognizer->gestureSignals()) {
+ for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) {
+ for (const QString &gesture : recognizer->gestureSignals()) {
QMetaMethodBuilder b = builder.addSignal(gesture.toLatin1());
if (!d_ptr->localGestureSignals.contains(QLatin1String(b.signature())))
d_ptr->localGestureSignals.append(QLatin1String(b.signature()));
@@ -153,7 +153,7 @@ void QSensorGesture::startDetection()
if (d_ptr->isActive)
return;
- Q_FOREACH (QSensorGestureRecognizer *recognizer, d_ptr->m_sensorRecognizers) {
+ for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) {
Q_ASSERT(recognizer !=0);
@@ -161,7 +161,7 @@ void QSensorGesture::startDetection()
this,SIGNAL(detected(QString)),Qt::UniqueConnection);
//connect recognizer signals
- Q_FOREACH (QString method, recognizer->gestureSignals()) {
+ for (QString method : recognizer->gestureSignals()) {
method.prepend(QLatin1String("2"));
connect(recognizer, method.toLatin1(),
this, method.toLatin1(), Qt::UniqueConnection);
@@ -183,11 +183,11 @@ void QSensorGesture::stopDetection()
if (!d_ptr->isActive)
return;
- Q_FOREACH (QSensorGestureRecognizer *recognizer, d_ptr->m_sensorRecognizers) {
+ for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) {
disconnect(recognizer,SIGNAL(detected(QString)),
this,SIGNAL(detected(QString)));
//disconnect recognizer signals
- Q_FOREACH (QString method,recognizer->gestureSignals()) {
+ for (QString method : recognizer->gestureSignals()) {
method.prepend(QLatin1String("2"));
disconnect(recognizer, method.toLatin1(),
this, method.toLatin1());
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
index 09b068d6..8c998db6 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
@@ -68,16 +68,11 @@ QSensorGestureManagerPrivate::~QSensorGestureManagerPrivate()
{
if (QSensorGesturePluginInterface *pInterface
= qobject_cast<QSensorGesturePluginInterface *>(plugin)) {
-
- Q_FOREACH (const QString &id, pInterface->supportedIds()) {
-
+ for (const QString& id : pInterface->supportedIds()) {
if (!knownIds.contains(id))
knownIds.append(id);
else
- qWarning() << id <<"from the plugin"
- << pInterface->name()
- << "is already known.";
-
+ qWarning() << id <<"from the plugin" << pInterface->name() << "is already known.";
}
plugins << plugin;
} else {
@@ -92,9 +87,9 @@ QSensorGestureManagerPrivate::~QSensorGestureManagerPrivate()
*/
void QSensorGestureManagerPrivate::loadPlugins()
{
- Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) {
+ for (QObject *plugin : QPluginLoader::staticInstances())
initPlugin(plugin);
- }
+
QList<QJsonObject> meta = loader->metaData();
for (int i = 0; i < meta.count(); i++) {
QObject *plugin = loader->instance(i);
@@ -126,8 +121,7 @@ bool QSensorGestureManagerPrivate::loadRecognizer(const QString &recognizerId)
//create these recognizers
QList <QSensorGestureRecognizer *> recognizers = pInterface->createRecognizers();
- Q_FOREACH (QSensorGestureRecognizer *recognizer, recognizers) {
-
+ for (QSensorGestureRecognizer *recognizer : recognizers) {
if (registeredSensorGestures.contains(recognizer->id())) {
qWarning() << "Ignoring recognizer " << recognizer->id() << "from plugin" << pInterface->name() << "because it is already registered";
delete recognizer;
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index 00105bd3..97f8492c 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -313,7 +313,7 @@ QSensor::~QSensor()
{
Q_D(QSensor);
stop();
- Q_FOREACH (QSensorFilter *filter, d->filters)
+ for (QSensorFilter *filter : d->filters)
filter->setSensor(0);
delete d->backend;
d->backend = 0;
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index e49e5281..43286467 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -159,9 +159,8 @@ public Q_SLOTS:
// until things stop changing.
do {
sensorsChanged = false;
- Q_FOREACH (QSensorChangesInterface *changes, changeListeners) {
+ for (QSensorChangesInterface *changes : changeListeners)
changes->sensorsChanged();
- }
} while (sensorsChanged);
// We're going away now so clear the flag
@@ -213,10 +212,8 @@ void QSensorManagerPrivate::loadPlugins()
SENSORLOG() << "initializing static plugins";
// Qt-style static plugins
- Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) {
- initPlugin(plugin, false/*do not warn on fail*/);
- }
-
+ for (QObject *plugin : QPluginLoader::staticInstances())
+ initPlugin(plugin, false /*do not warn on fail*/);
if (d->loadExternalPlugins) {
SENSORLOG() << "initializing plugins";
QList<QJsonObject> meta = d->loader->metaData();
@@ -365,7 +362,7 @@ QSensorBackend *QSensorManager::createBackend(QSensor *sensor)
if (backend) return backend; // Got it!
// The default failed to instantiate so try any other registered sensors for this type
- Q_FOREACH (const QByteArray &identifier, factoryByIdentifier.keys()) {
+ for (const QByteArray &identifier : factoryByIdentifier.keys()) {
SENSORLOG() << "Trying" << identifier;
if (identifier == defaultIdentifier) continue; // Don't do the default one again
factory = factoryByIdentifier[identifier];
diff --git a/src/sensorsquick/qmlsensorglobal.cpp b/src/sensorsquick/qmlsensorglobal.cpp
index 4699a33d..eaa83342 100644
--- a/src/sensorsquick/qmlsensorglobal.cpp
+++ b/src/sensorsquick/qmlsensorglobal.cpp
@@ -86,7 +86,7 @@ QStringList QmlSensorGlobal::sensorTypes() const
QStringList ret;
const QList<QByteArray> sensorTypes = QSensor::sensorTypes();
ret.reserve(sensorTypes.count());
- foreach (const QByteArray &type, sensorTypes)
+ for (const QByteArray &type : sensorTypes)
ret << QString::fromLocal8Bit(type);
return ret;
}
@@ -102,7 +102,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const
QStringList ret;
const QList<QByteArray> sensors = QSensor::sensorsForType(type.toLocal8Bit());
ret.reserve(sensors.count());
- foreach (const QByteArray &identifier, sensors)
+ for (const QByteArray &identifier : sensors)
ret << QString::fromLocal8Bit(identifier);
return ret;
}
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 08:16:35 +0000