From eeaba432771e0706f7d25da663123aad6f4e5b85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 25 Nov 2013 02:22:16 -0600 Subject: Automated update from Qt3 --- src/kernel/ntqapplication.h | 6 ------ src/kernel/qapplication.cpp | 29 ++++++++++++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index eeed8c9e7..3618bf3bf 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -539,12 +539,6 @@ inline TQSize TQApplication::globalStrut() return app_strut; } -inline bool TQApplication::sendEvent( TQObject *receiver, TQEvent *event ) -{ if ( event ) event->spont = FALSE; return tqApp ? tqApp->notify( receiver, event ) : FALSE; } - -inline bool TQApplication::sendSpontaneousEvent( TQObject *receiver, TQEvent *event ) -{ if ( event ) event->spont = TRUE; return tqApp ? tqApp->notify( receiver, event ) : FALSE; } - #ifdef QT_NO_TRANSLATION // Simple versions inline TQString TQApplication::translate( const char *, const char *sourceText, diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 99bc5c598..f090e748c 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -2453,6 +2453,16 @@ void TQApplication::aboutTQt() \sa postEvent(), notify() */ +bool TQApplication::sendEvent( TQObject *receiver, TQEvent *event ) { + if ( event ) event->spont = FALSE; + return tqApp ? tqApp->notify( receiver, event ) : FALSE; +} + +bool TQApplication::sendSpontaneousEvent( TQObject *receiver, TQEvent *event ) { + if ( event ) event->spont = TRUE; + return tqApp ? tqApp->notify( receiver, event ) : FALSE; +} + /*! Sends event \a e to \a receiver: \a {receiver}->event(\a e). Returns the value that is returned from the receiver's event handler. @@ -3452,18 +3462,19 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) globalPostedEvents->append( pe ); #ifdef QT_THREAD_SUPPORT - if ( event->type() == TQEvent::MetaCall ) { - // Wake up the receiver thread event loop - TQThread* thread = receiver->contextThreadObject(); - if (thread) { - if (thread->d) { - if (thread->d->eventLoop) { - thread->d->eventLoop->wakeUp(); - } + // Wake up the receiver thread event loop + TQThread* thread = receiver->contextThreadObject(); + if (thread) { + if (thread->d) { + if (thread->d->eventLoop) { + thread->d->eventLoop->wakeUp(); + return; } } + } + if ( event->type() == TQEvent::MetaCall ) { return; - } + } #endif if (currentEventLoop()) { -- cgit v1.2.1