From 284817fae6514701902ccdb834c2faa46462f2e8 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
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 <christian.stenger@qt.io>
---
 src/plugins/cpptools/baseeditordocumentparser.h | 116 ------------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 src/plugins/cpptools/baseeditordocumentparser.h

(limited to 'src/plugins/cpptools/baseeditordocumentparser.h')

diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h
deleted file mode 100644
index 6e19f1ff39..0000000000
--- a/src/plugins/cpptools/baseeditordocumentparser.h
+++ /dev/null
@@ -1,116 +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 "cpptools_utils.h"
-#include "cppworkingcopy.h"
-#include "projectpart.h"
-
-#include <QFutureInterface>
-#include <QObject>
-#include <QMutex>
-
-namespace ProjectExplorer { class Project; }
-
-namespace CppTools {
-
-class CPPTOOLS_EXPORT BaseEditorDocumentParser : public QObject
-{
-    Q_OBJECT
-
-public:
-    using Ptr = QSharedPointer<BaseEditorDocumentParser>;
-    static Ptr get(const QString &filePath);
-
-    struct Configuration {
-        bool usePrecompiledHeaders = false;
-        QByteArray editorDefines;
-        QString preferredProjectPartId;
-    };
-
-    struct UpdateParams {
-        UpdateParams(const WorkingCopy &workingCopy,
-                     const ProjectExplorer::Project *activeProject,
-                     Language languagePreference,
-                     bool projectsUpdated)
-            : workingCopy(workingCopy)
-            , activeProject(activeProject)
-            , languagePreference(languagePreference)
-            , projectsUpdated(projectsUpdated)
-        {
-        }
-
-        WorkingCopy workingCopy;
-        const ProjectExplorer::Project *activeProject = nullptr;
-        Language languagePreference = Language::Cxx;
-        bool projectsUpdated = false;
-    };
-
-public:
-    BaseEditorDocumentParser(const QString &filePath);
-    ~BaseEditorDocumentParser() override;
-
-    QString filePath() const;
-    Configuration configuration() const;
-    void setConfiguration(const Configuration &configuration);
-
-    void update(const UpdateParams &updateParams);
-    void update(const QFutureInterface<void> &future, const UpdateParams &updateParams);
-
-    ProjectPartInfo projectPartInfo() const;
-
-signals:
-    void projectPartInfoUpdated(const CppTools::ProjectPartInfo &projectPartInfo);
-
-protected:
-    struct State {
-        QByteArray editorDefines;
-        ProjectPartInfo projectPartInfo;
-    };
-    State state() const;
-    void setState(const State &state);
-
-    static ProjectPartInfo determineProjectPart(const QString &filePath,
-            const QString &preferredProjectPartId,
-            const ProjectPartInfo &currentProjectPartInfo,
-            const ProjectExplorer::Project *activeProject,
-            Language languagePreference,
-            bool projectsUpdated);
-
-    mutable QMutex m_stateAndConfigurationMutex;
-
-private:
-    virtual void updateImpl(const QFutureInterface<void> &future,
-                            const UpdateParams &updateParams) = 0;
-
-    const QString m_filePath;
-    Configuration m_configuration;
-    State m_state;
-    mutable QMutex m_updateIsRunning;
-};
-
-} // namespace CppTools
-- 
cgit v1.2.1