feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use a `normal' qmap instead of the qmultimap.

Browse Source
This commit is contained in:
Roberto Raggi
2009-11-20 14:06:45 +01:00
parent 20b209858b
commit 2d608342fd
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cppquickfix.cpp
View File

@@ -691,30 +691,20 @@ int CPPQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
candidates.append(takeDeclarationOp); candidates.append(takeDeclarationOp);
candidates.append(splitSimpleDeclarationOp); candidates.append(splitSimpleDeclarationOp);
QMultiMap<int, QuickFixOperationPtr> matchedOps; QMap<int, QList<QuickFixOperationPtr> > matchedOps;
foreach (QuickFixOperationPtr op, candidates) { foreach (QuickFixOperationPtr op, candidates) {
int priority = op->match(path, _editor->textCursor()); int priority = op->match(path, _editor->textCursor());
if (priority != -1) if (priority != -1)
matchedOps.insert(priority, op); matchedOps[priority].append(op);
} }
QMapIterator<int, QuickFixOperationPtr> it(matchedOps); QMapIterator<int, QList<QuickFixOperationPtr> > it(matchedOps);
it.toBack(); it.toBack();
if (it.hasPrevious()) { if (it.hasPrevious()) {
it.previous(); it.previous();
int priority = it.key(); _quickFixes = it.value();
_quickFixes.append(it.value());
while (it.hasPrevious()) {
it.previous();
if (it.key() != priority)
break;
_quickFixes.append(it.value());
}
} }
if (! _quickFixes.isEmpty()) if (! _quickFixes.isEmpty())