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 --- src/plugins/cpptools/cpptoolsbridge.cpp | 66 --------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 src/plugins/cpptools/cpptoolsbridge.cpp (limited to 'src/plugins/cpptools/cpptoolsbridge.cpp') diff --git a/src/plugins/cpptools/cpptoolsbridge.cpp b/src/plugins/cpptools/cpptoolsbridge.cpp deleted file mode 100644 index aacb7153ab..0000000000 --- a/src/plugins/cpptools/cpptoolsbridge.cpp +++ /dev/null @@ -1,66 +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. -** -****************************************************************************/ - -#include "cpptoolsbridge.h" - -#include "cpptoolsbridgeinterface.h" - -#include - -namespace CppTools { - -std::unique_ptr CppToolsBridge::m_interface; - -void CppToolsBridge::setCppToolsBridgeImplementation(std::unique_ptr &&interface) -{ - m_interface = std::move(interface); -} - -CppTools::CppEditorDocumentHandle *CppToolsBridge::cppEditorDocument(const QString &filePath) -{ - return m_interface->cppEditorDocument(filePath); -} - -QString CppToolsBridge::projectPartIdForFile(const QString &filePath) -{ - return m_interface->projectPartIdForFile(filePath); -} - -BaseEditorDocumentProcessor *CppToolsBridge::baseEditorDocumentProcessor(const QString &filePath) -{ - return m_interface->baseEditorDocumentProcessor(filePath); -} - -void CppToolsBridge::finishedRefreshingSourceFiles(const QSet &filePaths) -{ - m_interface->finishedRefreshingSourceFiles(filePaths); -} - -QList CppToolsBridge::visibleEditors() -{ - return m_interface->visibleEditors(); -} - -} // namespace CppTools -- cgit v1.2.1