Plugins: replace 'foreach' with 'range for'

Mark some local variables as const to prevent detach()'ing.
Use qAsConst where is not possible mark as const.
If a container is changed in a loop's body, just make copy
like 'foreach'.

Change-Id: Ic453a688a9edf8a864d47f6e3a605164508a027c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

5 files changed, 27 insertions, 25 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index f72b8a51f9..d514ea04d9 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -520,12 +520,12 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
 
         ds >> file >> lineNumber >> columnNumber >> recurse >> dumpProperties;
 
-        QList<QObject*> objects = objectForLocationInfo(file, lineNumber, columnNumber);
+        const QList<QObject*> objects = objectForLocationInfo(file, lineNumber, columnNumber);
 
         rs << QByteArray("FETCH_OBJECTS_FOR_LOCATION_R") << queryId
            << objects.count();
 
-        foreach (QObject *object, objects) {
+        for (QObject *object : objects) {
             if (recurse)
                 prepareDeferredObjects(object);
             buildObjectDump(rs, object, recurse, dumpProperties);
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
index b16d53d5c8..9c198a8afc 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
@@ -287,7 +287,7 @@ void NativeDebugger::signalEmitted(const QString &signal)
     //Normalize to Lower case.
     QString signalName = signal.left(signal.indexOf(QLatin1Char('('))).toLower();
 
-    foreach (const QString &signal, breakOnSignals) {
+    for (const QString &signal : qAsConst(breakOnSignals)) {
         if (signal == signalName) {
             // TODO: pause debugger
             break;
@@ -475,8 +475,8 @@ void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &a
     TRACE_PROTOCOL("Engine: " << engine);
 
     Collector collector(engine);
-    QJsonArray expanded = arguments.value(QLatin1String("expanded")).toArray();
-    foreach (const QJsonValue &ex, expanded)
+    const QJsonArray expanded = arguments.value(QLatin1String("expanded")).toArray();
+    for (const QJsonValue &ex : expanded)
         collector.m_expanded.append(ex.toString());
     TRACE_PROTOCOL("Expanded: " << collector.m_expanded);
 
@@ -527,16 +527,16 @@ void NativeDebugger::handleExpressions(QJsonObject *response, const QJsonObject
     TRACE_PROTOCOL("Engines: " << engine << m_engine);
 
     Collector collector(engine);
-    QJsonArray expanded = arguments.value(QLatin1String("expanded")).toArray();
-    foreach (const QJsonValue &ex, expanded)
+    const QJsonArray expanded = arguments.value(QLatin1String("expanded")).toArray();
+    for (const QJsonValue &ex : expanded)
         collector.m_expanded.append(ex.toString());
     TRACE_PROTOCOL("Expanded: " << collector.m_expanded);
 
     QJsonArray output;
     QV4::Scope scope(engine);
 
-    QJsonArray expressions = arguments.value(QLatin1String("expressions")).toArray();
-    foreach (const QJsonValue &expr, expressions) {
+    const QJsonArray expressions = arguments.value(QLatin1String("expressions")).toArray();
+    for (const QJsonValue &expr : expressions) {
         QString expression = expr.toObject().value(QLatin1String("expression")).toString();
         QString name = expr.toObject().value(QLatin1String("name")).toString();
         TRACE_PROTOCOL("Evaluate expression: " << expression);
@@ -748,7 +748,8 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)
     TRACE_PROTOCOL("Removing engine" << engine);
     if (engine) {
         QV4::ExecutionEngine *executionEngine = QV8Engine::getV4(engine->handle());
-        foreach (NativeDebugger *debugger, m_debuggers) {
+        const auto debuggersCopy = m_debuggers;
+        for (NativeDebugger *debugger : debuggersCopy) {
             if (debugger->engine() == executionEngine)
                 m_debuggers.removeAll(debugger);
         }
@@ -759,7 +760,7 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)
 void QQmlNativeDebugServiceImpl::stateAboutToBeChanged(QQmlDebugService::State state)
 {
     if (state == Enabled) {
-        foreach (NativeDebugger *debugger, m_debuggers) {
+        for (NativeDebugger *debugger : qAsConst(m_debuggers)) {
             QV4::ExecutionEngine *engine = debugger->engine();
             if (!engine->debugger())
                 engine->setDebugger(debugger);
@@ -783,7 +784,7 @@ void QQmlNativeDebugServiceImpl::messageReceived(const QByteArray &message)
     } else if (cmd == QLatin1String("echo")) {
         response.insert(QStringLiteral("result"), arguments);
     } else {
-        foreach (NativeDebugger *debugger, m_debuggers)
+        for (NativeDebugger *debugger : qAsConst(m_debuggers))
             if (debugger)
                 debugger->handleCommand(&response, cmd, arguments);
     }
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
index 756b6b28be..773bc937f5 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
@@ -52,7 +52,7 @@ QV4DebuggerAgent::QV4DebuggerAgent(QV4DebugServiceImpl *debugService)
 
 QV4Debugger *QV4DebuggerAgent::pausedDebugger() const
 {
-    foreach (QV4Debugger *debugger, m_debuggers) {
+    for (QV4Debugger *debugger : m_debuggers) {
         if (debugger->state() == QV4Debugger::Paused)
             return debugger;
     }
@@ -147,13 +147,13 @@ void QV4DebuggerAgent::pause(QV4Debugger *debugger) const
 
 void QV4DebuggerAgent::pauseAll() const
 {
-    foreach (QV4Debugger *debugger, m_debuggers)
+    for (QV4Debugger *debugger : m_debuggers)
         pause(debugger);
 }
 
 void QV4DebuggerAgent::resumeAll() const
 {
-    foreach (QV4Debugger *debugger, m_debuggers)
+    for (QV4Debugger *debugger : m_debuggers)
         if (debugger->state() == QV4Debugger::Paused)
             debugger->resume(QV4Debugger::FullThrottle);
 }
@@ -161,7 +161,7 @@ void QV4DebuggerAgent::resumeAll() const
 int QV4DebuggerAgent::addBreakPoint(const QString &fileName, int lineNumber, bool enabled, const QString &condition)
 {
     if (enabled)
-        foreach (QV4Debugger *debugger, m_debuggers)
+        for (QV4Debugger *debugger : qAsConst(m_debuggers))
             debugger->addBreakPoint(fileName, lineNumber, condition);
 
     int id = m_breakPoints.size();
@@ -178,7 +178,7 @@ void QV4DebuggerAgent::removeBreakPoint(int id)
     m_breakPoints.remove(id);
 
     if (breakPoint.enabled)
-        foreach (QV4Debugger *debugger, m_debuggers)
+        for (QV4Debugger *debugger : qAsConst(m_debuggers))
             debugger->removeBreakPoint(breakPoint.fileName, breakPoint.lineNr);
 }
 
@@ -195,7 +195,7 @@ void QV4DebuggerAgent::enableBreakPoint(int id, bool onoff)
         return;
     breakPoint.enabled = onoff;
 
-    foreach (QV4Debugger *debugger, m_debuggers) {
+    for (QV4Debugger *debugger : qAsConst(m_debuggers)) {
         if (onoff)
             debugger->addBreakPoint(breakPoint.fileName, breakPoint.lineNr, breakPoint.condition);
         else
@@ -218,14 +218,14 @@ void QV4DebuggerAgent::setBreakOnThrow(bool onoff)
 {
     if (onoff != m_breakOnThrow) {
         m_breakOnThrow = onoff;
-        foreach (QV4Debugger *debugger, m_debuggers)
+        for (QV4Debugger *debugger : qAsConst(m_debuggers))
             debugger->setBreakOnThrow(onoff);
     }
 }
 
 void QV4DebuggerAgent::clearAllPauseRequests()
 {
-    foreach (QV4Debugger *debugger, m_debuggers)
+    for (QV4Debugger *debugger : qAsConst(m_debuggers))
         debugger->clearPauseRequest();
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index a2d2fff72b..4e4048f6ad 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -205,7 +205,7 @@ void ValueLookupJob::run()
                                 QQmlContextData::get(engine->qmlEngine()->rootContext()),
                                 scopeObject.data()));
     }
-    foreach (const QJsonValue &handle, handles) {
+    for (const QJsonValue &handle : handles) {
         QV4DataCollector::Ref ref = handle.toInt();
         if (!collector->isValidRef(ref)) {
             exception = QString::fromLatin1("Invalid Ref: %1").arg(ref);
@@ -258,7 +258,7 @@ GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine)
 
 void GatherSourcesJob::run()
 {
-    foreach (QV4::CompiledData::CompilationUnit *unit, engine->compilationUnits) {
+    for (QV4::CompiledData::CompilationUnit *unit : qAsConst(engine->compilationUnits)) {
         QString fileName = unit->fileName();
         if (!fileName.isEmpty())
             sources.append(fileName);
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index 00c5c1ad77..d53afbe7c4 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -558,7 +558,7 @@ public:
         debugger->runInEngine(&job);
 
         QJsonArray body;
-        foreach (const QString &source, job.result()) {
+        for (const QString &source : job.result()) {
             QJsonObject src;
             src[QLatin1String("name")] = source;
             src[QLatin1String("scriptType")] = 4;
@@ -718,7 +718,8 @@ void QV4DebugServiceImpl::stateAboutToBeChanged(State state)
 {
     QMutexLocker lock(&m_configMutex);
     if (state == Enabled) {
-        foreach (QV4Debugger *debugger, debuggerAgent.debuggers()) {
+        const auto debuggers = debuggerAgent.debuggers();
+        for (QV4Debugger *debugger : debuggers) {
             QV4::ExecutionEngine *ee = debugger->engine();
             if (!ee->debugger())
                 ee->setDebugger(debugger);
@@ -737,7 +738,7 @@ void QV4DebugServiceImpl::signalEmitted(const QString &signal)
     //Normalize to Lower case.
     QString signalName = signal.left(signal.indexOf(QLatin1Char('('))).toLower();
 
-    foreach (const QString &signal, breakOnSignals) {
+    for (const QString &signal : qAsConst(breakOnSignals)) {
         if (signal == signalName) {
             // TODO: pause debugger
             break;