From 284817fae6514701902ccdb834c2faa46462f2e8 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Aug 2021 10:58:08 +0200 Subject: Merge CppTools into CppEditor There was no proper separation of responsibilities between these plugins. In particular, CppTools had lots of editor-related functionality, so it's not clear why it was separated out in the first place. In fact, for a lot of code, it seemed quite arbitrary where it was put (just one example: switchHeaderSource() was in CppTools, wheras switchDeclarationDefinition() was in CppEditor). Merging the plugins will enable us to get rid of various convoluted pseudo-abstractions that were only introduced to keep up the artificial separation. Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a Reviewed-by: Christian Stenger --- .../cpptools/cppvirtualfunctionproposalitem.h | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 src/plugins/cpptools/cppvirtualfunctionproposalitem.h (limited to 'src/plugins/cpptools/cppvirtualfunctionproposalitem.h') diff --git a/src/plugins/cpptools/cppvirtualfunctionproposalitem.h b/src/plugins/cpptools/cppvirtualfunctionproposalitem.h deleted file mode 100644 index d3d3d8da5c..0000000000 --- a/src/plugins/cpptools/cppvirtualfunctionproposalitem.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include "cpptools_global.h" - -#include -#include - -namespace CppTools { - -class CPPTOOLS_EXPORT VirtualFunctionProposalItem final : public TextEditor::AssistProposalItem -{ -public: - VirtualFunctionProposalItem(const Utils::Link &link, - bool openInSplit = true); - ~VirtualFunctionProposalItem() noexcept override = default; - void apply(TextEditor::TextDocumentManipulatorInterface &manipulator, - int basePosition) const override; - Utils::Link link() const { return m_link; } // Exposed for tests - -private: - Utils::Link m_link; - bool m_openInSplit; -}; - -} // namespace CppEditor -- cgit v1.2.1