Compile fix with recent Qt dev

The reasoning in 1b4766e26c6b did not take into account that the scope
of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with
f70905448f6 in Qt base.

Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/plugins/clangcodemodel/clangbackendreceiver.cpp b/src/plugins/clangcodemodel/clangbackendreceiver.cpp
index 7f2ef28fd6d..bfba1329a99 100644
--- a/src/plugins/clangcodemodel/clangbackendreceiver.cpp
+++ b/src/plugins/clangcodemodel/clangbackendreceiver.cpp
@@ -86,15 +86,18 @@ void BackendReceiver::addExpectedCompletionsMessage(
 
 void BackendReceiver::deleteProcessorsOfEditorWidget(TextEditor::TextEditorWidget *textEditorWidget)
 {
-    QMutableHashIterator<quint64, ClangCompletionAssistProcessor *> it(m_assistProcessorsTable);
-    while (it.hasNext()) {
-        it.next();
+    QList<quint64> toRemove;
+    for (auto it = m_assistProcessorsTable.cbegin(), end = m_assistProcessorsTable.cend();
+            it != end; ++it)
+    {
         ClangCompletionAssistProcessor *assistProcessor = it.value();
         if (assistProcessor->textEditorWidget() == textEditorWidget) {
             delete assistProcessor;
-            it.remove();
+            toRemove.append(it.key());
         }
     }
+    for (quint64 item : toRemove)
+        m_assistProcessorsTable.remove(item);
 }
 
 QFuture<CppTools::CursorInfo> BackendReceiver::addExpectedReferencesMessage(