diff options
| author | hjk <hjk@qt.io> | 2022-11-24 13:05:41 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-11-30 17:27:56 +0000 |
| commit | 39ffdb416ff3381515b7b4bf579acb23941cd6fc (patch) | |
| tree | 544fd0f432246e397c3b851ed35d2b6d297dc661 /src/libs/cplusplus/FastPreprocessor.h | |
| parent | dc3a4f0002b2c8e4c437b2d6b3bf9e2e4be91a19 (diff) | |
CPlusPlus: Use FilePath for resolved include paths
... and fix fallout.
Change-Id: I66886e91ff476eff15db51cc024a8021e952d44d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.h')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index 0892e120b43..c4f30063fa9 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -3,12 +3,15 @@ #pragma once -#include "PreprocessorClient.h" #include "CppDocument.h" -#include "pp.h" +#include "PreprocessorClient.h" +#include "PreprocessorEnvironment.h" +#include "pp-engine.h" #include <cplusplus/Control.h> +#include <utils/filepath.h> + #include <QSet> #include <QString> @@ -19,11 +22,11 @@ class CPLUSPLUS_EXPORT FastPreprocessor: public Client Environment _env; Snapshot _snapshot; Preprocessor _preproc; - QSet<QString> _merged; + QSet<Utils::FilePath> _merged; Document::Ptr _currentDoc; bool _addIncludesToCurrentDoc; - void mergeEnvironment(const QString &fileName); + void mergeEnvironment(const Utils::FilePath &filePath); public: FastPreprocessor(const Snapshot &snapshot); |