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/cppeditor/projectinfo.h | 79 +++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src/plugins/cppeditor/projectinfo.h (limited to 'src/plugins/cppeditor/projectinfo.h') diff --git a/src/plugins/cppeditor/projectinfo.h b/src/plugins/cppeditor/projectinfo.h new file mode 100644 index 0000000000..0e6c9e70f6 --- /dev/null +++ b/src/plugins/cppeditor/projectinfo.h @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** 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 "cppeditor_global.h" + +#include "projectpart.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include + +namespace CppEditor { + +class CPPEDITOR_EXPORT ProjectInfo +{ +public: + using ConstPtr = std::shared_ptr; + static ConstPtr create(const ProjectExplorer::ProjectUpdateInfo &updateInfo, + const QVector &projectParts); + + const QVector projectParts() const; + const QSet sourceFiles() const; + QString projectName() const { return m_projectName; } + Utils::FilePath projectFilePath() const { return m_projectFilePath; } + Utils::FilePath projectRoot() const { return m_projectFilePath.parentDir(); } + Utils::FilePath buildRoot() const { return m_buildRoot; } + + // Comparisons + bool operator ==(const ProjectInfo &other) const; + bool operator !=(const ProjectInfo &other) const; + bool definesChanged(const ProjectInfo &other) const; + bool configurationChanged(const ProjectInfo &other) const; + bool configurationOrFilesChanged(const ProjectInfo &other) const; + +private: + ProjectInfo(const ProjectExplorer::ProjectUpdateInfo &updateInfo, + const QVector &projectParts); + + const QVector m_projectParts; + const QString m_projectName; + const Utils::FilePath m_projectFilePath; + const Utils::FilePath m_buildRoot; + const ProjectExplorer::HeaderPaths m_headerPaths; + const QSet m_sourceFiles; + const ProjectExplorer::Macros m_defines; +}; + +} // namespace CppEditor -- cgit v1.2.3