From e0ab8ad2587648cfdd3727890ad19624c346b9d9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 11 May 2022 15:27:09 +0200 Subject: [PATCH] ClangCodeModel: Fix check for whether clangd should be used Change-Id: I789c12b1b4098e6f11f190cf1ada6de9429c6101 Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: David Schulz --- src/plugins/clangcodemodel/clangmodelmanagersupport.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index b0acd2a30cb..701f0b99807 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -299,8 +299,8 @@ void ClangModelManagerSupport::connectToWidgetsMarkContextMenuRequested(QWidget void ClangModelManagerSupport::updateLanguageClient( ProjectExplorer::Project *project, const CppEditor::ProjectInfo::ConstPtr &projectInfo) { - const ClangdSettings::Data clangdSettingsData = ClangdProjectSettings(project).settings(); - if (!clangdSettingsData.useClangd) + const ClangdSettings settings(ClangdProjectSettings(project).settings()); + if (!settings.useClangd()) return; const auto getJsonDbDir = [project] { if (const ProjectExplorer::Target * const target = project->activeTarget()) { @@ -321,7 +321,7 @@ void ClangModelManagerSupport::updateLanguageClient( generatorWatcher->deleteLater(); if (!ProjectExplorer::SessionManager::hasProject(project)) return; - if (!CppEditor::ClangdProjectSettings(project).settings().useClangd) + if (!ClangdSettings(ClangdProjectSettings(project).settings()).useClangd()) return; const CppEditor::ProjectInfo::ConstPtr newProjectInfo = cppModelManager()->projectInfo(project); @@ -409,7 +409,7 @@ void ClangModelManagerSupport::updateLanguageClient( }); }); - const Utils::FilePath includeDir = ClangdSettings(clangdSettingsData).clangdIncludePath(); + const Utils::FilePath includeDir = settings.clangdIncludePath(); const ClangDiagnosticConfig warningsConfig = warningsConfigForProject(project); auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo, jsonDbDir, CompilationDbPurpose::CodeModel,