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

QSignalSpy: Extract object validation to a separate method

Browse Source 
Change-Id: I167a01257cfdb679cb81861bfae26d8fa40f8c27
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Vitaly Fanaskov 2019-08-12 10:43:30 +02:00 committed by Volker Hilsheimer
parent 51567cbe21
commit 94a3f3a037
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testlib/qsignalspy.h
View File

@ -59,10 +59,8 @@ public:
explicit QSignalSpy(const QObject *obj, const char *aSignal) explicit QSignalSpy(const QObject *obj, const char *aSignal)
: m_waiting(false) : m_waiting(false)
{ {
if (!obj) { if (!isObjectValid(obj))
qWarning("QSignalSpy: Cannot spy on a null object");
return; return;
}
if (!aSignal) { if (!aSignal) {
qWarning("QSignalSpy: Null signal name is not valid"); qWarning("QSignalSpy: Null signal name is not valid");
@ -97,10 +95,8 @@ public:
QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0) QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0)
: m_waiting(false) : m_waiting(false)
{ {
if (!obj) { if (!isObjectValid(obj))
qWarning("QSignalSpy: Cannot spy on a null object");
return; return;
}
if (!signal0) { if (!signal0) {
qWarning("QSignalSpy: Null signal name is not valid"); qWarning("QSignalSpy: Null signal name is not valid");
@ -173,6 +169,16 @@ private:
return valid; return valid;
} }
static bool isObjectValid(const QObject *object)
{
const bool valid = !!object;
if (!valid)
qWarning("QSignalSpy: Cannot spy on a null object");
return valid;
}
void initArgs(const QMetaMethod &member, const QObject *obj) void initArgs(const QMetaMethod &member, const QObject *obj)
{ {
args.reserve(member.parameterCount()); args.reserve(member.parameterCount());