From e1c88116b397ecac2ef0f0678a419790a3e40402 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 26 Jun 2020 13:59:38 +0200 Subject: Core/Utils: Migrate further to Utils::Id The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller --- src/plugins/qmlprojectmanager/qmlproject.cpp | 1 + src/plugins/qmlprojectmanager/qmlproject.h | 2 +- src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/qmlprojectmanager') diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index fe7542e8cbe..7d6297db94a 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -62,6 +62,7 @@ using namespace Core; using namespace ProjectExplorer; using namespace QmlProjectManager::Internal; +using namespace Utils; namespace { Q_LOGGING_CATEGORY(infoLogger, "QmlProjectManager.QmlBuildSystem", QtInfoMsg) diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index acd8bc1094e..ad79351f54a 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -62,7 +62,7 @@ public: QmlProject *qmlProject() const; - QVariant additionalData(Core::Id id) const override; + QVariant additionalData(Utils::Id id) const override; enum RefreshOption { ProjectFile = 0x01, diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 8ec0c29246f..a0b77fffb7b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -69,7 +69,7 @@ class QmlProjectRunConfiguration final : public RunConfiguration Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration) public: - QmlProjectRunConfiguration(Target *target, Core::Id id); + QmlProjectRunConfiguration(Target *target, Utils::Id id); private: Runnable runnable() const final; -- cgit v1.2.3