QSignalSpy: make two private static helpers file-static

... because they can be.

As a drive-by, fix clazy-function-args-by-value by taking QMetaMethod
by value.

Task-number: QTBUG-123544
Change-Id: Icdad68b91850d284c918e6180f3ce841de2af016
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Marc Mutz 2024-03-22 08:00:05 +01:00
parent 47f5c21e1b
commit 951bf6e3ec
2 changed files with 2 additions and 5 deletions

View File

@ -161,7 +161,7 @@ bool QSignalSpy::wait(std::chrono::milliseconds timeout)
return size() > origCount;
}
bool QSignalSpy::isSignalMetaMethodValid(const QMetaMethod &signal)
static bool isSignalMetaMethodValid(QMetaMethod signal)
{
if (!signal.isValid()) {
qWarning("QSignalSpy: Null signal is not valid");
@ -176,7 +176,7 @@ bool QSignalSpy::isSignalMetaMethodValid(const QMetaMethod &signal)
return true;
}
bool QSignalSpy::isObjectValid(const QObject *object)
static bool isObjectValid(const QObject *object)
{
const bool valid = !!object;

View File

@ -86,9 +86,6 @@ private:
Q_TESTLIB_EXPORT bool connectToSignal(const QObject *sender, int sigIndex);
Q_TESTLIB_EXPORT static bool isSignalMetaMethodValid(const QMetaMethod &signal);
Q_TESTLIB_EXPORT static bool isObjectValid(const QObject *object);
Q_TESTLIB_EXPORT static QList<int> makeArgs(const QMetaMethod &member, const QObject *obj);
Q_TESTLIB_EXPORT void appendArgs(void **a);