Drop TQT_TQ*_OBJECT defines

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 7 insertions, 7 deletions

diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index c130c0d9..ced8f825 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -969,7 +969,7 @@ void kpView::mouseMoveEvent (TQMouseEvent *e)
     // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the
     //       mainView, landing on top of the thumbnailView cleverly put on top
     //       of the mainView.
-    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()));
+    setHasMouse (rect ().contains (e->pos ()));
 
     if (tool ())
         tool ()->mouseMoveEvent (e);
@@ -1003,7 +1003,7 @@ void kpView::mouseReleaseEvent (TQMouseEvent *e)
                << endl;
 #endif
 
-    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()));
+    setHasMouse (rect ().contains (e->pos ()));
 
     if (tool ())
         tool ()->mouseReleaseEvent (e);
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index d3bb51e1..6160c166 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -783,7 +783,7 @@ void kpTransparentColorCell::mousePressEvent (TQMouseEvent * /*e*/)
 // protected virtual [base TQWidget]
 void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
 {
-    if (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()))
+    if (rect ().contains (e->pos ()))
     {
         if (e->button () == Qt::LeftButton)
         {
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index 62eaeea2..2f578382 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -83,7 +83,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
 void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 {
 	//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() );
 	//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
 	if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index d673b284..832ca4c6 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -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)));
 
   for(;;) {
-    if(TQT_TQRECT_OBJECT(rect()).contains(TQPoint(x1,y))) {
+    if(rect().contains(TQPoint(x1,y))) {
       if( r && acquired ) {
 	int 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) ) );
 
   for(;;) {
-    if(TQT_TQRECT_OBJECT(rect()).contains( TQPoint(x,y1) )) {
+    if(rect().contains( TQPoint(x,y1) )) {
       if( r && acquired ) {
 	int re_y1, re_x;
 	inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 );
diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index b441035b..3424be07 100644
--- a/tdeiconedit/tdeicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -1909,7 +1909,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
         int x = a[i].x();
         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;
             switch( action )