diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
| commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
| tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /src/plugins/clangpchmanager/projectupdater.h | |
| parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
| parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'src/plugins/clangpchmanager/projectupdater.h')
| -rw-r--r-- | src/plugins/clangpchmanager/projectupdater.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/clangpchmanager/projectupdater.h b/src/plugins/clangpchmanager/projectupdater.h index 896a02def0..044b86f637 100644 --- a/src/plugins/clangpchmanager/projectupdater.h +++ b/src/plugins/clangpchmanager/projectupdater.h @@ -33,6 +33,7 @@ #include <generatedfiles.h> #include <includesearchpath.h> #include <projectpartcontainer.h> +#include <projectpartsstorageinterface.h> #include <projectexplorer/headerpath.h> @@ -69,11 +70,16 @@ public: }; ProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server, - ClangBackEnd::FilePathCachingInterface &filePathCache); + ClangBackEnd::FilePathCachingInterface &filePathCache, + ClangBackEnd::ProjectPartsStorageInterface &projectPartsStorage) + : m_server(server) + , m_filePathCache(filePathCache) + , m_projectPartsStorage(projectPartsStorage) + {} void updateProjectParts(const std::vector<CppTools::ProjectPart *> &projectParts, Utils::SmallStringVector &&toolChainArguments); - void removeProjectParts(const QStringList &projectPartIds); + void removeProjectParts(ClangBackEnd::ProjectPartIds projectPartIds); void updateGeneratedFiles(ClangBackEnd::V2::FileContainers &&generatedFiles); void removeGeneratedFiles(ClangBackEnd::FilePaths &&filePaths); @@ -88,6 +94,7 @@ public: CppTools::ProjectPart *projectPart) const; ClangBackEnd::ProjectPartContainers toProjectPartContainers( std::vector<CppTools::ProjectPart *> projectParts) const; + void addToHeaderAndSources(HeaderAndSources &headerAndSources, const CppTools::ProjectFile &projectFile) const; static QStringList toolChainArguments(CppTools::ProjectPart *projectPart); @@ -98,11 +105,16 @@ public: static ClangBackEnd::FilePaths createExcludedPaths( const ClangBackEnd::V2::FileContainers &generatedFiles); + QString fetchProjectPartName(ClangBackEnd::ProjectPartId projectPartId) const; + + ClangBackEnd::ProjectPartIds toProjectPartIds(const QStringList &projectPartNames) const; + private: ClangBackEnd::GeneratedFiles m_generatedFiles; ClangBackEnd::FilePaths m_excludedPaths; ClangBackEnd::ProjectManagementServerInterface &m_server; ClangBackEnd::FilePathCachingInterface &m_filePathCache; + ClangBackEnd::ProjectPartsStorageInterface &m_projectPartsStorage; }; } // namespace ClangPchManager |