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

CppEditor: Fix sorting of quick fixes "Add {public, private, ...} declaration"

Browse Source 
Change-Id: I43f09042a525a798d95b3365873be24eafd423e9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-06-03 14:57:13 +02:00
parent 5e5c5bb02b
commit b8a2983fd5
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -2334,8 +2334,8 @@ class InsertDeclOperation: public CppQuickFixOperation
public: public:
InsertDeclOperation(const QSharedPointer<const CppQuickFixAssistInterface> &interface, InsertDeclOperation(const QSharedPointer<const CppQuickFixAssistInterface> &interface,
const QString &targetFileName, const Class *targetSymbol, const QString &targetFileName, const Class *targetSymbol,
InsertionPointLocator::AccessSpec xsSpec, const QString &decl) InsertionPointLocator::AccessSpec xsSpec, const QString &decl, int priority)
: CppQuickFixOperation(interface, 0) : CppQuickFixOperation(interface, priority)
, m_targetFileName(targetFileName) , m_targetFileName(targetFileName)
, m_targetSymbol(targetSymbol) , m_targetSymbol(targetSymbol)
, m_xsSpec(xsSpec) , m_xsSpec(xsSpec)
@@ -2397,10 +2397,11 @@ public:
, m_decl(decl) , m_decl(decl)
{} {}
TextEditor::QuickFixOperation::Ptr TextEditor::QuickFixOperation::Ptr
operator()(InsertionPointLocator::AccessSpec xsSpec) operator()(InsertionPointLocator::AccessSpec xsSpec, int priority)
{ {
return TextEditor::QuickFixOperation::Ptr( return TextEditor::QuickFixOperation::Ptr(
new InsertDeclOperation(m_interface, m_fileName, m_matchingClass, xsSpec, m_decl)); new InsertDeclOperation(m_interface, m_fileName, m_matchingClass, xsSpec, m_decl,
priority));
} }
private: private:
@@ -2462,12 +2463,12 @@ void InsertDeclFromDef::match(const CppQuickFixInterface &interface, QuickFixOpe
// Add several possible insertion locations for declaration // Add several possible insertion locations for declaration
DeclOperationFactory operation(interface, fileName, matchingClass, decl); DeclOperationFactory operation(interface, fileName, matchingClass, decl);
result.append(operation(InsertionPointLocator::Public)); result.append(operation(InsertionPointLocator::Public, 5));
result.append(operation(InsertionPointLocator::PublicSlot)); result.append(operation(InsertionPointLocator::PublicSlot, 4));
result.append(operation(InsertionPointLocator::Protected)); result.append(operation(InsertionPointLocator::Protected, 3));
result.append(operation(InsertionPointLocator::ProtectedSlot)); result.append(operation(InsertionPointLocator::ProtectedSlot, 2));
result.append(operation(InsertionPointLocator::Private)); result.append(operation(InsertionPointLocator::Private, 1));
result.append(operation(InsertionPointLocator::PrivateSlot)); result.append(operation(InsertionPointLocator::PrivateSlot, 0));
} }
} }

14
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp
View File

@@ -118,13 +118,11 @@ struct ContentLessThan
} // Anonymous } // Anonymous
BasicProposalItemListModel::BasicProposalItemListModel() BasicProposalItemListModel::BasicProposalItemListModel()
: m_isSortingAllowed(true)
{} {}
BasicProposalItemListModel::BasicProposalItemListModel(const QList<BasicProposalItem *> &items) BasicProposalItemListModel::BasicProposalItemListModel(const QList<BasicProposalItem *> &items)
: m_currentItems(items) : m_currentItems(items)
, m_originalItems(items) , m_originalItems(items)
, m_isSortingAllowed(true)
{ {
mapPersistentIds(); mapPersistentIds();
} }
@@ -141,16 +139,6 @@ void BasicProposalItemListModel::loadContent(const QList<BasicProposalItem *> &i
mapPersistentIds(); mapPersistentIds();
} }
void BasicProposalItemListModel::setSortingAllowed(bool isAllowed)
{
m_isSortingAllowed = isAllowed;
}
bool BasicProposalItemListModel::isSortingAllowed() const
{
return m_isSortingAllowed;
}
void BasicProposalItemListModel::mapPersistentIds() void BasicProposalItemListModel::mapPersistentIds()
{ {
for (int i = 0; i < m_originalItems.size(); ++i) for (int i = 0; i < m_originalItems.size(); ++i)
@@ -270,8 +258,6 @@ bool BasicProposalItemListModel::isSortable(const QString &prefix) const
{ {
Q_UNUSED(prefix); Q_UNUSED(prefix);
if (!isSortingAllowed())
return false;
if (m_currentItems.size() < kMaxSort) if (m_currentItems.size() < kMaxSort)
return true; return true;
return false; return false;

1
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
View File

@@ -78,7 +78,6 @@ private:
QHash<QString, int> m_idByText; QHash<QString, int> m_idByText;
QList<BasicProposalItem *> m_originalItems; QList<BasicProposalItem *> m_originalItems;
bool m_isSortingAllowed;
}; };
} // TextEditor } // TextEditor