From c06004b4ab5b055dd5dc19be6f7bed3bace42205 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Sat, 19 Oct 2013 15:57:12 +0200 Subject: CppEditor: Extract VirtualFunctionProposalItem into separate files ...for tests. Change-Id: Idc408e30ee0cdc22610e3037f94de5f7d246accf Reviewed-by: Erik Verbruggen --- .../cppeditor/cppvirtualfunctionassistprovider.cpp | 29 ++-------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp') diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index fb9c7621ba..5f44589885 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp @@ -32,6 +32,7 @@ #include "cppeditorconstants.h" #include "cppelementevaluator.h" +#include "cppvirtualfunctionproposalitem.h" #include #include @@ -39,7 +40,6 @@ #include #include -#include #include #include #include @@ -53,31 +53,6 @@ using namespace CPlusPlus; using namespace CppEditor::Internal; using namespace TextEditor; -class VirtualFunctionProposalItem: public BasicProposalItem { -public: - VirtualFunctionProposalItem(const BaseTextEditorWidget::Link &link, bool openInSplit = true) - : m_link(link), m_openInSplit(openInSplit) {} - - void apply(BaseTextEditor * /* editor */, int /* basePosition */) const - { - if (!m_link.hasValidTarget()) - return; - - Core::EditorManager::OpenEditorFlags flags; - if (m_openInSplit) - flags |= Core::EditorManager::OpenInOtherSplit; - Core::EditorManager::openEditorAt(m_link.targetFileName, - m_link.targetLine, - m_link.targetColumn, - CppEditor::Constants::CPPEDITOR_ID, - flags); - } - -private: - BaseTextEditorWidget::Link m_link; - bool m_openInSplit; -}; - /// Activate current item with the same shortcut that is configured for Follow Symbol Under Cursor. /// This is limited to single-key shortcuts without modifiers. class VirtualFunctionProposalWidget : public GenericProposalWidget @@ -166,7 +141,7 @@ public: QTC_ASSERT(!m_snapshot.isEmpty(), return 0); const QList overrides = FunctionHelper::overrides(m_startClass, m_function, - m_snapshot); + m_snapshot); QList items; foreach (Symbol *symbol, overrides) items << itemFromSymbol(symbol, m_function); -- cgit v1.2.1