1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMetaObject: consistently use QByteArray(View) in the implementation

Browse Source 
The implementation was inconsistent.
The `stringData()` method was returning QByteArray, while
the `stringDataView()` method was returning QLatin1StringView.
Update the second method to return QByteArrayView instead, and fix all
related places.

Found while trying to resolve ambiguities in QL1SV <-> QBAV comparison.

Change-Id: I94f10a5eeeb80a6e512c1f7623becf5e7f543fd9
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
This commit is contained in:
Ivan Solovev 2024-02-09 16:18:06 +01:00
parent e26914fa0f
commit 3a5ee774e8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/kernel/qmetaobject.cpp
View File

@ -127,7 +127,7 @@ static inline const char *rawStringData(const QMetaObject *mo, int index)
return reinterpret_cast<const char *>(mo->d.stringdata) + offset; return reinterpret_cast<const char *>(mo->d.stringdata) + offset;
} }
static inline QLatin1StringView stringDataView(const QMetaObject *mo, int index) static inline QByteArrayView stringDataView(const QMetaObject *mo, int index)
{ {
Q_ASSERT(priv(mo->d.data)->revision >= 7); Q_ASSERT(priv(mo->d.data)->revision >= 7);
uint offset = mo->d.stringdata[2*index]; uint offset = mo->d.stringdata[2*index];
@ -1081,7 +1081,7 @@ int QMetaObjectPrivate::indexOfEnumerator(const QMetaObject *m, QByteArrayView n
for (int i = 0; i < d->enumeratorCount; ++i) { for (int i = 0; i < d->enumeratorCount; ++i) {
const QMetaEnum e(m, i); const QMetaEnum e(m, i);
const quint32 id = which == Which::Name ? e.data.name() : e.data.alias(); const quint32 id = which == Which::Name ? e.data.name() : e.data.alias();
QLatin1StringView prop = stringDataView(m, id); QByteArrayView prop = stringDataView(m, id);
if (name == prop) { if (name == prop) {
i += m->enumeratorOffset(); i += m->enumeratorOffset();
return i; return i;
@ -1392,7 +1392,7 @@ QByteArray QMetaObject::normalizedSignature(const char *method)
} }
Q_DECL_COLD_FUNCTION static inline bool Q_DECL_COLD_FUNCTION static inline bool
printMethodNotFoundWarning(const QMetaObject *meta, QLatin1StringView name, qsizetype paramCount, printMethodNotFoundWarning(const QMetaObject *meta, QByteArrayView name, qsizetype paramCount,
const char *const *names, const char *const *names,
const QtPrivate::QMetaTypeInterface * const *metaTypes) const QtPrivate::QMetaTypeInterface * const *metaTypes)
{ {
@ -1400,7 +1400,7 @@ printMethodNotFoundWarning(const QMetaObject *meta, QLatin1StringView name, qsiz
QByteArray candidateMessage; QByteArray candidateMessage;
for (int i = 0; i < meta->methodCount(); ++i) { for (int i = 0; i < meta->methodCount(); ++i) {
const QMetaMethod method = meta->method(i); const QMetaMethod method = meta->method(i);
if (method.name() == QByteArrayView(name)) if (method.name() == name)
candidateMessage += " " + method.methodSignature() + '\n'; candidateMessage += " " + method.methodSignature() + '\n';
} }
if (!candidateMessage.isEmpty()) { if (!candidateMessage.isEmpty()) {
@ -1586,7 +1586,7 @@ bool QMetaObject::invokeMethodImpl(QObject *obj, const char *member, Qt::Connect
Q_ASSERT(typeNames); Q_ASSERT(typeNames);
// find the method // find the method
QLatin1StringView name(member); QByteArrayView name(member);
if (name.isEmpty()) if (name.isEmpty())
return false; return false;
@ -2635,7 +2635,7 @@ auto QMetaMethodInvoker::invokeImpl(QMetaMethod self, void *target,
// 0 is the return type, 1 is the first formal parameter // 0 is the return type, 1 is the first formal parameter
auto checkTypesAreCompatible = [=](int idx) { auto checkTypesAreCompatible = [=](int idx) {
uint typeInfo = priv->parameterTypeInfo(idx - 1); uint typeInfo = priv->parameterTypeInfo(idx - 1);
QLatin1StringView userTypeName(typeNames[idx] ? typeNames[idx] : metaTypes[idx]->name); QByteArrayView userTypeName(typeNames[idx] ? typeNames[idx] : metaTypes[idx]->name);
if ((typeInfo & IsUnresolvedType) == 0) { if ((typeInfo & IsUnresolvedType) == 0) {
// this is a built-in type // this is a built-in type
@ -2644,7 +2644,7 @@ auto QMetaMethodInvoker::invokeImpl(QMetaMethod self, void *target,
return int(typeInfo) == metaTypes[idx]->typeId; return int(typeInfo) == metaTypes[idx]->typeId;
} }
QLatin1StringView methodTypeName = stringDataView(priv->mobj, typeInfo & TypeNameIndexMask); QByteArrayView methodTypeName = stringDataView(priv->mobj, typeInfo & TypeNameIndexMask);
if ((MetaTypesAreOptional && !metaTypes) || !metaTypes[idx]) { if ((MetaTypesAreOptional && !metaTypes) || !metaTypes[idx]) {
// compatibility call, compare strings // compatibility call, compare strings
if (methodTypeName == userTypeName) if (methodTypeName == userTypeName)
@ -2652,7 +2652,7 @@ auto QMetaMethodInvoker::invokeImpl(QMetaMethod self, void *target,
// maybe the user type needs normalization // maybe the user type needs normalization
QByteArray normalized = normalizeTypeInternal(userTypeName.begin(), userTypeName.end()); QByteArray normalized = normalizeTypeInternal(userTypeName.begin(), userTypeName.end());
return methodTypeName == QLatin1StringView(normalized); return methodTypeName == normalized;
} }
QMetaType userType(metaTypes[idx]); QMetaType userType(metaTypes[idx]);
@ -3387,7 +3387,7 @@ QByteArray QMetaEnum::valueToKeys(int value) const
QByteArray keys; QByteArray keys;
if (!mobj) if (!mobj)
return keys; return keys;
QVarLengthArray<QLatin1StringView, sizeof(int) * CHAR_BIT> parts; QVarLengthArray<QByteArrayView, sizeof(int) * CHAR_BIT> parts;
int v = value; int v = value;
// reverse iterate to ensure values like Qt::Dialog=0x2|Qt::Window are processed first. // reverse iterate to ensure values like Qt::Dialog=0x2|Qt::Window are processed first.
for (int i = data.keyCount() - 1; i >= 0; --i) { for (int i = data.keyCount() - 1; i >= 0; --i) {