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>

1 files changed, 0 insertions, 77 deletions

diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
deleted file mode 100644
index d5610265d0..0000000000
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ /dev/null
@@ -1,77 +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 <projectexplorer/projectexplorer.h>
-
-namespace Utils { class FilePath; }
-
-namespace CppTools {
-
-class CppCodeModelSettings;
-
-namespace Internal {
-
-struct CppFileSettings;
-
-class CppToolsPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CppTools.json")
-
-public:
-    CppToolsPlugin();
-    ~CppToolsPlugin() final;
-
-    static CppToolsPlugin *instance();
-    static const QStringList &headerSearchPaths();
-    static const QStringList &sourceSearchPaths();
-    static const QStringList &headerPrefixes();
-    static const QStringList &sourcePrefixes();
-    static void clearHeaderSourceCache();
-    static Utils::FilePath licenseTemplatePath();
-    static QString licenseTemplate();
-    static bool usePragmaOnce();
-
-    CppCodeModelSettings *codeModelSettings();
-    static CppFileSettings *fileSettings();
-
-public slots:
-    void switchHeaderSource();
-    void switchHeaderSourceInNextSplit();
-
-private:
-    bool initialize(const QStringList &arguments, QString *errorMessage) final;
-    void extensionsInitialized() final;
-    QVector<QObject *> createTestObjects() const final;
-
-    class CppToolsPluginPrivate *d = nullptr;
-};
-
-} // namespace Internal
-} // namespace CppTools