diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index a240d887849a4e4aa73e5fdf018c100860252548..2c320ab533232bd1b75755c91a63df71dbbe17ff 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -2334,8 +2334,8 @@ class InsertDeclOperation: public CppQuickFixOperation public: InsertDeclOperation(const QSharedPointer<const CppQuickFixAssistInterface> &interface, const QString &targetFileName, const Class *targetSymbol, - InsertionPointLocator::AccessSpec xsSpec, const QString &decl) - : CppQuickFixOperation(interface, 0) + InsertionPointLocator::AccessSpec xsSpec, const QString &decl, int priority) + : CppQuickFixOperation(interface, priority) , m_targetFileName(targetFileName) , m_targetSymbol(targetSymbol) , m_xsSpec(xsSpec) @@ -2397,10 +2397,11 @@ public: , m_decl(decl) {} TextEditor::QuickFixOperation::Ptr - operator()(InsertionPointLocator::AccessSpec xsSpec) + operator()(InsertionPointLocator::AccessSpec xsSpec, int priority) { 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: @@ -2462,12 +2463,12 @@ void InsertDeclFromDef::match(const CppQuickFixInterface &interface, QuickFixOpe // Add several possible insertion locations for declaration DeclOperationFactory operation(interface, fileName, matchingClass, decl); - result.append(operation(InsertionPointLocator::Public)); - result.append(operation(InsertionPointLocator::PublicSlot)); - result.append(operation(InsertionPointLocator::Protected)); - result.append(operation(InsertionPointLocator::ProtectedSlot)); - result.append(operation(InsertionPointLocator::Private)); - result.append(operation(InsertionPointLocator::PrivateSlot)); + result.append(operation(InsertionPointLocator::Public, 5)); + result.append(operation(InsertionPointLocator::PublicSlot, 4)); + result.append(operation(InsertionPointLocator::Protected, 3)); + result.append(operation(InsertionPointLocator::ProtectedSlot, 2)); + result.append(operation(InsertionPointLocator::Private, 1)); + result.append(operation(InsertionPointLocator::PrivateSlot, 0)); } } diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp index 2c0c1112ccbf175a84671acff469f3a4101203ca..b6c479b9c89e08700b0fda27ad7842a181ece4df 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp @@ -118,13 +118,11 @@ struct ContentLessThan } // Anonymous BasicProposalItemListModel::BasicProposalItemListModel() - : m_isSortingAllowed(true) {} BasicProposalItemListModel::BasicProposalItemListModel(const QList<BasicProposalItem *> &items) : m_currentItems(items) , m_originalItems(items) - , m_isSortingAllowed(true) { mapPersistentIds(); } @@ -141,16 +139,6 @@ void BasicProposalItemListModel::loadContent(const QList<BasicProposalItem *> &i mapPersistentIds(); } -void BasicProposalItemListModel::setSortingAllowed(bool isAllowed) -{ - m_isSortingAllowed = isAllowed; -} - -bool BasicProposalItemListModel::isSortingAllowed() const -{ - return m_isSortingAllowed; -} - void BasicProposalItemListModel::mapPersistentIds() { for (int i = 0; i < m_originalItems.size(); ++i) @@ -270,8 +258,6 @@ bool BasicProposalItemListModel::isSortable(const QString &prefix) const { Q_UNUSED(prefix); - if (!isSortingAllowed()) - return false; if (m_currentItems.size() < kMaxSort) return true; return false; diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h index e9769a192f26b75b449c85cea46f833a24ee0020..9de70b4374d8bde41976080a23ec058619d1ef6a 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h @@ -78,7 +78,6 @@ private: QHash<QString, int> m_idByText; QList<BasicProposalItem *> m_originalItems; - bool m_isSortingAllowed; }; } // TextEditor