From 94041d7b449983d18af29f0c9c81d602f5635715 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 29 Jul 2019 11:28:50 +0200
Subject: [PATCH] Todo: Replace last use of Java-style iterators

Change-Id: I4c6b4910522f2ec9eff6a7f615ea91bfaf99077d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/todo/lineparser.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/plugins/todo/lineparser.cpp b/src/plugins/todo/lineparser.cpp
index a81e65b9380..85a8204c8ca 100644
--- a/src/plugins/todo/lineparser.cpp
+++ b/src/plugins/todo/lineparser.cpp
@@ -104,17 +104,13 @@ QList<LineParser::KeywordEntry> LineParser::keywordEntriesFromCandidates(
         return QList<KeywordEntry>();
 
     // Convert candidates to entries
+    std::vector<KeywordEntry> tmp;
+    for (auto it = candidates.cbegin(), end = candidates.cend(); it != end; ++it)
+        tmp.emplace_back(it.key(), it.value(), QString());
+
     QList<KeywordEntry> entries;
-    QMapIterator<int, int> i(candidates);
-    i.toBack();
-
-    while (i.hasPrevious()) {
-        i.previous();
-
-        KeywordEntry entry;
-
-        entry.keywordStart = i.key();
-        entry.keywordIndex = i.value();
+    for (auto it = tmp.crbegin(), end = tmp.crend(); it != end; ++it) {
+        KeywordEntry entry = *it;
 
         int keywordLength = m_keywords.at(entry.keywordIndex).name.length();