TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop TQT_TQ*_OBJECT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/24/head
Michele Calgaro 9 months ago
parent fb2c1f71e0
commit 03e67cae44
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

10
kdevdesigner/designer/formwindow.cpp
Unescape View File

@ -435,7 +435,7 @@ void FormWindow::insertWidget()
++it; ++it;
if ( o->isWidgetType() && if ( o->isWidgetType() &&
( (TQWidget*)o )->isVisibleTo( this ) && ( (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(), TQRect r2( ( (TQWidget*)o )->pos(),
( (TQWidget*)o )->size() ); ( (TQWidget*)o )->size() );
if ( r.contains( r2 ) ) if ( r.contains( r2 ) )
@ -737,7 +737,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
} }
default: default:
if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) && 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(); mainWindow()->editSource();
break; break;
} }
@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections()
void FormWindow::checkPreviewGeometry( TQRect &r ) void FormWindow::checkPreviewGeometry( TQRect &r )
{ {
if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { if ( !rect().contains( r ) ) {
if ( r.left() < rect().left() ) if ( r.left() < rect().left() )
r.moveTopLeft( TQPoint( 0, r.top() ) ); r.moveTopLeft( TQPoint( 0, r.top() ) );
if ( r.right() > rect().right() ) if ( r.right() > rect().right() )
@ -2525,7 +2525,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
TQWidget *container = 0; TQWidget *container = 0;
int depth = -1; int depth = -1;
TQWidgetList selected = selectedWidgets(); TQWidgetList selected = selectedWidgets();
if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { if ( rect().contains( mapFromGlobal( pos ) ) ) {
container = mainContainer(); container = mainContainer();
depth = widgetDepth( container ); 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 // the rectangles of all ancestors of the container must contain the insert position
TQWidget *w = it.current(); TQWidget *w = it.current();
while ( w && !w->isTopLevel() ) { while ( w && !w->isTopLevel() ) {
if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) )
break; break;
w = w->parentWidget(); w = w->parentWidget();
} }

2
languages/cpp/debugger/dbgtoolbar.cpp
Unescape View File

@ -229,7 +229,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
void DbgDocker::mousePressEvent(TQMouseEvent *e) void DbgDocker::mousePressEvent(TQMouseEvent *e)
{ {
if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) if (!rect().contains( e->pos()))
return; return;
switch (e->button()) { switch (e->button()) {

2
languages/ruby/debugger/dbgtoolbar.cpp
Unescape View File

@ -228,7 +228,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
void DbgDocker::mousePressEvent(TQMouseEvent *e) void DbgDocker::mousePressEvent(TQMouseEvent *e)
{ {
if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) if (!rect().contains( e->pos()))
return; return;
switch (e->button()) { switch (e->button()) {

6
lib/widgets/qcomboview.cpp
Unescape View File

@ -895,7 +895,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
if ( !d->mouseWasInsidePopup ) { if ( !d->mouseWasInsidePopup ) {
// tqWarning("!d->mouseWasInsidePopup"); // tqWarning("!d->mouseWasInsidePopup");
TQPoint pos = e->pos(); TQPoint pos = e->pos();
if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) ) if ( d->listView()->rect().contains( pos ) )
d->mouseWasInsidePopup = TRUE; d->mouseWasInsidePopup = TRUE;
// Check if arrow button should toggle // Check if arrow button should toggle
if ( d->arrowPressed ) { if ( d->arrowPressed ) {
@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
break; break;
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { if ( d->listView()->rect().contains( e->pos() ) ) {
TQMouseEvent tmp( TQEvent::MouseButtonDblClick, TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
e->pos(), e->button(), e->state() ) ; e->pos(), e->button(), e->state() ) ;
// will hide popup // will hide popup
@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
break; break;
case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonPress: 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()); TQPoint globalPos = d->listView()->mapToGlobal(e->pos());
if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) {
d->discardNextMousePress = TRUE; d->discardNextMousePress = TRUE;

Write Preview
Loading…
Cancel
Save