summaryrefslogtreecommitdiff
path: root/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-19 15:57:12 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-23 10:47:11 +0200
commitc06004b4ab5b055dd5dc19be6f7bed3bace42205 (patch)
tree86c72bb5d7ee5e6625e1af2d617b5bfabe9ba51c /src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
parent1a5c7d8ef58660da8125ee78014d6e05fd55c1a9 (diff)
downloadqt-creator-c06004b4ab5b055dd5dc19be6f7bed3bace42205.tar.gz
CppEditor: Extract VirtualFunctionProposalItem into separate files
...for tests. Change-Id: Idc408e30ee0cdc22610e3037f94de5f7d246accf Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp')
-rw-r--r--src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp29
1 files changed, 2 insertions, 27 deletions
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 <cplusplus/Icons.h>
#include <cplusplus/Overview.h>
@@ -39,7 +40,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
-#include <texteditor/codeassist/basicproposalitem.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/genericproposalwidget.h>
@@ -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<Symbol *> overrides = FunctionHelper::overrides(m_startClass, m_function,
- m_snapshot);
+ m_snapshot);
QList<BasicProposalItem *> items;
foreach (Symbol *symbol, overrides)
items << itemFromSymbol(symbol, m_function);