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

diff --git a/src/plugins/cpptools/cppheadersource_test.cpp b/src/plugins/cpptools/cppheadersource_test.cpp
deleted file mode 100644
index 1900040419..0000000000
--- a/src/plugins/cpptools/cppheadersource_test.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Orgad Shaneh <orgads@gmail.com>.
-** 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.
-**
-****************************************************************************/
-
-#include "cppheadersource_test.h"
-
-#include "cpptoolsplugin.h"
-#include "cpptoolsreuse.h"
-#include "cpptoolstestcase.h"
-#include "cppfilesettingspage.h"
-
-#include <utils/fileutils.h>
-#include <utils/temporarydirectory.h>
-
-#include <QDir>
-#include <QtTest>
-
-static inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); }
-
-static void createTempFile(const QString &fileName)
-{
-    QFile file(fileName);
-    QDir(QFileInfo(fileName).absolutePath()).mkpath(_("."));
-    file.open(QFile::WriteOnly);
-    file.close();
-}
-
-static QString baseTestDir()
-{
-    return Utils::TemporaryDirectory::masterDirectoryPath() + "/qtc_cppheadersource/";
-}
-
-namespace CppTools {
-namespace Internal {
-
-void HeaderSourceTest::test()
-{
-    QFETCH(QString, sourceFileName);
-    QFETCH(QString, headerFileName);
-
-    Tests::TemporaryDir temporaryDir;
-    QVERIFY(temporaryDir.isValid());
-
-    const QDir path = QDir(temporaryDir.path() + QLatin1Char('/') + _(QTest::currentDataTag()));
-    const QString sourcePath = path.absoluteFilePath(sourceFileName);
-    const QString headerPath = path.absoluteFilePath(headerFileName);
-    createTempFile(sourcePath);
-    createTempFile(headerPath);
-
-    bool wasHeader;
-    CppToolsPlugin::clearHeaderSourceCache();
-    QCOMPARE(correspondingHeaderOrSource(sourcePath, &wasHeader), headerPath);
-    QVERIFY(!wasHeader);
-    CppToolsPlugin::clearHeaderSourceCache();
-    QCOMPARE(correspondingHeaderOrSource(headerPath, &wasHeader), sourcePath);
-    QVERIFY(wasHeader);
-}
-
-void HeaderSourceTest::test_data()
-{
-    QTest::addColumn<QString>("sourceFileName");
-    QTest::addColumn<QString>("headerFileName");
-    QTest::newRow("samedir") << _("foo.cpp") << _("foo.h");
-    QTest::newRow("includesub") << _("foo.cpp") << _("include/foo.h");
-    QTest::newRow("headerprefix") << _("foo.cpp") << _("testh_foo.h");
-    QTest::newRow("sourceprefixwsub") << _("testc_foo.cpp") << _("include/foo.h");
-    QTest::newRow("sourceAndHeaderPrefixWithBothsub") << _("src/testc_foo.cpp") << _("include/testh_foo.h");
-}
-
-void HeaderSourceTest::initTestCase()
-{
-    QDir(baseTestDir()).mkpath(_("."));
-    CppFileSettings *fs = CppToolsPlugin::fileSettings();
-    fs->headerSearchPaths.append(QLatin1String("include"));
-    fs->headerSearchPaths.append(QLatin1String("../include"));
-    fs->sourceSearchPaths.append(QLatin1String("src"));
-    fs->sourceSearchPaths.append(QLatin1String("../src"));
-    fs->headerPrefixes.append(QLatin1String("testh_"));
-    fs->sourcePrefixes.append(QLatin1String("testc_"));
-}
-
-void HeaderSourceTest::cleanupTestCase()
-{
-    Utils::FilePath::fromString(baseTestDir()).removeRecursively();
-    CppFileSettings *fs = CppToolsPlugin::fileSettings();
-    fs->headerSearchPaths.removeLast();
-    fs->headerSearchPaths.removeLast();
-    fs->sourceSearchPaths.removeLast();
-    fs->sourceSearchPaths.removeLast();
-    fs->headerPrefixes.removeLast();
-    fs->sourcePrefixes.removeLast();
-}
-
-} // namespace Internal
-} // namespace CppTools