diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2024-03-22 08:00:05 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2024-04-24 22:34:01 +0200 |
| commit | 951bf6e3ec7c518dfc6b672cd1f99bcb5a347084 (patch) | |
| tree | ba286e0d540eea8fcdd9092e1473fd80f83afb0e /src | |
| parent | 47f5c21e1b48fcbed6644fb74e7e5df8bb2414b7 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qsignalspy.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qsignalspy.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/testlib/qsignalspy.cpp b/src/testlib/qsignalspy.cpp index 52be7ff212..9a5efcd000 100644 --- a/src/testlib/qsignalspy.cpp +++ b/src/testlib/qsignalspy.cpp @@ -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; diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index cbb3bfbe42..ccde13820a 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -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); |