From 2d608342fd32bd1dfcd235262d0c2a94bdd6269c Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 20 Nov 2009 14:06:45 +0100
Subject: [PATCH] Use a `normal' qmap instead of the qmultimap.
---
src/plugins/cppeditor/cppquickfix.cpp | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 8190b4dc8aa..097ed29e124 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -691,30 +691,20 @@ int CPPQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
candidates.append(takeDeclarationOp);
candidates.append(splitSimpleDeclarationOp);
- QMultiMap<int, QuickFixOperationPtr> matchedOps;
+ QMap<int, QList<QuickFixOperationPtr> > matchedOps;
foreach (QuickFixOperationPtr op, candidates) {
int priority = op->match(path, _editor->textCursor());
if (priority != -1)
- matchedOps.insert(priority, op);
+ matchedOps[priority].append(op);
}
- QMapIterator<int, QuickFixOperationPtr> it(matchedOps);
+ QMapIterator<int, QList<QuickFixOperationPtr> > it(matchedOps);
it.toBack();
if (it.hasPrevious()) {
it.previous();
- int priority = it.key();
- _quickFixes.append(it.value());
-
- while (it.hasPrevious()) {
- it.previous();
-
- if (it.key() != priority)
- break;
-
- _quickFixes.append(it.value());
- }
+ _quickFixes = it.value();
}
if (! _quickFixes.isEmpty())
--
GitLab