From e4e65726614fa4e3ee02f25db755d959850441ea Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 12 Jan 2017 18:01:12 +0100 Subject: CppTools: Allow interpreting ambiguous headers as C headers ...instead of C++ headers. For the Clang Code Model this results in using "-x c-header" instead of "-x c++-header". This introduces a new option in Options > C++ > "Code Model" to configure this. Change-Id: I8a0ce8fa6155f5ef58743ebc7f1d0b500fbf6599 Reviewed-by: David Schulz Reviewed-by: Leena Miettinen --- src/plugins/cpptools/baseeditordocumentprocessor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/plugins/cpptools/baseeditordocumentprocessor.cpp') diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index bf68bc1c4e..b656c5798a 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -25,8 +25,11 @@ #include "baseeditordocumentprocessor.h" +#include "cppcodemodelsettings.h" +#include "cpplanguage.h" #include "cppmodelmanager.h" #include "cpptoolsbridge.h" +#include "cpptoolsreuse.h" #include "editordocumenthandle.h" #include @@ -55,8 +58,13 @@ BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor() void BaseEditorDocumentProcessor::run(bool hasActiveProjectChanged) { + const Language languagePreference = codeModelSettings()->interpretAmbigiousHeadersAsCHeaders() + ? Language::C + : Language::Cxx; + runImpl({CppModelManager::instance()->workingCopy(), ProjectExplorer::SessionManager::startupProject(), + languagePreference, hasActiveProjectChanged}); } -- cgit v1.2.1