TQObject::activate_signal: uniformly apply if(sol) checks

It seems the situation where sol is NULL is theoretically possible. So
keep the checks and apply those uniformly to all instances of access to
`sol`.

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
feat/dedup-tqobject
Alexander Golubev 2 months ago
parent 3eb9061b63
commit ba2deea50a

@ -1094,10 +1094,10 @@ bool TQObject::event( TQEvent *e )
TQSenderObjectList* sol; TQSenderObjectList* sol;
TQObject* oldSender = 0; TQObject* oldSender = 0;
sol = senderObjects; sol = senderObjects;
if ( sol ) {
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // TQT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
sol->currentSender = metaEvent->sender(); sol->currentSender = metaEvent->sender();
@ -1112,10 +1112,10 @@ bool TQObject::event( TQEvent *e )
if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) { if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) {
tqt_invoke( metaEvent->id(), o ); tqt_invoke( metaEvent->id(), o );
} }
if (sol ) {
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // TQT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if (sol ) {
sol->currentSender = oldSender; sol->currentSender = oldSender;
if ( sol->deref() ) { if ( sol->deref() ) {
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
@ -2794,10 +2794,10 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
TQObject *object = c->object(); TQObject *object = c->object();
TQObject *oldSender; TQObject *oldSender;
TQSenderObjectList* sol = object->senderObjects; TQSenderObjectList* sol = object->senderObjects;
if ( sol ) {
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
sol->listMutex->lock(); sol->listMutex->lock();
#endif // TQT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
sol->currentSender = this; sol->currentSender = this;
@ -2809,9 +2809,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread) (currentThread && object->d->ownThread == currentThread)
) { ) {
sol->listMutex->unlock(); if (sol) sol->listMutex->unlock();
object->tqt_emit( c->member(), o ); object->tqt_emit( c->member(), o );
sol->listMutex->lock(); if (sol) sol->listMutex->lock();
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2832,9 +2832,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
(currentThread && currentThread->threadPostedEventsDisabled()) || (currentThread && currentThread->threadPostedEventsDisabled()) ||
(currentThread && object->d->ownThread == currentThread) (currentThread && object->d->ownThread == currentThread)
) { ) {
sol->listMutex->unlock(); if (sol) sol->listMutex->unlock();
object->tqt_invoke( c->member(), o ); object->tqt_invoke( c->member(), o );
sol->listMutex->lock(); if (sol) sol->listMutex->lock();
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {

Loading…
Cancel
Save