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

diff --git a/src/plugins/cpptools/cppelementevaluator.h b/src/plugins/cpptools/cppelementevaluator.h
deleted file mode 100644
index c0d8374759..0000000000
--- a/src/plugins/cpptools/cppelementevaluator.h
+++ /dev/null
@@ -1,128 +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 <coreplugin/helpitem.h>
-#include <texteditor/texteditor.h>
-
-#include <cplusplus/CppDocument.h>
-
-#include <QFuture>
-#include <QIcon>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QTextCursor>
-
-#include <functional>
-
-namespace CPlusPlus {
-class LookupItem;
-class LookupContext;
-}
-
-namespace CppTools {
-class CppElement;
-class CppModelManager;
-
-class CPPTOOLS_EXPORT CppElementEvaluator final
-{
-public:
-    explicit CppElementEvaluator(TextEditor::TextEditorWidget *editor);
-    ~CppElementEvaluator();
-
-    void setTextCursor(const QTextCursor &tc);
-
-    void execute();
-    static QFuture<QSharedPointer<CppElement>> asyncExecute(TextEditor::TextEditorWidget *editor);
-    static QFuture<QSharedPointer<CppElement>> asyncExecute(const QString &expression,
-                                                            const QString &fileName);
-    bool identifiedCppElement() const;
-    const QSharedPointer<CppElement> &cppElement() const;
-    bool hasDiagnosis() const;
-    const QString &diagnosis() const;
-
-    static Utils::Link linkFromExpression(const QString &expression, const QString &fileName);
-
-private:
-    class CppElementEvaluatorPrivate *d;
-};
-
-class CppClass;
-
-class CPPTOOLS_EXPORT CppElement
-{
-protected:
-    CppElement();
-
-public:
-    virtual ~CppElement();
-
-    virtual CppClass *toCppClass();
-
-    Core::HelpItem::Category helpCategory = Core::HelpItem::Unknown;
-    QStringList helpIdCandidates;
-    QString helpMark;
-    Utils::Link link;
-    QString tooltip;
-};
-
-class CPPTOOLS_EXPORT CppDeclarableElement : public CppElement
-{
-public:
-    explicit CppDeclarableElement(CPlusPlus::Symbol *declaration);
-
-public:
-    CPlusPlus::Symbol *declaration;
-    QString name;
-    QString qualifiedName;
-    QString type;
-    QIcon icon;
-};
-
-class CPPTOOLS_EXPORT CppClass : public CppDeclarableElement
-{
-public:
-    CppClass();
-    explicit CppClass(CPlusPlus::Symbol *declaration);
-
-    bool operator==(const CppClass &other);
-
-    CppClass *toCppClass() final;
-
-    void lookupBases(QFutureInterfaceBase &futureInterface,
-                     CPlusPlus::Symbol *declaration, const CPlusPlus::LookupContext &context);
-    void lookupDerived(QFutureInterfaceBase &futureInterface,
-                       CPlusPlus::Symbol *declaration, const CPlusPlus::Snapshot &snapshot);
-
-public:
-    QList<CppClass> bases;
-    QList<CppClass> derived;
-};
-
-} // namespace CppTools