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, 96 deletions

diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h
deleted file mode 100644
index c9aba51d07..0000000000
--- a/src/plugins/cpptools/cppcodestylesettingspage.h
+++ /dev/null
@@ -1,96 +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 "cppcodestylesettings.h"
-#include "cppcodeformatter.h"
-
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <texteditor/icodestylepreferencesfactory.h>
-
-#include <QWidget>
-#include <QPointer>
-
-namespace TextEditor {
-    class FontSettings;
-    class TabSettings;
-    class SnippetEditorWidget;
-    class CodeStyleEditor;
-}
-
-namespace CppTools {
-
-class CppCodeStylePreferences;
-
-namespace Internal {
-
-namespace Ui { class CppCodeStyleSettingsPage; }
-
-class CppCodeStylePreferencesWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit CppCodeStylePreferencesWidget(QWidget *parent = nullptr);
-    ~CppCodeStylePreferencesWidget() override;
-
-    void setCodeStyle(CppTools::CppCodeStylePreferences *codeStylePreferences);
-
-private:
-    void decorateEditors(const TextEditor::FontSettings &fontSettings);
-    void setVisualizeWhitespace(bool on);
-    void slotTabSettingsChanged(const TextEditor::TabSettings &settings);
-    void slotCodeStyleSettingsChanged();
-    void updatePreview();
-    void setTabSettings(const TextEditor::TabSettings &settings);
-    void setCodeStyleSettings(const CppTools::CppCodeStyleSettings &settings, bool preview = true);
-    void slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *, bool preview = true);
-
-    CppCodeStyleSettings cppCodeStyleSettings() const;
-
-    CppCodeStylePreferences *m_preferences = nullptr;
-    Ui::CppCodeStyleSettingsPage *m_ui;
-    QList<TextEditor::SnippetEditorWidget *> m_previews;
-    bool m_blockUpdates = false;
-};
-
-
-class CppCodeStyleSettingsPage : public Core::IOptionsPage
-{
-public:
-    CppCodeStyleSettingsPage();
-
-    QWidget *widget() override;
-    void apply() override;
-    void finish() override;
-
-private:
-    CppCodeStylePreferences *m_pageCppCodeStylePreferences = nullptr;
-    QPointer<TextEditor::CodeStyleEditorWidget> m_widget;
-};
-
-} // namespace Internal
-} // namespace CppTools