diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index 6acdb74720a..4a0f11d3877 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -50,21 +50,21 @@ static void refresh(QPromise<FilePaths> &promise, const FilePaths &directories,
                     const QStringList &filters, const QStringList &exclusionFilters,
                     const QString &displayName)
 {
-    SubDirFileIterator subDirIterator(directories, filters, exclusionFilters);
-    promise.setProgressRange(0, subDirIterator.maxProgress());
+    SubDirFileContainer fileContainer(directories, filters, exclusionFilters);
+    promise.setProgressRange(0, fileContainer.progressMaximum());
     FilePaths files;
-    const auto end = subDirIterator.end();
-    for (auto it = subDirIterator.begin(); it != end; ++it) {
+    const auto end = fileContainer.end();
+    for (auto it = fileContainer.begin(); it != end; ++it) {
         if (promise.isCanceled()) {
-            promise.setProgressValueAndText(subDirIterator.currentProgress(),
+            promise.setProgressValueAndText(it.progressValue(),
                                             Tr::tr("%1 filter update: canceled").arg(displayName));
             return;
         }
-        files << (*it).filePath;
-        promise.setProgressValueAndText(subDirIterator.currentProgress(),
-                                        Tr::tr("%1 filter update: %n files", nullptr, files.size()).arg(displayName));
+        files << it->filePath;
+        promise.setProgressValueAndText(it.progressValue(),
+            Tr::tr("%1 filter update: %n files", nullptr, files.size()).arg(displayName));
     }
-    promise.setProgressValue(subDirIterator.maxProgress());
+    promise.setProgressValue(fileContainer.progressMaximum());
     promise.addResult(files);
 }