From a8007888e4f6aa6028c9a71dadb0ef7620e67862 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 29 Jul 2019 10:52:14 +0200
Subject: Prepare for explicit QChar constructors

Change-Id: I906f63236230f10e6bdfb16ef3ee25cee8c407f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/parser/qmljslexer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index ef57ab84a..dc6ac8a0f 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -73,7 +73,7 @@ static unsigned char convertHex(ushort c)
 
 static QChar convertHex(QChar c1, QChar c2)
 {
-    return {(convertHex(c1.unicode()) << 4) + convertHex(c2.unicode())};
+    return QChar{(convertHex(c1.unicode()) << 4) + convertHex(c2.unicode())};
 }
 
 static QChar convertUnicode(QChar c1, QChar c2, QChar c3, QChar c4)
-- 
cgit v1.2.3


From 94a097d95e9bfe485cebd7a5a9acd56301c54f04 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 29 Jul 2019 14:37:58 +0200
Subject: Avoid uses of Java-style iterators

Change-Id: I90cece156033b5d223a86016401a2199f5b6c11e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/generators/generatordata.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h
index b6200339e..da65815ad 100644
--- a/src/lib/corelib/generators/generatordata.h
+++ b/src/lib/corelib/generators/generatordata.h
@@ -72,21 +72,15 @@ template <typename U> struct IMultiplexableContainer {
     void forEach(const std::function<void(const QString &configurationName,
                                           const U &data)> &func) const
     {
-        QMapIterator<QString, U> it(data);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = data.cbegin(), end = data.cend(); it != end; ++it)
             func(it.key(), it.value());
-        }
     }
 
     void forEach(const std::function<void(const std::string &configurationName,
                                           const U &data)> &func) const
     {
-        QMapIterator<QString, U> it(data);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = data.cbegin(), end = data.cend(); it != end; ++it)
             func(it.key().toStdString(), it.value());
-        }
     }
 
     const U operator[](const QString &configurationName) const
@@ -147,21 +141,15 @@ struct QBS_EXPORT GeneratableProject : public GeneratableProjectData {
     void forEach(const std::function<void(const QString &configurationName,
                                           const Project &data)> &func) const
     {
-        QMapIterator<QString, Project> it(projects);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = projects.cbegin(), end = projects.cend(); it != end; ++it)
             func(it.key(), it.value());
-        }
     }
 
     void forEach(const std::function<void(const std::string &configurationName,
                                           const Project &data)> &func) const
     {
-        QMapIterator<QString, Project> it(projects);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = projects.cbegin(), end = projects.cend(); it != end; ++it)
             func(it.key().toStdString(), it.value());
-        }
     }
 
     const Project operator[](const QString &configurationName) const
-- 
cgit v1.2.3