diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-22 09:57:51 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-25 12:13:45 +0200 |
commit | da43cf70a9d125576f3795d7088e0100a4035ce5 (patch) | |
tree | 214954e777b54eb9483df3939dbb26a08eb0fc2a /sources/shiboken6/ApiExtractor/abstractmetatype.cpp | |
parent | 42666b5bab09a80a65ae8f61961985f4923b7d65 (diff) |
Migrate from QLatin1String to UTF-16 string literals
Use the QStringView overloads of the comparison functions in order to
minimize merge conflicts after the deprecation of QLatin1String in 6.4.
Task-number: QTBUG-98434
Pick-to: 6.3 6.2
Change-Id: Ia0df398ab8f3e61a0b629971ccbec2273a78499b
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/abstractmetatype.cpp')
-rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetatype.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp index 3d1f5d210..11b8bddfa 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp @@ -826,14 +826,14 @@ bool AbstractMetaType::isCString() const { return isNativePointer() && d->m_indirections.size() == 1 - && name() == QLatin1String("char"); + && name() == u"char"; } bool AbstractMetaType::isVoidPointer() const { return isNativePointer() && d->m_indirections.size() == 1 - && name() == QLatin1String("void"); + && name() == u"void"; } bool AbstractMetaType::isUserPrimitive() const @@ -920,7 +920,7 @@ std::optional<AbstractMetaType> AbstractMetaType::fromString(QString typeSignature, QString *errorMessage) { typeSignature = typeSignature.trimmed(); - if (typeSignature.startsWith(QLatin1String("::"))) + if (typeSignature.startsWith(u"::")) typeSignature.remove(0, 2); auto &cache = *metaTypeFromStringCache(); @@ -941,7 +941,7 @@ AbstractMetaType::fromString(QString typeSignature, QString *errorMessage) AbstractMetaType AbstractMetaType::fromTypeEntry(const TypeEntry *typeEntry) { QString typeName = typeEntry->qualifiedCppName(); - if (typeName.startsWith(QLatin1String("::"))) + if (typeName.startsWith(u"::")) typeName.remove(0, 2); auto &cache = *metaTypeFromStringCache(); auto it = cache.find(typeName); |