diff --git a/data/parsetrigrams.cpp b/data/parsetrigrams.cpp
--- a/data/parsetrigrams.cpp
+++ b/data/parsetrigrams.cpp
@@ -46,9 +46,7 @@
 
     QHash< QString, QHash<QString, int> > models;
 
-    QStringList files = td.entryList(QDir::Files);
-
-    Q_FOREACH (const QString &fname, files) {
+    for (const QString &fname : td.entryList(QDir::Files)) {
         QFile fin(td.filePath(fname));
         fin.open(QFile::ReadOnly | QFile::Text);
         QTextStream stream(&fin);
diff --git a/src/core/guesslanguage.cpp b/src/core/guesslanguage.cpp
--- a/src/core/guesslanguage.cpp
+++ b/src/core/guesslanguage.cpp
@@ -677,7 +677,7 @@
 
     int totalCount = 0;
 
-    foreach (const QChar c, text) {
+    for (const QChar c : text) {
         script = c.script();
 
         if (script == QChar::Script_Common || script == QChar::Script_Inherited) {
@@ -698,7 +698,7 @@
         return relevantScripts;
     }
 
-    foreach (const QChar::Script &script, scriptCounts.keys()) {
+    for (const QChar::Script &script : scriptCounts.keys()) {
         // return run types that used for 40% or more of the string
         if (scriptCounts[script] * 100 / totalCount >= 40) {
             relevantScripts << script;
@@ -780,7 +780,7 @@
         trigramCounts[tri]++;
     }
 
-    foreach (const QString &key, trigramCounts.keys()) {
+    for (const QString &key : trigramCounts.keys()) {
         const QChar *data = key.constData();
         bool hasTwoSpaces = (data[1].isSpace() && (data[0].isSpace() || data[2].isSpace()));
 
@@ -798,7 +798,7 @@
     int counter = -1;
     int dist = 0;
 
-    Q_FOREACH (const QString &trigram, model) {
+    for (const QString &trigram : model) {
         if (knownModel.contains(trigram)) {
             dist += qAbs(++counter - knownModel.value(trigram));
         } else {
diff --git a/src/plugins/hspell/hspelldict.cpp b/src/plugins/hspell/hspelldict.cpp
--- a/src/plugins/hspell/hspelldict.cpp
+++ b/src/plugins/hspell/hspelldict.cpp
@@ -49,7 +49,7 @@
                                                  QStringList()).toStringList());
     QVariantHash replacementMap
         = settings.value(QStringLiteral("Replacements"), QVariant()).toHash();
-    Q_FOREACH (const QString &key, replacementMap.keys()) {
+    for (const QString &key : replacementMap.keys()) {
         m_replacements[key] = replacementMap[key].toString();
     }
 }
@@ -138,7 +138,7 @@
     QSettings settings(QStringLiteral("KDE"), QStringLiteral("SonnetHSpellPlugin"));
     settings.setValue(QStringLiteral("PersonalWords"), QVariant(m_personalWords.toList()));
     QVariantHash variantHash;
-    Q_FOREACH (const QString &key, m_replacements.keys()) {
+    for (const QString &key : m_replacements.keys()) {
         variantHash[key] = QVariant(m_replacements[key]);
     }
     settings.setValue(QStringLiteral("Replacements"), variantHash);
diff --git a/src/plugins/hunspell/hunspellclient.cpp b/src/plugins/hunspell/hunspellclient.cpp
--- a/src/plugins/hunspell/hunspellclient.cpp
+++ b/src/plugins/hunspell/hunspellclient.cpp
@@ -47,7 +47,7 @@
             dirList.append(path);
 
             QDir dir(path);
-            foreach (const QString &subDir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
+            for (const QString &subDir : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
                 dirList.append(dir.absoluteFilePath(subDir));
             }
 
diff --git a/src/plugins/voikko/voikkodict.cpp b/src/plugins/voikko/voikkodict.cpp
--- a/src/plugins/voikko/voikkodict.cpp
+++ b/src/plugins/voikko/voikkodict.cpp
@@ -236,8 +236,8 @@
      */
     inline void loadUserWords(const QJsonObject &languageNode) Q_DECL_NOEXCEPT
     {
-        auto words = languageNode[personal_words_str()].toArray();
-        Q_FOREACH (auto word, words) {
+        const auto words = languageNode[personal_words_str()].toArray();
+        for (auto word : words) {
             m_personalWords.insert(word.toString());
         }
         qCDebug(SONNET_VOIKKO)
@@ -249,8 +249,8 @@
      */
     inline void loadUserReplacements(const QJsonObject &languageNode) Q_DECL_NOEXCEPT
     {
-        auto words = languageNode[replacements_str()].toArray();
-        Q_FOREACH (auto pair, words) {
+        const auto words = languageNode[replacements_str()].toArray();
+        for (auto pair : words) {
             m_replacements[pair.toObject()[replacement_bad_str()].toString()]
                 = pair.toObject()[replacement_good_str()].toString();
         }