Qt Designer: Remove use of Java-style list/vector iterators

Replace by range-for or algorithms.

Change-Id: I16e1f883bf1a774f46cb0c51fb16ce6d7d80b04e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

1 files changed, 11 insertions, 15 deletions

diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index d37d565a5..c412637d5 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -100,6 +100,9 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/QXmlStreamWriter>
 
+#include <algorithm>
+#include <iterator>
+
 Q_DECLARE_METATYPE(QWidgetList)
 
 QT_BEGIN_NAMESPACE
@@ -2001,13 +2004,10 @@ QStringList QDesignerResource::mergeWithLoadedPaths(const QStringList &paths) co
 {
     QStringList newPaths = paths;
 #ifdef OLD_RESOURCE_FORMAT
-    QStringList loadedPaths = m_resourceBuilder->loadedQrcFiles();
-    QStringListIterator it(loadedPaths);
-    while (it.hasNext()) {
-        const QString path = it.next();
-        if (!newPaths.contains(path))
-            newPaths << path;
-    }
+    const QStringList loadedPaths = m_resourceBuilder->loadedQrcFiles();
+    std::remove_copy_if(loadedPaths.cbegin(), loadedPaths.cend(),
+                        std::back_inserter(newPaths),
+                        [&newPaths] (const QString &path) { return newPaths.contains(path); });
 #endif
     return newPaths;
 }
@@ -2052,14 +2052,10 @@ void QDesignerResource::createResources(DomResources *resources)
 
     QtResourceSet *resourceSet = m_formWindow->resourceSet();
     if (resourceSet) {
-        QStringList oldPaths = resourceSet->activeResourceFilePaths();
-        QStringList newPaths = oldPaths;
-        QStringListIterator it(paths);
-        while (it.hasNext()) {
-            const QString path = it.next();
-            if (!newPaths.contains(path))
-                newPaths << path;
-        }
+        QStringList newPaths = resourceSet->activeResourceFilePaths();
+        std::remove_copy_if(paths.cbegin(), paths.cend(),
+                            std::back_inserter(newPaths),
+                            [&newPaths] (const QString &path) { return newPaths.contains(path); });
         resourceSet->activateResourceFilePaths(newPaths);
     } else {
         resourceSet = m_formWindow->core()->resourceModel()->addResourceSet(paths);