diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-30 10:58:08 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-01 14:53:58 +0000 |
commit | 284817fae6514701902ccdb834c2faa46462f2e8 (patch) | |
tree | 44a8c7d9813dc110b61c4639036366c7696bd7e9 /src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp | |
parent | 3e1fa0f170d523971d2c3c12da15a6e291f56511 (diff) | |
download | qt-creator-284817fae6514701902ccdb834c2faa46462f2e8.tar.gz |
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 <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp')
-rw-r--r-- | src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp deleted file mode 100644 index 1524844d26..0000000000 --- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp +++ /dev/null @@ -1,98 +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 "cpptoolsbridgeqtcreatorimplementation.h" - -#include "baseeditordocumentparser.h" -#include "cppmodelmanager.h" -#include "projectpart.h" -#include "editordocumenthandle.h" - -#include <coreplugin/editormanager/editormanager.h> - -namespace CppTools { - -namespace Internal { - -CppEditorDocumentHandle * -CppToolsBridgeQtCreatorImplementation::cppEditorDocument(const QString &filePath) const -{ - return CppModelManager::instance()->cppEditorDocument(filePath); -} - -namespace { - -CppTools::ProjectPart::ConstPtr projectPartForFile(const QString &filePath) -{ - if (const auto parser = BaseEditorDocumentParser::get(filePath)) - return parser->projectPartInfo().projectPart; - - return CppTools::ProjectPart::ConstPtr(); -} - -bool isProjectPartValid(const CppTools::ProjectPart::ConstPtr projectPart) -{ - if (projectPart) - return !CppTools::CppModelManager::instance()->projectPartForId(projectPart->id()).isNull(); - - return false; -} - -} // anonymous namespace - -QString CppToolsBridgeQtCreatorImplementation::projectPartIdForFile(const QString &filePath) const -{ - const CppTools::ProjectPart::ConstPtr projectPart = projectPartForFile(filePath); - - if (isProjectPartValid(projectPart)) - return projectPart->id(); // OK, Project Part is still loaded - - return QString(); -} - -BaseEditorDocumentProcessor * -CppToolsBridgeQtCreatorImplementation::baseEditorDocumentProcessor(const QString &filePath) const -{ - auto *document = cppEditorDocument(filePath); - if (document) - return document->processor(); - - return nullptr; -} - -void CppToolsBridgeQtCreatorImplementation::finishedRefreshingSourceFiles( - const QSet<QString> &filePaths) const -{ - CppModelManager::instance()->finishedRefreshingSourceFiles(filePaths); -} - -QList<Core::IEditor *> CppToolsBridgeQtCreatorImplementation::visibleEditors() const -{ - return Core::EditorManager::visibleEditors(); -} - -} // namespace Internal - -} // namespace CppTools |