diff options
author | Michele Calgaro <[email protected]> | 2024-10-01 16:39:27 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2024-10-01 16:39:27 +0900 |
commit | 24032974c6494ce11d6d0e17a0f9a57294720d9e (patch) | |
tree | 03e3c174d64469655bf33bddf418279d002e1aea | |
parent | b6eef6a49ef86a39ef5159ff4b60d5311f492705 (diff) | |
download | tqt3-24032974c6494ce11d6d0e17a0f9a57294720d9e.tar.gz tqt3-24032974c6494ce11d6d0e17a0f9a57294720d9e.zip |
Fix fallover case for TQEvent::MetaCall
Manually cherry-picked from commit 24b42848.
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r-- | src/kernel/qobject.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 232de39f7..79b337f28 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -1094,6 +1094,7 @@ bool TQObject::event( TQEvent *e ) case TQEvent::MetaCall: { + bool handled = false; TQMetaCallEvent* metaEvent = dynamic_cast<TQMetaCallEvent*>(e); if (metaEvent) { #ifdef TQT_THREAD_SUPPORT @@ -1116,10 +1117,14 @@ bool TQObject::event( TQEvent *e ) #endif // TQT_THREAD_SUPPORT } TQUObject *o = metaEvent->data(); - if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) { + if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) + { + handled = true; tqt_emit( metaEvent->id(), o ); } - if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) { + else if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) + { + handled = true; tqt_invoke( metaEvent->id(), o ); } if ( sol ) @@ -1152,6 +1157,7 @@ bool TQObject::event( TQEvent *e ) #endif // TQT_THREAD_SUPPORT destroyDeepCopiedTQUObjectArray(metaEvent->data()); } + return handled; } default: |