1 files changed, 12 insertions, 12 deletions

diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index fa93fe3d..6c9e09a0 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
    popup->insertTitle(i18n("Image Operations"));
 
    TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
-                                TQT_TQOBJECT(popup), "rotateclockwise");
+                                0, this, TQ_SLOT(rotateClockwise()),
+                                popup, "rotateclockwise");
    action->plug(popup);
 
    action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
-                                TQT_TQOBJECT(popup), "rotatecounterclockwise");
+                                0, this, TQ_SLOT(rotateCounterclockwise()),
+                                popup, "rotatecounterclockwise");
    action->plug(popup);
 
 /*
@@ -218,12 +218,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
       //kdDebug() << TQString("click at  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
 
-      if ( mev->button() == Qt::RightButton )
+      if ( mev->button() == TQt::RightButton )
       {
          TDEPopupMenu *popup = createPopupMenu( );
          popup->exec( mev->globalPos() );
          delete popup;
-         return TRUE;
+         return true;
       };
 
       TQCursor cursor;
@@ -242,7 +242,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
 
       m_tempFirstClick=mev->pos();
 
-      return TRUE;
+      return true;
    }
 
    if ( ev->type() == TQEvent::MouseMove )
@@ -281,7 +281,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
            m_selectedRegion.moveBy(0,m_originalPixmap.height()-m_selectedRegion.height()-m_selectedRegion.y());
            mouseOutside=true;
          }
-         if (mouseOutside) { updatePixmap(); return TRUE; };
+         if (mouseOutside) { updatePixmap(); return true; };
 
          m_selectedRegion.moveBy( mev->x()-m_tempFirstClick.x(),
                                   mev->y()-m_tempFirstClick.y() );
@@ -300,7 +300,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
          m_tempFirstClick=mev->pos();
          updatePixmap();
       }
-      return TRUE;
+      return true;
    }
 
    if ( ev->type() == TQEvent::MouseButtonRelease )
@@ -313,11 +313,11 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
       m_state=None;
       TQApplication::restoreOverrideCursor();
 
-      return TRUE;
+      return true;
    }
 
    TQWidget::eventFilter(obj, ev);
-   return FALSE;
+   return false;
 }
 
 TQRect KPixmapRegionSelectorWidget::calcSelectionRectangle( const TQPoint & startPoint, const TQPoint & _endPoint )
@@ -429,7 +429,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    {
          /* We have to resize the pixmap to get it complete on the screen */
          TQImage image=m_originalPixmap.convertToImage();
-         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
+         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) );
          //m_originalPixmap.convertFromImage( KImageEffect::sample( image, width, height ) );
          double oldZoomFactor = m_zoomFactor;
          m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();