diff --git a/src/extractor.cpp b/src/extractor.cpp
--- a/src/extractor.cpp
+++ b/src/extractor.cpp
@@ -54,9 +54,9 @@
     KFileMetaData::SimpleExtractionResult result(url, mimetype, KFileMetaData::ExtractionResult::ExtractMetaData);
     KFileMetaData::ExtractorCollection collection;
 
-    QList<KFileMetaData::Extractor *> exList = collection.fetchExtractors(mimetype);
+    const QList<KFileMetaData::Extractor *> exList = collection.fetchExtractors(mimetype);
 
-    Q_FOREACH (KFileMetaData::Extractor *ex, exList) {
+    for (KFileMetaData::Extractor *ex : exList) {
         ex->extract(&result);
     }
 
diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp
--- a/src/filemetadataprovider.cpp
+++ b/src/filemetadataprovider.cpp
@@ -333,9 +333,10 @@
     //   * Indexed
 
     QStringList urls;
+    urls.reserve(m_fileItems.size());
     // Only extract data from indexed files,
     // it would be too expensive otherwise.
-    Q_FOREACH (const KFileItem& item, m_fileItems) {
+    for (const KFileItem& item : qAsConst(m_fileItems)) {
         const QUrl url = item.targetUrl();
         if (url.isLocalFile()) {
             urls << url.toLocalFile();