From 8bd13caa34578692dbada971cd0e17dc6e7f1e6f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 15 Aug 2020 00:31:31 +0300 Subject: [PATCH] remove unused QSignalSpyCallbackSet::slot_end_callback member Signed-off-by: Ivailo Monev --- src/core/kernel/qcoreapplication.cpp | 2 +- src/core/kernel/qobject.cpp | 7 ------- src/core/kernel/qobject_p.h | 3 +-- src/test/qsignaldumper.cpp | 5 ++--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp index 04e81f776..7b995663c 100644 --- a/src/core/kernel/qcoreapplication.cpp +++ b/src/core/kernel/qcoreapplication.cpp @@ -105,7 +105,7 @@ void QCoreApplicationPrivate::processCommandLineArguments() // Support for introspection -QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0, 0 }; +QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0 }; void qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set) { diff --git a/src/core/kernel/qobject.cpp b/src/core/kernel/qobject.cpp index e61233c49..88d8f215a 100644 --- a/src/core/kernel/qobject.cpp +++ b/src/core/kernel/qobject.cpp @@ -2994,9 +2994,6 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign delete connectionLists; QT_RETHROW; } - - if (qt_signal_spy_callback_set.slot_end_callback) - qt_signal_spy_callback_set.slot_end_callback(receiver, c->method()); locker.relock(); } else { const int method = method_relative + c->method_offset; @@ -3021,10 +3018,6 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign delete connectionLists; QT_RETHROW; } - - if (qt_signal_spy_callback_set.slot_end_callback) - qt_signal_spy_callback_set.slot_end_callback(receiver, method); - locker.relock(); } diff --git a/src/core/kernel/qobject_p.h b/src/core/kernel/qobject_p.h index 143187e8a..625457575 100644 --- a/src/core/kernel/qobject_p.h +++ b/src/core/kernel/qobject_p.h @@ -66,8 +66,7 @@ struct QSignalSpyCallbackSet typedef void (*EndCallback)(QObject *caller, int method_index); BeginCallback signal_begin_callback, slot_begin_callback; - EndCallback signal_end_callback, - slot_end_callback; + EndCallback signal_end_callback; }; void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set); diff --git a/src/test/qsignaldumper.cpp b/src/test/qsignaldumper.cpp index fea8d250c..9b0e8f84c 100644 --- a/src/test/qsignaldumper.cpp +++ b/src/test/qsignaldumper.cpp @@ -169,15 +169,14 @@ void QSignalDumper::startDump() static QSignalSpyCallbackSet set = { QTest::qSignalDumperCallback, QTest::qSignalDumperCallbackSlot, - QTest::qSignalDumperCallbackEndSignal, - 0 + QTest::qSignalDumperCallbackEndSignal }; qt_register_signal_spy_callbacks(set); } void QSignalDumper::endDump() { - static QSignalSpyCallbackSet nset = { 0, 0, 0 ,0 }; + static QSignalSpyCallbackSet nset = { 0, 0, 0 }; qt_register_signal_spy_callbacks(nset); } -- 2.11.0