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

diff --git a/src/plugins/cpptools/cpplocatordata.cpp b/src/plugins/cpptools/cpplocatordata.cpp
deleted file mode 100644
index 3154f66ddb..0000000000
--- a/src/plugins/cpptools/cpplocatordata.cpp
+++ /dev/null
@@ -1,99 +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.
-**
-****************************************************************************/
-
-#include "cpplocatordata.h"
-#include "stringtable.h"
-
-using namespace CppTools;
-using namespace CppTools::Internal;
-
-enum { MaxPendingDocuments = 10 };
-
-CppLocatorData::CppLocatorData()
-{
-    m_search.setSymbolsToSearchFor(SymbolSearcher::Enums |
-                                   SymbolSearcher::Classes |
-                                   SymbolSearcher::Functions |
-                                   SymbolSearcher::TypeAliases);
-    m_pendingDocuments.reserve(MaxPendingDocuments);
-}
-
-void CppLocatorData::onDocumentUpdated(const CPlusPlus::Document::Ptr &document)
-{
-    QMutexLocker locker(&m_pendingDocumentsMutex);
-
-    bool isPending = false;
-    for (int i = 0, ei = m_pendingDocuments.size(); i < ei; ++i) {
-        const CPlusPlus::Document::Ptr &doc = m_pendingDocuments.at(i);
-        if (doc->fileName() == document->fileName()) {
-            isPending = true;
-            if (document->revision() >= doc->revision())
-                m_pendingDocuments[i] = document;
-            break;
-        }
-    }
-
-    if (!isPending && QFileInfo(document->fileName()).suffix() != "moc")
-        m_pendingDocuments.append(document);
-
-    flushPendingDocument(false);
-}
-
-void CppLocatorData::onAboutToRemoveFiles(const QStringList &files)
-{
-    if (files.isEmpty())
-        return;
-
-    QMutexLocker locker(&m_pendingDocumentsMutex);
-
-    foreach (const QString &file, files) {
-        m_infosByFile.remove(file);
-
-        for (int i = 0; i < m_pendingDocuments.size(); ++i) {
-            if (m_pendingDocuments.at(i)->fileName() == file) {
-                m_pendingDocuments.remove(i);
-                break;
-            }
-        }
-    }
-
-    StringTable::scheduleGC();
-    flushPendingDocument(false);
-}
-
-void CppLocatorData::flushPendingDocument(bool force) const
-{
-    // TODO: move this off the UI thread and into a future.
-    if (!force && m_pendingDocuments.size() < MaxPendingDocuments)
-        return;
-    if (m_pendingDocuments.isEmpty())
-        return;
-
-    foreach (CPlusPlus::Document::Ptr doc, m_pendingDocuments)
-        m_infosByFile.insert(StringTable::insert(doc->fileName()), m_search(doc));
-
-    m_pendingDocuments.clear();
-    m_pendingDocuments.reserve(MaxPendingDocuments);
-}