Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions

View File

@@ -28,10 +28,11 @@
#include "clangdiagnosticmanager.h"
#include "clangeditordocumentparser.h"
#include <coreplugin/id.h>
#include <cpptools/builtineditordocumentprocessor.h>
#include <cpptools/semantichighlighter.h>
#include <utils/id.h>
#include <QFutureWatcher>
#include <QTimer>
@@ -68,7 +69,7 @@ public:
CppTools::ProjectPart::Ptr projectPart() const;
void clearProjectPart();
Core::Id diagnosticConfigId() const;
::Utils::Id diagnosticConfigId() const;
void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic,
@@ -134,7 +135,7 @@ private:
BackendCommunicator &m_communicator;
QSharedPointer<ClangEditorDocumentParser> m_parser;
CppTools::ProjectPart::Ptr m_projectPart;
Core::Id m_diagnosticConfigId;
::Utils::Id m_diagnosticConfigId;
bool m_isProjectFile = false;
QFutureWatcher<void> m_parserWatcher;
QTimer m_updateBackendDocumentTimer;