diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 51044f4..42c9770 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -437,7 +437,7 @@ bool KrBookmarkHandler::eventFilter( TQObject *obj, TQEvent *ev ) { if( obj->inherits( "TQPopupMenu" ) ) { int id = static_cast(TQT_TQWIDGET(obj))->idAt( TQT_TQMOUSEEVENT(ev)->pos() ); - if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_mainBookmarkPopup) && _specialBookmarkIDs.contains( id ) ) { + if( obj == _mainBookmarkPopup && _specialBookmarkIDs.contains( id ) ) { rightClickOnSpecialBookmark(); return true; } diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index a77a4de..b043430 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -500,7 +500,7 @@ void MediaButton::addMountPoint( KMountPoint * mp, bool isMounted ) { } bool MediaButton::eventFilter( TQObject *o, TQEvent *e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popupMenu) ) { + if( o == popupMenu ) { if( e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonRelease ) { TQMouseEvent *m = TQT_TQMOUSEEVENT(e); if( m->button() == Qt::RightButton ) { diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index 571fc44..8ccc4ab 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -1266,7 +1266,7 @@ bool KrBriefView::event( TQEvent *e ) { bool KrBriefView::eventFilter( TQObject * watched, TQEvent * e ) { - if( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(horizontalScrollBar()) ) + if( watched == horizontalScrollBar() ) { if( e->type() == TQEvent::Hide || e->type() == TQEvent::Show ) { @@ -1275,7 +1275,7 @@ bool KrBriefView::eventFilter( TQObject * watched, TQEvent * e ) return res; } } - else if( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(header) ) + else if( watched == header ) { if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == Qt::RightButton ) { diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index c3db5b9..f2e68ca 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -1356,7 +1356,7 @@ bool KrDetailedView::event( TQEvent *e ) { bool KrDetailedView::eventFilter( TQObject * watched, TQEvent * e ) { - if( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(renameLineEdit()) ) + if( watched == renameLineEdit() ) { if( currentlyRenamedItem && e->type() == TQEvent::Hide ) { @@ -1371,7 +1371,7 @@ bool KrDetailedView::eventFilter( TQObject * watched, TQEvent * e ) } return FALSE; } - else if( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(header()) ) + else if( watched == header() ) { if( e->type() == TQEvent::MouseButtonPress && ((TQMouseEvent *)e )->button() == Qt::RightButton ) { diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index 5a065e9..a2e5536 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -390,7 +390,7 @@ void ListPanel::setProperties( int prop ) } bool ListPanel::eventFilter ( TQObject * watched, TQEvent * e ) { - if( e->type() == TQEvent::KeyPress && TQT_BASE_OBJECT(origin->lineEdit()) == TQT_BASE_OBJECT(watched) ) { + if( e->type() == TQEvent::KeyPress && origin->lineEdit() == watched ) { TQKeyEvent *ke = (TQKeyEvent *)e; if( ( ke->key() == Key_Down ) && ( ke->state() == ControlButton ) ) { diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index 46a67e0..dbbb167 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -289,7 +289,7 @@ void KrusaderView::switchFullScreenTE() bool KrusaderView::eventFilter ( TQObject * watched, TQEvent * e ) { - if( e->type() == TQEvent::AccelOverride && konsole_part && TQT_BASE_OBJECT(konsole_part->widget()) == TQT_BASE_OBJECT(watched) ) { + if( e->type() == TQEvent::AccelOverride && konsole_part && konsole_part->widget() == watched ) { TQKeyEvent *ke = (TQKeyEvent *)e; if( ( ke->key() == Key_Insert ) && ( ke->state() == ShiftButton ) ) { ke->accept(); @@ -301,7 +301,7 @@ bool KrusaderView::eventFilter ( TQObject * watched, TQEvent * e ) { return true; } } - else if( e->type() == TQEvent::KeyPress && konsole_part && TQT_BASE_OBJECT(konsole_part->widget()) == TQT_BASE_OBJECT(watched) ) { + else if( e->type() == TQEvent::KeyPress && konsole_part && konsole_part->widget() == watched ) { TQKeyEvent *ke = (TQKeyEvent *)e; KKey pressedKey( ke );