diff options
| author | hjk <hjk@qt.io> | 2022-11-28 13:06:13 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-11-28 13:11:28 +0000 |
| commit | f68db427ef763b995f9e4fa3f1dbf2c9b90ad943 (patch) | |
| tree | c4f650d388e28f480d52fbfbf288631dc250aa53 /src/libs | |
| parent | 3c8c5b08a871018c20140b126834af964139a2e6 (diff) | |
CPlusPlus: Migrate Macro to FilePath
Change-Id: I94e8702e81e809e4d8318572cc070a0531edaefa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/cplusplus/Macro.h | 11 | ||||
| -rw-r--r-- | src/libs/cplusplus/PreprocessorEnvironment.cpp | 6 | ||||
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h index ca71d10d4c..37c8cd78b0 100644 --- a/src/libs/cplusplus/Macro.h +++ b/src/libs/cplusplus/Macro.h @@ -68,13 +68,10 @@ public: void addFormal(const QByteArray &formal) { _formals.append(formal); } - const QString &fileName() const + const Utils::FilePath &filePath() const { return _fileName; } - Utils::FilePath filePath() const - { return Utils::FilePath::fromString(_fileName); } - - void setFileName(const QString &fileName) + void setFilePath(const Utils::FilePath &fileName) { _fileName = fileName; } unsigned fileRevision() const @@ -145,7 +142,7 @@ private: QByteArray _definitionText; QVector<PPToken> _definitionTokens; QVector<QByteArray> _formals; - QString _fileName; + Utils::FilePath _fileName; unsigned _hashcode; unsigned _fileRevision; int _line; @@ -160,4 +157,4 @@ private: }; }; -} // namespace CPlusPlus +} // CPlusPlus diff --git a/src/libs/cplusplus/PreprocessorEnvironment.cpp b/src/libs/cplusplus/PreprocessorEnvironment.cpp index 4d7f5c7634..213a0bf04a 100644 --- a/src/libs/cplusplus/PreprocessorEnvironment.cpp +++ b/src/libs/cplusplus/PreprocessorEnvironment.cpp @@ -29,6 +29,8 @@ #include <cstring> +using namespace Utils; + namespace CPlusPlus { static unsigned hashCode(const char *str, int length) @@ -116,7 +118,7 @@ Macro *Environment::remove(const ByteArrayRef &name) Macro macro; macro.setName(name.toByteArray()); macro.setHidden(true); - macro.setFileName(currentFile); + macro.setFilePath(FilePath::fromString(currentFile)); macro.setLine(currentLine); return bind(macro); } @@ -246,4 +248,4 @@ void Environment::dump() const } } -} // namespace CPlusPlus +} // CPlusPlus diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index a846c46840..a484e56886 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1703,7 +1703,7 @@ void Preprocessor::handleDefineDirective(PPToken *tk) return; Macro macro; - macro.setFileName(m_env->currentFile); + macro.setFilePath(FilePath::fromString(m_env->currentFile)); macro.setLine(tk->lineno); QByteArray macroName = tk->asByteArrayRef().toByteArray(); macro.setName(macroName); |