diff options
| author | hjk <hjk@qt.io> | 2022-11-23 15:49:49 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-11-25 09:01:05 +0000 |
| commit | 67e9c2d7a0902154facd2b4dfaac2a745abded2a (patch) | |
| tree | 159864acc2a5e927f27f22226b3c9c11f287afad /src/libs/cplusplus/pp-engine.cpp | |
| parent | 74ba41f82cae715604fbedd8cdb156b9bb7e6102 (diff) | |
| download | qt-creator-67e9c2d7a0902154facd2b4dfaac2a745abded2a.tar.gz | |
CppEditor: Proliferate FilePath use
Remove SnapShot::{find,contains}(QString) overloads and fix fallout.
Change-Id: I50c415826939e09ac111f33def611c7478fa5d97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 58fa33b0a9..69a5a0b353 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -716,7 +716,11 @@ void Preprocessor::State::updateIncludeGuardState_helper(IncludeGuardStateHint h #endif // DEBUG_INCLUDE_GUARD_TRACKING } -QString Preprocessor::configurationFileName() { return QStringLiteral("<configuration>"); } +const FilePath &Preprocessor::configurationFileName() +{ + const static FilePath configurationFile = FilePath::fromPathPart(u"<configuration>"); + return configurationFile; +} Preprocessor::Preprocessor(Client *client, Environment *env) : m_client(client) @@ -2010,7 +2014,7 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) // the macro is a feature constraint(e.g. QT_NO_XXX) if (checkUndefined && macroName.startsWith("QT_NO_")) { - if (macro->fileName() == configurationFileName()) { + if (macro->fileName() == configurationFileName().pathView()) { // and it' defined in a pro file (e.g. DEFINES += QT_NO_QOBJECT) value = false; // take the branch |