From 2b4cadf1fe138bfa23ca42ffe63c9da5d4d8827c Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 13 Jan 2016 14:12:15 +0100 Subject: CppTools: Move ProjectPart in its own header file Also extracting inline HeaderPath class and change projects list in vector because the size is larger than a pointer. Change-Id: I885fdff3fe9bccc877634d1615249755f5b674fd Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/builtinindexingsupport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/builtinindexingsupport.cpp') diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index a5713b6da8..78946f94d4 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -61,7 +61,7 @@ namespace { class ParseParams { public: - ProjectPart::HeaderPaths headerPaths; + ProjectPartHeaderPaths headerPaths; WorkingCopy workingCopy; QSet sourceFiles; }; @@ -203,7 +203,7 @@ void index(QFutureInterface &future, const ParseParams params) bool processingHeaders = false; CppModelManager *cmm = CppModelManager::instance(); - const ProjectPart::HeaderPaths fallbackHeaderPaths = cmm->headerPaths(); + const ProjectPartHeaderPaths fallbackHeaderPaths = cmm->headerPaths(); const CPlusPlus::LanguageFeatures defaultFeatures = CPlusPlus::LanguageFeatures::defaultFeatures(); for (int i = 0; i < files.size(); ++i) { @@ -229,7 +229,7 @@ void index(QFutureInterface &future, const ParseParams params) processingHeaders = true; } - ProjectPart::HeaderPaths headerPaths = parts.isEmpty() + ProjectPartHeaderPaths headerPaths = parts.isEmpty() ? fallbackHeaderPaths : parts.first()->headerPaths; sourceProcessor->setHeaderPaths(headerPaths); -- cgit v1.2.1