diff options
Diffstat (limited to 'tdeui/tdemenubar.cpp')
| -rw-r--r-- | tdeui/tdemenubar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index 0a5fe0188..78fd8eb30 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) ) + if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size @@ -257,7 +257,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) + if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); @@ -266,7 +266,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) #endif setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget())) + if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { @@ -283,7 +283,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget())) + if( parentWidget() && obj == parentWidget()->topLevelWidget()) { if( ev->type() == TQEvent::WindowStateChange && !parentWidget()->topLevelWidget()->isFullScreen() ) |