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

QuickFixes: Sort by priority.

Browse Source 
* Generally changes the BasicProposalItemListModel's sort to take the
  BasicProposalItem::order member into account.
* Currently only the QML completion and quick fixes set the order.
* This means the 'Apply signature changes' quick fix is now further up
  than the 'add definition' quick fix.

Change-Id: I7b5bc82aa37fca232fddd630ab3273437e1bcc09
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-11-04 09:34:03 +01:00
parent dbc84d8c1c
commit c2eb453228
4 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cppeditor/cppinsertdecldef.cpp
View File

@@ -55,11 +55,10 @@ class InsertDeclOperation: public CppQuickFixOperation
{
public:
InsertDeclOperation(const QSharedPointer<const Internal::CppQuickFixAssistInterface> &interface,
int priority,
const QString &targetFileName, const Class *targetSymbol,
InsertionPointLocator::AccessSpec xsSpec,
const QString &decl)
: CppQuickFixOperation(interface, priority)
: CppQuickFixOperation(interface, 0)
, m_targetFileName(targetFileName)
, m_targetSymbol(targetSymbol)
, m_xsSpec(xsSpec)
@@ -183,7 +182,7 @@ QList<CppQuickFixOperation::Ptr> DeclFromDef::match(
method,
binding);
return singleResult(
new InsertDeclOperation(interface, idx, fn, matchingClass,
new InsertDeclOperation(interface, fn, matchingClass,
InsertionPointLocator::Public,
decl));
}
@@ -216,9 +215,9 @@ namespace {
class InsertDefOperation: public CppQuickFixOperation
{
public:
InsertDefOperation(const QSharedPointer<const Internal::CppQuickFixAssistInterface> &interface, int priority,
InsertDefOperation(const QSharedPointer<const Internal::CppQuickFixAssistInterface> &interface,
Declaration *decl, const InsertionLocation &loc)
: CppQuickFixOperation(interface, priority)
: CppQuickFixOperation(interface, 0)
, m_decl(decl)
, m_loc(loc)
{
@@ -304,7 +303,7 @@ QList<CppQuickFixOperation::Ptr> DefFromDecl::match(
QList<CppQuickFixOperation::Ptr> results;
foreach (const InsertionLocation &loc, locator.methodDefinition(decl)) {
if (loc.isValid())
results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(interface, idx, decl, loc)));
results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(interface, decl, loc)));
}
return results;
}