From 3abaf647d0c632a4dfcb00d9ad2d1ffe66e014d9 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 3 Sep 2018 16:10:43 +0200 Subject: Add system include path to HeaderPath and merge ProjectPartHeaderPath System include paths are appended after other includes by the compiler. So we should set them as system includes and not as normal includes. Otherwise we change the include order. Headers in system include paths are not cluttering the screen with unwanted warning and by the way improve performance too. ProjectPartHeaderPath was a dopperganger of HeaderPath, so we merged them. Change-Id: I7c394b4098b697de79761499ffcd5913cc02d652 Reviewed-by: Tobias Hunger --- src/plugins/clangcodemodel/clangcompletionassistinterface.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/clangcodemodel/clangcompletionassistinterface.h') diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.h b/src/plugins/clangcodemodel/clangcompletionassistinterface.h index df198d8fcf..728aeef7b2 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistinterface.h +++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.h @@ -41,21 +41,21 @@ public: int position, const QString &fileName, TextEditor::AssistReason reason, - const CppTools::ProjectPartHeaderPaths &headerPaths, + const ProjectExplorer::HeaderPaths &headerPaths, const CPlusPlus::LanguageFeatures &features); BackendCommunicator &communicator() const; bool objcEnabled() const; - const CppTools::ProjectPartHeaderPaths &headerPaths() const; + const ProjectExplorer::HeaderPaths &headerPaths() const; CPlusPlus::LanguageFeatures languageFeatures() const; const TextEditor::TextEditorWidget *textEditorWidget() const; - void setHeaderPaths(const CppTools::ProjectPartHeaderPaths &headerPaths); // For tests + void setHeaderPaths(const ProjectExplorer::HeaderPaths &headerPaths); // For tests private: BackendCommunicator &m_communicator; QStringList m_options; - CppTools::ProjectPartHeaderPaths m_headerPaths; + ProjectExplorer::HeaderPaths m_headerPaths; CPlusPlus::LanguageFeatures m_languageFeatures; const TextEditor::TextEditorWidget *m_textEditorWidget; }; -- cgit v1.2.1