diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-19 09:24:30 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-19 09:58:38 +0000 |
commit | c629b254db791db99677cce8c80490ff47486e80 (patch) | |
tree | 9362e01053275ac8c638c055ce6a2a145748bb5c /sources/shiboken2/ApiExtractor/abstractmetalang.cpp | |
parent | ac8e4f0d05aef867c9ce5c8fdb7337b04f8c64dc (diff) |
Start porting away from QStringRef
QStringRef will be replaced by QStringView. Remove
most usages or use auto. This will require a 2nd cleanup
removing its usages from the QXmlStreamReader code once
this has landed in qtbase.
Task-number: QTBUG-84319
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I2885df70d5f883bcad7bb3a31618fc1d63116df5
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetalang.cpp')
-rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index 8e1f0d7e5..3680375c4 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -2530,11 +2530,11 @@ AbstractMetaEnum *AbstractMetaClass::findEnum(const AbstractMetaClassList &class AbstractMetaEnumValue *AbstractMetaClass::findEnumValue(const AbstractMetaClassList &classes, const QString &name) { - const QVector<QStringRef> lst = name.splitRef(QLatin1String("::")); + const auto lst = QStringView{name}.split(u"::"); if (lst.size() > 1) { - const QStringRef &prefixName = lst.at(0); - const QStringRef &enumName = lst.at(1); + const auto &prefixName = lst.at(0); + const auto &enumName = lst.at(1); if (AbstractMetaClass *cl = findClass(classes, prefixName.toString())) return cl->findEnumValue(enumName.toString()); } @@ -2715,8 +2715,8 @@ AbstractMetaEnumValue *AbstractMetaEnum::findEnumValue(const QString &value) con const int sepPos = value.indexOf(QLatin1String("::")); if (sepPos == -1) return findMatchingEnumValue(m_enumValues, value); - return name() == value.leftRef(sepPos) - ? findMatchingEnumValue(m_enumValues, value.rightRef(value.size() - sepPos - 2)) + return name() == QStringView{value}.left(sepPos) + ? findMatchingEnumValue(m_enumValues, QStringView{value}.right(value.size() - sepPos - 2)) : nullptr; } |