diff options
author | Marco Bubke <marco.bubke@theqtcompany.com> | 2016-01-13 14:12:15 +0100 |
---|---|---|
committer | Marco Bubke <marco.bubke@theqtcompany.com> | 2016-01-13 14:46:56 +0000 |
commit | 2b4cadf1fe138bfa23ca42ffe63c9da5d4d8827c (patch) | |
tree | 71cd2a79e861052b619aaf13b3f4f9a6c28f51a9 /src/plugins/cpptools/builtinindexingsupport.cpp | |
parent | 42d570a3fe89da30ebbc280c79f5565471786db6 (diff) | |
download | qt-creator-2b4cadf1fe138bfa23ca42ffe63c9da5d4d8827c.tar.gz |
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 <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/builtinindexingsupport.cpp')
-rw-r--r-- | src/plugins/cpptools/builtinindexingsupport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QString> sourceFiles; }; @@ -203,7 +203,7 @@ void index(QFutureInterface<void> &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<void> &future, const ParseParams params) processingHeaders = true; } - ProjectPart::HeaderPaths headerPaths = parts.isEmpty() + ProjectPartHeaderPaths headerPaths = parts.isEmpty() ? fallbackHeaderPaths : parts.first()->headerPaths; sourceProcessor->setHeaderPaths(headerPaths); |