diff --git a/autotests/src/inlinenote_test.cpp b/autotests/src/inlinenote_test.cpp
--- a/autotests/src/inlinenote_test.cpp
+++ b/autotests/src/inlinenote_test.cpp
@@ -41,7 +41,7 @@
 {
     QWidget *findViewInternal(KTextEditor::View* view)
     {
-        foreach (QObject* child, view->children()) {
+        for (QObject* child : view->children()) {
             if (child->metaObject()->className() == QByteArrayLiteral("KateViewInternal")) {
                 return qobject_cast<QWidget*>(child);
             }
diff --git a/autotests/src/kateview_test.cpp b/autotests/src/kateview_test.cpp
--- a/autotests/src/kateview_test.cpp
+++ b/autotests/src/kateview_test.cpp
@@ -177,7 +177,7 @@
 {
     QWidget *findViewInternal(KTextEditor::View* view)
     {
-        foreach (QObject* child, view->children()) {
+        for (QObject* child : view->children()) {
             if (child->metaObject()->className() == QByteArrayLiteral("KateViewInternal")) {
                 return qobject_cast<QWidget*>(child);
             }
diff --git a/autotests/src/vimode/base.cpp b/autotests/src/vimode/base.cpp
--- a/autotests/src/vimode/base.cpp
+++ b/autotests/src/vimode/base.cpp
@@ -254,29 +254,31 @@
 
 Qt::KeyboardModifier BaseTest::parseCodedModifier(const QString &string, int startPos, int *destEndOfCodedModifier)
 {
-    foreach (const QString &modifierCode, m_codesToModifiers.keys()) {
+    for (auto it = m_codesToModifiers.constBegin(), end = m_codesToModifiers.constEnd(); it != end; ++it) {
+        const QString &modifierCode = it.key();
         // The "+2" is from the leading '\' and the trailing '-'
         if (string.mid(startPos, modifierCode.length() + 2) == QString("\\") + modifierCode + "-") {
             if (destEndOfCodedModifier) {
                 // destEndOfCodeModifier lies on the trailing '-'.
                 *destEndOfCodedModifier = startPos + modifierCode.length() + 1;
                 Q_ASSERT(string[*destEndOfCodedModifier] == '-');
             }
-            return m_codesToModifiers.value(modifierCode);
+            return it.value();
         }
     }
     return Qt::NoModifier;
 }
 
 Qt::Key BaseTest::parseCodedSpecialKey(const QString &string, int startPos, int *destEndOfCodedKey)
 {
-    foreach (const QString &specialKeyCode, m_codesToSpecialKeys.keys()) {
+    for (auto it = m_codesToSpecialKeys.constBegin(), end = m_codesToSpecialKeys.constEnd(); it != end; ++it) {
+        const QString &specialKeyCode = it.key();
         // "+1" is for the leading '\'.
         if (string.mid(startPos, specialKeyCode.length() + 1) == QString("\\") + specialKeyCode) {
             if (destEndOfCodedKey) {
                 *destEndOfCodedKey = startPos + specialKeyCode.length();
             }
-            return m_codesToSpecialKeys.value(specialKeyCode);
+            return it.value();
         }
     }
     return Qt::Key_unknown;