diff --git a/src/QmlControls/ParameterEditorController.cc b/src/QmlControls/ParameterEditorController.cc
index f3fb52439170f66f69f0b3f78f85a11d4e178e89..f448c02dc6f5aab8e40c55201fd083e60f92ddb9 100644
--- a/src/QmlControls/ParameterEditorController.cc
+++ b/src/QmlControls/ParameterEditorController.cc
@@ -70,7 +70,7 @@ QStringList ParameterEditorController::searchParameters(const QString& searchTex
 {
     QStringList list;
     
-    foreach(const QString &paramName, _vehicle->parameterManager()->parameterNames(_vehicle->defaultComponentId())) {
+    for(const QString &paramName: _vehicle->parameterManager()->parameterNames(_vehicle->defaultComponentId())) {
         if (searchText.isEmpty()) {
             list += paramName;
         } else {
@@ -168,11 +168,11 @@ void ParameterEditorController::_updateParameters(void)
 
     if (searchItems.isEmpty()) {
         const QMap<QString, QMap<QString, QStringList> >& categoryMap = _vehicle->parameterManager()->getCategoryMap();
-        foreach (const QString& parameter, categoryMap[_currentCategory][_currentGroup]) {
+        for (const QString& parameter: categoryMap[_currentCategory][_currentGroup]) {
             newParameterList.append(_vehicle->parameterManager()->getParameter(_vehicle->defaultComponentId(), parameter));
         }
     } else {
-        foreach(const QString &parameter, _vehicle->parameterManager()->parameterNames(_vehicle->defaultComponentId())) {
+        for(const QString &parameter: _vehicle->parameterManager()->parameterNames(_vehicle->defaultComponentId())) {
             Fact* fact = _vehicle->parameterManager()->getParameter(_vehicle->defaultComponentId(), parameter);
             bool matched = true;
 
diff --git a/src/QmlControls/QGCFileDialogController.cc b/src/QmlControls/QGCFileDialogController.cc
index 89ead9bb11adbe76b34d8c330c3616d6cca30206..66f94c4e7767d2e1fc97bbad29a90c283dda6c84 100644
--- a/src/QmlControls/QGCFileDialogController.cc
+++ b/src/QmlControls/QGCFileDialogController.cc
@@ -24,13 +24,13 @@ QStringList QGCFileDialogController::getFiles(const QString& directoryPath, cons
     QDir fileDir(directoryPath);
 
     QStringList infoListExtensions;
-    foreach (const QString& extension, fileExtensions) {
+    for (const QString& extension: fileExtensions) {
         infoListExtensions.append(QStringLiteral("*.%1").arg(extension));
     }
 
     QFileInfoList fileInfoList = fileDir.entryInfoList(infoListExtensions,  QDir::Files, QDir::Name);
 
-    foreach (const QFileInfo& fileInfo, fileInfoList) {
+    for (const QFileInfo& fileInfo: fileInfoList) {
         qCDebug(QGCFileDialogControllerLog) << "getFiles found" << fileInfo.fileName();
         files << fileInfo.fileName();
     }
diff --git a/src/QmlControls/QmlObjectListModel.cc b/src/QmlControls/QmlObjectListModel.cc
index 51ad32ed7447119eb7064e92f42cb1c5f2124552..64764a3651c9bf379a5ff71645f6d748246250b6 100644
--- a/src/QmlControls/QmlObjectListModel.cc
+++ b/src/QmlControls/QmlObjectListModel.cc
@@ -183,7 +183,7 @@ void QmlObjectListModel::insert(int i, QList<QObject*> objects)
     }
 
     int j = i;
-    foreach (QObject* object, objects) {
+    for (QObject* object: objects) {
         QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
 
         // Look for a dirtyChanged signal on the object
@@ -233,7 +233,7 @@ void QmlObjectListModel::setDirty(bool dirty)
         _dirty = dirty;
         if (!dirty) {
             // Need to clear dirty from all children
-            foreach(QObject* object, _objectList) {
+            for(QObject* object: _objectList) {
                 if (object->property("dirty").isValid()) {
                     object->setProperty("dirty", false);
                 }