1 files changed, 19 insertions, 22 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp
index 903c15f4a9..e07b02f7c2 100644
--- a/src/corelib/io/qfilesystemwatcher_polling.cpp
+++ b/src/corelib/io/qfilesystemwatcher_polling.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qfilesystemwatcher_polling_p.h"
+#include <QtCore/qscopeguard.h>
 #include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
@@ -53,10 +54,9 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                                       QStringList *files,
                                                       QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
+        auto sg = qScopeGuard([&]{ unhandled.push_back(path); });
         QFileInfo fi(path);
         if (!fi.exists())
             continue;
@@ -73,7 +73,7 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
             files->append(path);
             this->files.insert(path, fi);
         }
-        it.remove();
+        sg.dismiss();
     }
 
     if ((!this->files.isEmpty() ||
@@ -82,23 +82,21 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
         timer.start(PollingInterval);
     }
 
-    return p;
+    return unhandled;
 }
 
 QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &paths,
                                                          QStringList *files,
                                                          QStringList *directories)
 {
-    QStringList p = paths;
-    QMutableListIterator<QString> it(p);
-    while (it.hasNext()) {
-        QString path = it.next();
+    QStringList unhandled;
+    for (const QString &path : paths) {
         if (this->directories.remove(path)) {
             directories->removeAll(path);
-            it.remove();
         } else if (this->files.remove(path)) {
             files->removeAll(path);
-            it.remove();
+        } else {
+            unhandled.push_back(path);
         }
     }
 
@@ -107,38 +105,37 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &path
         timer.stop();
     }
 
-    return p;
+    return unhandled;
 }
 
 void QPollingFileSystemWatcherEngine::timeout()
 {
-    QMutableHashIterator<QString, FileInfo> fit(files);
-    while (fit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = fit.next();
+    for (auto it = files.begin(), end = files.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!fi.exists()) {
-            fit.remove();
+            files.erase(x);
             emit fileChanged(path, true);
         } else if (x.value() != fi) {
             x.value() = fi;
             emit fileChanged(path, false);
         }
     }
-    QMutableHashIterator<QString, FileInfo> dit(directories);
-    while (dit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = dit.next();
+
+    for (auto it = directories.begin(), end = directories.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!path.endsWith(QLatin1Char('/')))
             fi = QFileInfo(path + QLatin1Char('/'));
         if (!fi.exists()) {
-            dit.remove();
+            directories.erase(x);
             emit directoryChanged(path, true);
         } else if (x.value() != fi) {
             fi.refresh();
             if (!fi.exists()) {
-                dit.remove();
+                directories.erase(x);
                 emit directoryChanged(path, true);
             } else {
                 x.value() = fi;