AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMetaObject: move the warning from invokeMethod() to a new function

Browse Source 
Which we can mark Q_DECL_COLD_FUNCTION.

Change-Id: I36b24183fbd041179f2ffffd17021b1362404f95
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Thiago Macieira 2022-07-15 13:36:22 -07:00
parent b73ab954df
commit 0ed2c60fea
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1361,6 +1361,29 @@ static inline QByteArray findMethodCandidates(const QMetaObject *metaObject, con
return candidateMessage;
}
Q_DECL_COLD_FUNCTION static inline bool
printMethodNotFoundWarning(const QMetaObject *meta, QLatin1StringView name, qsizetype paramCount,
const char *const *names)
{
QVarLengthArray<char, 512> sig;
sig.append(name.data(), name.size());
sig.append('(');
for (qsizetype i = 1; i < paramCount; ++i) {
sig.append(names[i], qstrlen(names[i]));
sig.append(',');
}
if (paramCount == 1)
sig.append(')'); // no parameters
else
sig[sig.size() - 1] = ')';
sig.append('\0');
qWarning("QMetaObject::invokeMethod: No such method %s::%s%s",
meta->className(), sig.constData(),
findMethodCandidates(meta, name.data()).constData());
return false;
}
/*!
\threadsafe
@ -1483,26 +1506,7 @@ bool QMetaObject::invokeMethod(QObject *obj,
}
// This method doesn't belong to us; print out a nice warning with candidates.
QVarLengthArray<char, 512> sig;
int len = int(qstrlen(member));
if (len <= 0)
return false;
sig.append(member, len);
sig.append('(');
for (qsizetype i = 1; i < paramCount; ++i) {
sig.append(typeNames[i], qstrlen(typeNames[i]));
sig.append(',');
}
if (paramCount == 1)
sig.append(')'); // no parameters
else
sig[sig.size() - 1] = ')';
sig.append('\0');
meta = obj->metaObject();
qWarning("QMetaObject::invokeMethod: No such method %s::%s%s",
meta->className(), sig.constData(), findMethodCandidates(meta, member).constData());
return false;
return printMethodNotFoundWarning(obj->metaObject(), name, paramCount, typeNames);
}
bool QMetaObject::invokeMethodImpl(QObject *object, QtPrivate::QSlotObjectBase *slot, Qt::ConnectionType type, void *ret)