diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-21 18:57:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-22 10:18:39 +0100 |
| commit | 03c8505f7a080b654654bbf3a05c7d3977d6762d (patch) | |
| tree | b231459ef5efa79047b8169ade192b526eb1ac8c /sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp | |
| parent | ed0f55c1d79636040843ae5c5e0d9308e35da65a (diff) | |
Purge remaining uses of old Qt string literals
Amends a3e882b06eda8f9a63cf3834a99640034775269b.
Pick-to: 6.4
Task-number: QTBUG-98434
Change-Id: I23ad60d6e4201aa2d8dbf3fa8892d3df3c56c5fc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp index 960d7578c..7695aabfc 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_helpers.cpp @@ -9,6 +9,8 @@ #include "enumtypeentry.h" #include "flagstypeentry.h" +using namespace Qt::StringLiterals; + using QStringViewList = QList<QStringView>; // Return a prefix to fully qualify value, eg: @@ -19,7 +21,7 @@ static QString resolveScopePrefixHelper(const QStringViewList &scopeList, { QString name; for (qsizetype i = scopeList.size() - 1 ; i >= 0; --i) { - const QString prefix = scopeList.at(i).toString() + u"::"_qs; + const QString prefix = scopeList.at(i).toString() + u"::"_s; if (value.startsWith(prefix)) name.clear(); else @@ -35,7 +37,7 @@ QString AbstractMetaBuilder::resolveScopePrefix(const AbstractMetaClass *scope, return {}; const QString &qualifiedCppName = scope->qualifiedCppName(); const QStringViewList scopeList = - QStringView{qualifiedCppName}.split(u"::"_qs, Qt::SkipEmptyParts); + QStringView{qualifiedCppName}.split(u"::"_s, Qt::SkipEmptyParts); return resolveScopePrefixHelper(scopeList, value); } @@ -49,7 +51,7 @@ static QString resolveEnumValueScopePrefix(const AbstractMetaEnum &metaEnum, const QString &qualifiedCppName = scope->qualifiedCppName(); const QString &enumName = metaEnum.name(); QStringViewList parts = - QStringView{qualifiedCppName}.split(u"::"_qs, Qt::SkipEmptyParts); + QStringView{qualifiedCppName}.split(u"::"_s, Qt::SkipEmptyParts); // Append the type (as required for enum classes) unless it is an anonymous enum. if (!metaEnum.isAnonymous()) parts.append(QStringView{enumName}); @@ -157,7 +159,7 @@ QString AbstractMetaBuilderPrivate::fixEnumDefault(const AbstractMetaType &type, qualified.prepend(resolveEnumValueScopePrefix(metaEnum, token)); qualifiedTokens.append(qualified); } - const QString qualifiedExpression = qualifiedTokens.join(u" | "_qs); + const QString qualifiedExpression = qualifiedTokens.join(u" | "_s); if (!typeCast) return qualifiedExpression; |