1 files changed, 12 insertions, 12 deletions

diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index d673b284..119ed23a 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -114,14 +114,14 @@ ImageCanvas::ImageCanvas(TQWidget *parent,
     update_scaled_pixmap();
 
     // timer-Start and stop
-    connect( this, TQT_SIGNAL( newRect()), TQT_SLOT( newRectSlot()));
-    connect( this, TQT_SIGNAL( noRect()),  TQT_SLOT( noRectSlot()));
+    connect( this, TQ_SIGNAL( newRect()), TQ_SLOT( newRectSlot()));
+    connect( this, TQ_SIGNAL( noRect()),  TQ_SLOT( noRectSlot()));
 
     //zoomOut();scrollview/scrollview
     viewport()->setCursor( crossCursor );
     cr1 = 0;
     cr2 = 0;
-    viewport()->setMouseTracking(TRUE);
+    viewport()->setMouseTracking(true);
     viewport()->setBackgroundMode(PaletteBackground);
     show();
 
@@ -401,7 +401,7 @@ void ImageCanvas::newRectSlot( TQRect newSel )
 {
    TQRect to_map;
    TQPainter p(viewport());
-   drawAreaBorder(&p,TRUE);
+   drawAreaBorder(&p,true);
    selected->setWidth(0);
    selected->setHeight(0);
 
@@ -457,7 +457,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev)
 {
    if( ! acquired || ! image ) return;
 
-   if(ev->button()==Qt::LeftButton )
+   if(ev->button()==TQt::LeftButton )
    {
 
         int cx = contentsX(), cy = contentsY();
@@ -470,7 +470,7 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev)
      	if( moving == MOVE_NONE )
      	{
 		TQPainter p( viewport());
-		drawAreaBorder(&p,TRUE);
+		drawAreaBorder(&p,true);
 		moving = classifyPoint( x+cx ,y+cy);
 
 		if(moving == MOVE_NONE)
@@ -486,12 +486,12 @@ void ImageCanvas::viewportMousePressEvent(TQMouseEvent *ev)
 
 void ImageCanvas::viewportMouseReleaseEvent(TQMouseEvent *ev)
 {
-  if(ev->button()!=Qt::LeftButton || !acquired ) return;
+  if(ev->button()!=TQt::LeftButton || !acquired ) return;
 
   //// debug( "Mouse Release at %d/%d", ev->x(), ev->y());
   if(moving!=MOVE_NONE) {
     TQPainter p(viewport());
-    drawAreaBorder(&p,TRUE);
+    drawAreaBorder(&p,true);
     moving = MOVE_NONE;
     *selected = selected->normalize();
 
@@ -581,7 +581,7 @@ void ImageCanvas::viewportMouseMoveEvent(TQMouseEvent *ev)
   if( moving!=MOVE_NONE ) {
   	 int mx, my;
     TQPainter p(viewport());
-    drawAreaBorder(&p,TRUE);
+    drawAreaBorder(&p,true);
     switch(moving) {
     case MOVE_NONE: //Just to make compiler happy
       break;
@@ -675,7 +675,7 @@ void ImageCanvas::update_scaled_pixmap( void )
     if( scaleKind() == DYNAMIC )
         kdDebug(28000) << "Scaling DYNAMIC" << endl;
     TQSize noSBSize( visibleWidth(), visibleHeight());
-    const int sbWidth = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent );
+    const int sbWidth = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent );
 
     // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth;
     // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth;
@@ -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 );