From 5e5c5bb02b16aa4db5a0bcc6fdef35d8a8b58066 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@me.com>
Date: Mon, 3 Jun 2013 12:26:25 +0200
Subject: [PATCH] C++: re-enable quick-fix sorting.
Also make sure that "Apply function signature change" gets to the top
of the list.
Task-number: QTCREATORBUG-9441
Change-Id: Iaf67f8ea9c99ddfc973e610f7e0f4c35b7967629
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
src/plugins/cppeditor/cppquickfixes.cpp | 2 +-
src/plugins/texteditor/codeassist/codeassistant.cpp | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index a75d9871707..a240d887849 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -3696,7 +3696,7 @@ class ApplyDeclDefLinkOperation : public CppQuickFixOperation
public:
explicit ApplyDeclDefLinkOperation(const CppQuickFixInterface &interface,
const QSharedPointer<FunctionDeclDefLink> &link)
- : CppQuickFixOperation(interface, 10)
+ : CppQuickFixOperation(interface, 100)
, m_link(link)
{}
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index b4c0f9cb42a..8a57304e87b 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -40,7 +40,6 @@
#include <texteditor/basetexteditor.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/completionsettings.h>
-#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
@@ -266,15 +265,8 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
}
}
- if (IAssistProposal *newProposal = processor->perform(assistInterface)) {
- if (kind == QuickFix) {
- TextEditor::BasicProposalItemListModel *proposalModel =
- static_cast<TextEditor::BasicProposalItemListModel *>(newProposal->model());
- proposalModel->setSortingAllowed(false);
- }
-
+ if (IAssistProposal *newProposal = processor->perform(assistInterface))
displayProposal(newProposal, reason);
- }
delete processor;
}
--
GitLab