diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index db0c1e2a..bad73971 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -435,7 +435,7 @@ void FormWindow::insertWidget() ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) { + insertedWidgets.find( o ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); if ( r.contains( r2 ) ) @@ -737,7 +737,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) } default: if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) && - ( isMainContainer( TQT_TQOBJECT(w) ) || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(this) ) ) + ( isMainContainer( w ) || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(this) ) ) mainWindow()->editSource(); break; } @@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { + if ( !rect().contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -2525,7 +2525,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { + if ( rect().contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } @@ -2545,7 +2545,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 05b92d8a..05c695f1 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -229,7 +229,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) + if (!rect().contains( e->pos())) return; switch (e->button()) { diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 7dabbd3b..8a160959 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -228,7 +228,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) + if (!rect().contains( e->pos())) return; switch (e->button()) { diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index cb44f32c..9e84f1d4 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -895,7 +895,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) if ( !d->mouseWasInsidePopup ) { // tqWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) ) + if ( d->listView()->rect().contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { @@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( d->listView()->rect().contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( !d->listView()->rect().contains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE;