2 files changed, 12 insertions, 18 deletions

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;