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 <tobias.hunger@qt.io>

1 files changed, 4 insertions, 4 deletions

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