540 + if ((d->globalDisabled && disable) || (!d->globalDisabled && disable)) { 541 + // disabling or re-disabling 542 + d->disablerItem = item; 543 + if (d->globalDisabled == disable) { 544 + // was already disabled, leave 545 + return; 546 + } 547 + d->globalDisabled = disable; 548 + } else if (d->globalDisabled && !disable && d->disablerItem == item) { 549 + // the one disabled it will enable 550 + d->globalDisabled = disable; 551 + d->disablerItem.clear(); 552 + } else { 553 + // none of the above, leave 554 + return; 555 + }
same as code below, which is simpler:
if (disable) { d->disablerItem = item; // what is this for? if (d->globalDisabled) { return; } } else if (d->globalDisabled && item == d->disablerItem) { d->globalDisabled = false; d->disablerItem.clear(); } else { // !disabled && (!globalDisabled || item != d->disablerItem) return; }
« Back to merge proposal
540 + if ((d->globalDisabled && disable) || (!d->globalDisabled && disable)) { .clear( );
541 + // disabling or re-disabling
542 + d->disablerItem = item;
543 + if (d->globalDisabled == disable) {
544 + // was already disabled, leave
545 + return;
546 + }
547 + d->globalDisabled = disable;
548 + } else if (d->globalDisabled && !disable && d->disablerItem == item) {
549 + // the one disabled it will enable
550 + d->globalDisabled = disable;
551 + d->disablerItem
552 + } else {
553 + // none of the above, leave
554 + return;
555 + }
same as code below, which is simpler:
if (disable) { em.clear( );
d->disablerItem = item; // what is this for?
if (d->globalDisabled) {
return;
}
} else if (d->globalDisabled && item == d->disablerItem) {
d->globalDisabled = false;
d->disablerIt
} else {
// !disabled && (!globalDisabled || item != d->disablerItem)
return;
}