feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Utils: Migrate further to Utils::Id

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/clangprojectsettings.cpp
View File

@@ -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;
}