Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp
index 4efcbbcb0..a6d992f54 100644
--- a/libkdepim/kpixmapregionselectorwidget.cpp
+++ b/libkdepim/kpixmapregionselectorwidget.cpp
@@ -144,13 +144,13 @@ KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
    popup->insertTitle(i18n("Image Operations"));
 
    KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw",
-                                0, this, TQT_SLOT(rotateClockwise()),
-                                popup, "rotateclockwise");
+                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
+                                TQT_TQOBJECT(popup), "rotateclockwise");
    action->plug(popup);
 
    action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
-                                0, this, TQT_SLOT(rotateCounterclockwise()),
-                                popup, "rotatecounterclockwise");
+                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
+                                TQT_TQOBJECT(popup), "rotatecounterclockwise");
    action->plug(popup);
 
 /*
@@ -216,9 +216,9 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
    if ( ev->type() == TQEvent::MouseButtonPress )
    {
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
-      //kdDebug() << TQString("click at  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
+      //kdDebug() << TQString("click at  %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl;
 
-      if ( mev->button() == RightButton )
+      if ( mev->button() == Qt::RightButton )
       {
          KPopupMenu *popup = createPopupMenu( );
          popup->exec( mev->globalPos() );
@@ -249,7 +249,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
    {
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
 
-      //kdDebug() << TQString("move to  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
+      //kdDebug() << TQString("move to  %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl;
 
       if ( m_state == Resizing )
       {
@@ -421,7 +421,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect();
 
 //   kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl;
-//   kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl;
+//   kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl;
 
    if ( !m_originalPixmap.isNull() &&
        ( m_originalPixmap.width() > m_maxWidth ||
@@ -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, TQImage::ScaleMin ) );
+         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
          //m_originalPixmap.convertFromImage( KImageEffect::sample( image, width, height ) );
          double oldZoomFactor = m_zoomFactor;
          m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();