Skip to content

Commit

Permalink
Port QMetaObject away from QStringRef
Browse files Browse the repository at this point in the history
Task-number: QTBUG-84319
Change-Id: I905c2e1780a2ec42b1d189494bd5399e124df354
Reviewed-by: Thiago Macieira <[email protected]>
laknoll committed Jun 10, 2020
1 parent 7b05e5d commit 957b999
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/corelib/kernel/qmetaobject.cpp
Original file line number Diff line number Diff line change
@@ -2800,16 +2800,16 @@ int QMetaEnum::keysToValue(const char *keys, bool *ok) const
if (ok != nullptr)
*ok = true;
const QString keysString = QString::fromLatin1(keys);
const QVector<QStringRef> splitKeys = keysString.splitRef(QLatin1Char('|'));
const auto splitKeys = QStringView{keysString}.split(QLatin1Char('|'));
if (splitKeys.isEmpty())
return 0;
// ### TODO write proper code: do not allocate memory, so we can go nothrow
int value = 0;
const int offset = priv(mobj->d.data)->revision >= 8 ? 3 : 2;
int count = mobj->d.data[handle + offset];
int data = mobj->d.data[handle + offset + 1];
for (const QStringRef &untrimmed : splitKeys) {
const QStringRef trimmed = untrimmed.trimmed();
for (QStringView untrimmed : splitKeys) {
const QStringView trimmed = untrimmed.trimmed();
QByteArray qualified_key = trimmed.toLatin1();
const char *key = qualified_key.constData();
uint scope = 0;

0 comments on commit 957b999

Please sign in to comment.