2 files changed, 4 insertions, 3 deletions
diff --git a/examples/qtmail/emailclient.cpp b/examples/qtmail/emailclient.cpp
index e104fffb..2ad7905f 100644
--- a/examples/qtmail/emailclient.cpp
+++ b/examples/qtmail/emailclient.cpp
@@ -39,6 +39,7 @@
 #include "searchview.h"
 #include "readmail.h"
 #include "writemail.h"
+#include <qmflist.h>
 #include <qmaillog.h>
 #include <qmailnamespace.h>
 #include <qmailaccount.h>
@@ -1242,7 +1243,7 @@ void EmailClient::sendAllQueuedMail(bool userRequest)
 
     if (transmitAccountIds.isEmpty()) {
         // Find which accounts have messages to transmit in the outbox
-        foreach (const QMailMessageMetaData &metaData, QMailStore::instance()->messagesMetaData(outboxFilter, QMailMessageKey::ParentAccountId, QMailStore::ReturnDistinct)) {
+        for (const QMailMessageMetaData &metaData : QMailStore::instance()->messagesMetaData(outboxFilter, QMailMessageKey::ParentAccountId, QMailStore::ReturnDistinct)) {
             transmitAccountIds.append(metaData.parentAccountId());
         }
         if (transmitAccountIds.isEmpty())
@@ -1800,7 +1801,7 @@ bool EmailClient::applyToSelectedFolder(void (EmailClient::*function)(const QMai
 
     // Find the current locations for each of the selected messages
     QMailMessageKey key(QMailMessageKey::id(messageListView()->selected()));
-    foreach (const QMailMessageMetaData &message, QMailStore::instance()->messagesMetaData(key, QMailMessageKey::ParentFolderId)) {
+    for (const QMailMessageMetaData &message : QMailStore::instance()->messagesMetaData(key, QMailMessageKey::ParentFolderId)) {
         locationSet.insert(message.parentFolderId());
     }
 
diff --git a/examples/qtmail/emailcomposer.cpp b/examples/qtmail/emailcomposer.cpp
index 2eff03d3..a8a831a5 100644
--- a/examples/qtmail/emailcomposer.cpp
+++ b/examples/qtmail/emailcomposer.cpp
@@ -78,7 +78,7 @@ static QCompleter* sentFolderCompleter()
     QMailMessageKey::Properties props(QMailMessageKey::Recipients);
     QMailMessageKey key(QMailMessageKey::status(QMailMessage::Sent));
     QMailMessageMetaDataList metaDataList(QMailStore::instance()->messagesMetaData(key, props, QMailStore::ReturnDistinct));
-    foreach (const QMailMessageMetaData &metaData, metaDataList) {
+    for (const QMailMessageMetaData &metaData : metaDataList) {
         foreach(QMailAddress address, metaData.recipients()) {
             QString s(address.toString());
             if (!s.simplified().isEmpty()) {