diff --git a/agents/followupreminderagent/followupreminderinfowidget.cpp b/agents/followupreminderagent/followupreminderinfowidget.cpp
index 2f54296a1..9c257b754 100644
--- a/agents/followupreminderagent/followupreminderinfowidget.cpp
+++ b/agents/followupreminderagent/followupreminderinfowidget.cpp
@@ -227,7 +227,7 @@ void FollowUpReminderInfoWidget::removeItem(const QList<QTreeWidgetItem *> &mail
         qCDebug(FOLLOWUPREMINDERAGENT_LOG) << "Not item selected";
     } else {
         if (KMessageBox::Yes == KMessageBox::warningYesNo(this, i18n("Do you want to remove selected item?"))) {
-            Q_FOREACH (QTreeWidgetItem *item, mailItemLst) {
+            for (QTreeWidgetItem *item : mailItemLst) {
                 FollowUpReminderInfoItem *mailItem = static_cast<FollowUpReminderInfoItem *>(item);
                 mListRemoveId << mailItem->info()->uniqueIdentifier();
                 delete mailItem;
diff --git a/agents/sendlateragent/sendlateragent.cpp b/agents/sendlateragent/sendlateragent.cpp
index d166dac7b..e871f768e 100644
--- a/agents/sendlateragent/sendlateragent.cpp
+++ b/agents/sendlateragent/sendlateragent.cpp
@@ -166,7 +166,7 @@ void SendLaterAgent::showConfigureDialog(qlonglong windowId)
 
 void SendLaterAgent::itemsRemoved(const Akonadi::Item::List &items)
 {
-    Q_FOREACH (const Akonadi::Item &item, items) {
+    for (const Akonadi::Item &item : items) {
         mManager->itemRemoved(item.id());
     }
 }
diff --git a/agents/sendlateragent/sendlaterconfigurewidget.cpp b/agents/sendlateragent/sendlaterconfigurewidget.cpp
index 8c35db649..8b67e5dfc 100644
--- a/agents/sendlateragent/sendlaterconfigurewidget.cpp
+++ b/agents/sendlateragent/sendlaterconfigurewidget.cpp
@@ -225,7 +225,7 @@ void SendLaterWidget::slotRemoveItem()
         removeMessage = true;
     }
 
-    Q_FOREACH (QTreeWidgetItem *item, listItems) {
+    for (QTreeWidgetItem *item : listItems) {
         if (removeMessage) {
             SendLaterItem *mailItem = static_cast<SendLaterItem *>(item);
             if (mailItem->info()) {
diff --git a/src/editor/attachment/attachmentview.cpp b/src/editor/attachment/attachmentview.cpp
index e759c748a..4a35a0473 100644
--- a/src/editor/attachment/attachmentview.cpp
+++ b/src/editor/attachment/attachmentview.cpp
@@ -185,9 +185,9 @@ void AttachmentView::hideIfEmpty()
 
 void AttachmentView::updateAttachmentLabel()
 {
-    MessageCore::AttachmentPart::List list = d->model->attachments();
+    const MessageCore::AttachmentPart::List list = d->model->attachments();
     qint64 size = 0;
-    Q_FOREACH (const MessageCore::AttachmentPart::Ptr &part, list) {
+    for (const MessageCore::AttachmentPart::Ptr &part : list) {
         size += part->size();
     }
     d->infoAttachment->setText(i18np("1 attachment (%2)", "%1 attachments (%2)", model()->rowCount(), KFormat().formatByteSize(qMax(0LL, size))));
diff --git a/src/editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp b/src/editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp
index 27f3ada50..e1fca85e0 100644
--- a/src/editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp
+++ b/src/editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp
@@ -52,7 +52,7 @@ void KMailPluginEditorCheckBeforeSendManagerInterface::initializePlugins()
         return;
     }
     const QVector<MessageComposer::PluginEditorCheckBeforeSend *> lstPlugin = MessageComposer::PluginEditorCheckBeforeSendManager::self()->pluginsList();
-    Q_FOREACH (MessageComposer::PluginEditorCheckBeforeSend *plugin, lstPlugin) {
+    for (MessageComposer::PluginEditorCheckBeforeSend *plugin : lstPlugin) {
         if (plugin->isEnabled()) {
             MessageComposer::PluginEditorCheckBeforeSendInterface *interface = plugin->createInterface(this);
             interface->setParentWidget(mParentWidget);
diff --git a/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp b/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp
index 79f124f55..f07a9a4f8 100644
--- a/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp
+++ b/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp
@@ -49,7 +49,7 @@ void PotentialPhishingDetailWidget::fillList(const QStringList &lst)
 {
     mListWidget->clear();
     QStringList emailsAdded;
-    Q_FOREACH (const QString &mail, lst) {
+    for (const QString &mail : lst) {
         if (!emailsAdded.contains(mail)) {
             QListWidgetItem *item = new QListWidgetItem(mListWidget);
             item->setCheckState(Qt::Unchecked);
diff --git a/src/folderarchive/folderarchivemanager.cpp b/src/folderarchive/folderarchivemanager.cpp
index 31539f06b..637578325 100644
--- a/src/folderarchive/folderarchivemanager.cpp
+++ b/src/folderarchive/folderarchivemanager.cpp
@@ -165,7 +165,7 @@ void FolderArchiveManager::load()
 
     KConfig config(FolderArchive::FolderArchiveUtil::configFileName());
     const QStringList accountList = config.groupList().filter(QRegularExpression(FolderArchive::FolderArchiveUtil::groupConfigPattern()));
-    Q_FOREACH (const QString &account, accountList) {
+    for (const QString &account : accountList) {
         KConfigGroup group = config.group(account);
         FolderArchiveAccountInfo *info = new FolderArchiveAccountInfo(group);
         if (info->enabled()) {
diff --git a/src/identity/xfaceconfigurator.cpp b/src/identity/xfaceconfigurator.cpp
index b132e8f57..92b086326 100644
--- a/src/identity/xfaceconfigurator.cpp
+++ b/src/identity/xfaceconfigurator.cpp
@@ -220,7 +220,7 @@ void XFaceConfigurator::slotSelectFile()
 {
     const QList<QByteArray> mimeTypes = QImageReader::supportedImageFormats();
     QString filter;
-    Q_FOREACH (const QByteArray &mime, mimeTypes) {
+    for (const QByteArray &mime : mimeTypes) {
         filter += QString::fromLatin1(mime);
     }
     const QUrl url = QFileDialog::getOpenFileUrl(this, QString(), QUrl(), i18n("Image (%1)", filter));
diff --git a/src/job/removeduplicatemailjob.cpp b/src/job/removeduplicatemailjob.cpp
index 3aa449bb4..0e05cfe13 100644
--- a/src/job/removeduplicatemailjob.cpp
+++ b/src/job/removeduplicatemailjob.cpp
@@ -50,10 +50,10 @@ void RemoveDuplicateMailJob::start()
     item->setUsesBusyIndicator(true);
     item->setCryptoStatus(KPIM::ProgressItem::Unknown);
 
-    QModelIndexList indexes = mSelectionModel->selectedIndexes();
+    const QModelIndexList indexes = mSelectionModel->selectedIndexes();
     Akonadi::Collection::List collections;
 
-    Q_FOREACH (const QModelIndex &index, indexes) {
+    for (const QModelIndex &index : indexes) {
         const Akonadi::Collection collection = index.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
         if (collection.isValid()) {
             collections << collection;
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
index e8f1d25e3..7560954cc 100644
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -805,7 +805,7 @@ void KMReaderWin::updateHtmlActions()
         mViewAsHtml->setChecked(false);
     } else {
         const QStringList customs = mSearchedAddress.customs();
-        Q_FOREACH (const QString &custom, customs) {
+        for (const QString &custom : customs) {
             if (custom.contains(QStringLiteral("MailPreferedFormatting"))) {
                 const QString value = mSearchedAddress.custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("MailPreferedFormatting"));
                 mViewAsHtml->setChecked(value == QLatin1String("HTML"));
diff --git a/src/searchdialog/searchwindow.cpp b/src/searchdialog/searchwindow.cpp
index a5fedf2fc..ee96c0f8c 100644
--- a/src/searchdialog/searchwindow.cpp
+++ b/src/searchdialog/searchwindow.cpp
@@ -347,7 +347,7 @@ void SearchWindow::activateFolder(const Akonadi::Collection &collection)
             if (!lst.isEmpty()) {
                 mUi.mChkMultiFolders->setChecked(true);
                 mCollectionId.clear();
-                Q_FOREACH (Akonadi::Collection::Id col, lst) {
+                for (Akonadi::Collection::Id col : lst) {
                     mCollectionId.append(Akonadi::Collection(col));
                 }
             } else {
diff --git a/src/widgets/kactionmenuaccount.cpp b/src/widgets/kactionmenuaccount.cpp
index b83b16d80..04e4c6d87 100644
--- a/src/widgets/kactionmenuaccount.cpp
+++ b/src/widgets/kactionmenuaccount.cpp
@@ -94,7 +94,7 @@ void KActionMenuAccount::updateAccountMenu()
         QVector<AgentIdentifier> agentIdentifierList;
         agentIdentifierList.reserve(lst.count());
 
-        Q_FOREACH (const Akonadi::AgentInstance &type, lst) {
+        for (const Akonadi::AgentInstance &type : lst) {
             // Explicitly make a copy, as we're not changing values of the list but only
             // the local copy which is passed to action.
             const QString identifierName = type.identifier();
diff --git a/src/widgets/kactionmenutransport.cpp b/src/widgets/kactionmenutransport.cpp
index 49d8b3bc4..550b0511e 100644
--- a/src/widgets/kactionmenutransport.cpp
+++ b/src/widgets/kactionmenutransport.cpp
@@ -51,7 +51,7 @@ void KActionMenuTransport::updateTransportMenu()
         const QList<MailTransport::Transport *> transports = MailTransport::TransportManager::self()->transports();
         QMap<QString, int> menuTransportLst;
 
-        Q_FOREACH (MailTransport::Transport *transport, transports) {
+        for (MailTransport::Transport *transport : transports) {
             const QString name = transport->name().replace(QLatin1Char('&'), QStringLiteral("&&"));
             menuTransportLst.insert(name, transport->id());
         }