Drop TQT_TQ*_OBJECT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/64/head
Michele Calgaro 1 year ago
parent fce92533f8
commit 96eaae090e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -969,7 +969,7 @@ void kpView::mouseMoveEvent (TQMouseEvent *e)
// TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the
// mainView, landing on top of the thumbnailView cleverly put on top // mainView, landing on top of the thumbnailView cleverly put on top
// of the mainView. // of the mainView.
setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); setHasMouse (rect ().contains (e->pos ()));
if (tool ()) if (tool ())
tool ()->mouseMoveEvent (e); tool ()->mouseMoveEvent (e);
@ -1003,7 +1003,7 @@ void kpView::mouseReleaseEvent (TQMouseEvent *e)
<< endl; << endl;
#endif #endif
setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())); setHasMouse (rect ().contains (e->pos ()));
if (tool ()) if (tool ())
tool ()->mouseReleaseEvent (e); tool ()->mouseReleaseEvent (e);

@ -783,7 +783,7 @@ void kpTransparentColorCell::mousePressEvent (TQMouseEvent * /*e*/)
// protected virtual [base TQWidget] // protected virtual [base TQWidget]
void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e) void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
{ {
if (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ())) if (rect ().contains (e->pos ()))
{ {
if (e->button () == Qt::LeftButton) if (e->button () == Qt::LeftButton)
{ {

@ -83,7 +83,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
{ {
//FIXME: when scrolling the cursorpos shouldn't change //FIXME: when scrolling the cursorpos shouldn't change
if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) ) if( this->rect().contains( ev->pos(), false ) )
emit cursorPos( ev->pos() ); emit cursorPos( ev->pos() );
//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )

@ -783,7 +783,7 @@ void ImageCanvas::drawHAreaBorder(TQPainter &p,int x1,int x2,int y,int r)
} else if(!acquired) p.setPen(TQPen(TQColor(150,150,150))); } else if(!acquired) p.setPen(TQPen(TQColor(150,150,150)));
for(;;) { for(;;) {
if(TQT_TQRECT_OBJECT(rect()).contains(TQPoint(x1,y))) { if(rect().contains(TQPoint(x1,y))) {
if( r && acquired ) { if( r && acquired ) {
int re_x1, re_y; int re_x1, re_y;
inv_scale_matrix.map( x1+cx, y+cy, &re_x1, &re_y ); inv_scale_matrix.map( x1+cx, y+cy, &re_x1, &re_y );
@ -826,7 +826,7 @@ void ImageCanvas::drawVAreaBorder(TQPainter &p, int x, int y1, int y2, int r )
if( !acquired ) p.setPen( TQPen( TQColor(150,150,150) ) ); if( !acquired ) p.setPen( TQPen( TQColor(150,150,150) ) );
for(;;) { for(;;) {
if(TQT_TQRECT_OBJECT(rect()).contains( TQPoint(x,y1) )) { if(rect().contains( TQPoint(x,y1) )) {
if( r && acquired ) { if( r && acquired ) {
int re_y1, re_x; int re_y1, re_x;
inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 ); inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 );

@ -1909,7 +1909,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
int x = a[i].x(); int x = a[i].x();
int y = a[i].y(); int y = a[i].y();
if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).contains(a[ i ])) if(img->valid(x, y) && a.boundingRect().contains(a[ i ]))
{ {
//kdDebug(4640) << "x: " << x << " - y: " << y << endl; //kdDebug(4640) << "x: " << x << " - y: " << y << endl;
switch( action ) switch( action )

Loading…
Cancel
Save