aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp')
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 42a5b3028fb..4504fd82b94 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -77,7 +77,7 @@ bool isClCompatibleCompiler(const QString &compilerName)
return compilerName.endsWith("cl");
}
-Core::Id getCompilerId(QString compilerName)
+Utils::Id getCompilerId(QString compilerName)
{
if (Utils::HostOsInfo::isWindowsHost()) {
if (compilerName.endsWith(".exe"))
@@ -95,7 +95,7 @@ Core::Id getCompilerId(QString compilerName)
return ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID;
}
-ToolChain *toolchainFromCompilerId(const Core::Id &compilerId, const Core::Id &language)
+ToolChain *toolchainFromCompilerId(const Utils::Id &compilerId, const Utils::Id &language)
{
return ToolChainManager::toolChain([&compilerId, &language](const ToolChain *tc) {
if (!tc->isValid() || tc->language() != language)
@@ -125,7 +125,7 @@ QString compilerPath(QString pathFlag)
return QDir::fromNativeSeparators(pathFlag);
}
-ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Core::Id &language)
+ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Utils::Id &language)
{
if (flags.empty())
return ToolChainKitAspect::toolChain(kit, language);
@@ -138,7 +138,7 @@ ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Co
if (toolchain)
return toolchain;
- Core::Id compilerId = getCompilerId(compiler.fileName());
+ Utils::Id compilerId = getCompilerId(compiler.fileName());
if ((toolchain = toolchainFromCompilerId(compilerId, language)))
return toolchain;
@@ -518,7 +518,7 @@ CompilationDatabaseEditorFactory::CompilationDatabaseEditorFactory()
class CompilationDatabaseBuildConfiguration : public BuildConfiguration
{
public:
- CompilationDatabaseBuildConfiguration(Target *target, Core::Id id)
+ CompilationDatabaseBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id)
{
}