diff options
author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-07-06 06:07:13 +0000 |
commit | 430a33dcd9ac80ddb848e41f8f059102857c88aa (patch) | |
tree | 9af1619701306a6bad6a06645091f2d3b2838e9c /src/plugins/clangcodemodel/clangprojectsettings.cpp | |
parent | 492439262079dcf1d5c503208b905be8c82a694b (diff) | |
download | qt-creator-430a33dcd9ac80ddb848e41f8f059102857c88aa.tar.gz |
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>
Diffstat (limited to 'src/plugins/clangcodemodel/clangprojectsettings.cpp')
-rw-r--r-- | src/plugins/clangcodemodel/clangprojectsettings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangprojectsettings.cpp b/src/plugins/clangcodemodel/clangprojectsettings.cpp index c081203669..2d1019a057 100644 --- a/src/plugins/clangcodemodel/clangprojectsettings.cpp +++ b/src/plugins/clangcodemodel/clangprojectsettings.cpp @@ -51,9 +51,9 @@ static bool useGlobalConfigFromSettings(ProjectExplorer::Project *project) return useGlobalConfigVariant.isValid() ? useGlobalConfigVariant.toBool() : true; } -static Core::Id warningConfigIdFromSettings(ProjectExplorer::Project *project) +static Utils::Id warningConfigIdFromSettings(ProjectExplorer::Project *project) { - return Core::Id::fromSetting(project->namedSettings(warningConfigIdKey())); + return Utils::Id::fromSetting(project->namedSettings(warningConfigIdKey())); } static QStringList customCommandLineFromSettings(ProjectExplorer::Project *project) @@ -75,7 +75,7 @@ ClangProjectSettings::ClangProjectSettings(ProjectExplorer::Project *project) this, &ClangProjectSettings::store); } -Core::Id ClangProjectSettings::warningConfigId() const +Utils::Id ClangProjectSettings::warningConfigId() const { const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel(); if (!model.hasConfigWithId(m_warningConfigId)) @@ -83,7 +83,7 @@ Core::Id ClangProjectSettings::warningConfigId() const return m_warningConfigId; } -void ClangProjectSettings::setWarningConfigId(const Core::Id &customConfigId) +void ClangProjectSettings::setWarningConfigId(const Utils::Id &customConfigId) { m_warningConfigId = customConfigId; } |