From c06004b4ab5b055dd5dc19be6f7bed3bace42205 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Sat, 19 Oct 2013 15:57:12 +0200 Subject: [PATCH] CppEditor: Extract VirtualFunctionProposalItem into separate files ...for tests. Change-Id: Idc408e30ee0cdc22610e3037f94de5f7d246accf Reviewed-by: Erik Verbruggen --- src/plugins/cppeditor/cppeditor.pro | 2 + src/plugins/cppeditor/cppeditor.qbs | 2 + .../cppvirtualfunctionassistprovider.cpp | 29 +--------- .../cppvirtualfunctionproposalitem.cpp | 55 +++++++++++++++++++ .../cppvirtualfunctionproposalitem.h | 53 ++++++++++++++++++ 5 files changed, 114 insertions(+), 27 deletions(-) create mode 100644 src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp create mode 100644 src/plugins/cppeditor/cppvirtualfunctionproposalitem.h diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 64ffa94641f..f7fe4eb9af5 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -25,6 +25,7 @@ HEADERS += cppeditorplugin.h \ cppincludehierarchyitem.h \ cppincludehierarchytreeview.h \ cppvirtualfunctionassistprovider.h \ + cppvirtualfunctionproposalitem.h \ cpppreprocessordialog.h SOURCES += cppeditorplugin.cpp \ @@ -49,6 +50,7 @@ SOURCES += cppeditorplugin.cpp \ cppincludehierarchyitem.cpp \ cppincludehierarchytreeview.cpp \ cppvirtualfunctionassistprovider.cpp \ + cppvirtualfunctionproposalitem.cpp \ cpppreprocessordialog.cpp RESOURCES += cppeditor.qrc diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index d8c465ad557..920b3a834bf 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -65,6 +65,8 @@ QtcPlugin { "cpptypehierarchy.h", "cppvirtualfunctionassistprovider.cpp", "cppvirtualfunctionassistprovider.h", + "cppvirtualfunctionproposalitem.cpp", + "cppvirtualfunctionproposalitem.h", ] Group { diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index fb9c7621baf..5f445898855 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); diff --git a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp new file mode 100644 index 00000000000..91335af54de --- /dev/null +++ b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#include "cppvirtualfunctionproposalitem.h" + +#include "cppeditorconstants.h" + +using namespace CppEditor::Internal; + +VirtualFunctionProposalItem::VirtualFunctionProposalItem( + const TextEditor::BaseTextEditorWidget::Link &link, bool openInSplit) + : m_link(link), m_openInSplit(openInSplit) +{ +} + +void VirtualFunctionProposalItem::apply(TextEditor::BaseTextEditor *, int) 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); +} diff --git a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h new file mode 100644 index 00000000000..7d09c9db2cd --- /dev/null +++ b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#ifndef CPPVIRTUALFUNCTIONPROPOSALITEM_H +#define CPPVIRTUALFUNCTIONPROPOSALITEM_H + +#include +#include + +namespace CppEditor { +namespace Internal { + +class VirtualFunctionProposalItem: public TextEditor::BasicProposalItem { +public: + VirtualFunctionProposalItem(const TextEditor::BaseTextEditorWidget::Link &link, + bool openInSplit = true); + void apply(TextEditor::BaseTextEditor * /* editor */, int /* basePosition */) const; + +private: + TextEditor::BaseTextEditorWidget::Link m_link; + bool m_openInSplit; +}; + +} // namespace Internal +} // namespace CppEditor + +#endif // CPPVIRTUALFUNCTIONPROPOSALITEM_H