TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

5 files changed, 132 insertions, 130 deletions

diff --git a/krita/plugins/tools/tool_transform/kis_tool_transform.cc b/krita/plugins/tools/tool_transform/kis_tool_transform.cc
index 05cdfd44..593ad450 100644
--- a/krita/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/krita/plugins/tools/tool_transform/kis_tool_transform.cc
@@ -20,13 +20,13 @@
  */
 
 
-#include <qpainter.h>
-#include <qpen.h>
-#include <qpushbutton.h>
-#include <qobject.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qapplication.h>
+#include <tqpainter.h>
+#include <tqpen.h>
+#include <tqpushbutton.h>
+#include <tqobject.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqapplication.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -62,14 +62,14 @@ namespace {
         typedef KisSelectedTransaction super;
 
     public:
-        TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, QPoint startPos, QPoint endPos);
+        TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, TQPoint startPos, TQPoint endPos);
         virtual ~TransformCmd();
 
     public:
         virtual void execute();
         virtual void unexecute();
         void transformArgs(double &sx, double &sy, double &tx, double &ty, double &a);
-        KisSelectionSP origSelection(QPoint &startPos, QPoint &endPos);
+        KisSelectionSP origSelection(TQPoint &startPos, TQPoint &endPos);
         KisPaintDeviceSP theDevice();
         KisPaintDeviceSP origDevice();
 
@@ -81,13 +81,13 @@ namespace {
         double m_a;
         KisToolTransform *m_tool;
         KisSelectionSP m_origSelection;
-        QPoint m_startPos;
-        QPoint m_endPos;
+        TQPoint m_startPos;
+        TQPoint m_endPos;
         KisPaintDeviceSP m_device;
         KisPaintDeviceSP m_origDevice;
     };
 
-    TransformCmd::TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, QPoint startPos, QPoint endPos) :
+    TransformCmd::TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, TQPoint startPos, TQPoint endPos) :
         super(i18n("Transform"), device)
         , m_scaleX(scaleX)
         , m_scaleY(scaleY)
@@ -116,7 +116,7 @@ namespace {
         a = m_a;
     }
 
-    KisSelectionSP TransformCmd::origSelection(QPoint &startPos, QPoint &endPos)
+    KisSelectionSP TransformCmd::origSelection(TQPoint &startPos, TQPoint &endPos)
     {
         startPos = m_startPos;
         endPos = m_endPos;
@@ -152,8 +152,8 @@ KisToolTransform::KisToolTransform()
     setCursor(KisCursor::selectCursor());
     m_subject = 0;
     m_selecting = false;
-    m_startPos = QPoint(0, 0);
-    m_endPos = QPoint(0, 0);
+    m_startPos = TQPoint(0, 0);
+    m_endPos = TQPoint(0, 0);
     m_optWidget = 0;
     m_sizeCursors[0] = KisCursor::sizeVerCursor();
     m_sizeCursors[1] = KisCursor::sizeBDiagCursor();
@@ -181,7 +181,7 @@ void KisToolTransform::deactivate()
 
     paintOutline();
 
-   disconnect(m_subject->currentImg().data(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP)));
+   disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolTransform::activate()
@@ -222,12 +222,12 @@ void KisToolTransform::activate()
                 initHandles();
         }
     }
-    connect(m_subject->currentImg(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP)));
+    connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolTransform::initHandles()
 {
-    Q_INT32 x,y,w,h;
+    TQ_INT32 x,y,w,h;
     KisImageSP img = m_subject->currentImg();
 
     KisPaintDeviceSP dev = img->activeDevice();
@@ -241,15 +241,15 @@ void KisToolTransform::initHandles()
     {
         KisSelectionSP sel = dev->selection();
         m_origSelection = new KisSelection(*sel.data());
-        QRect r = sel->selectedExactRect();
+        TQRect r = sel->selectedExactRect();
         r.rect(&x, &y, &w, &h);
     }
     else {
         dev->exactBounds(x,y,w,h);
         m_origSelection = 0;
     }
-    m_startPos = QPoint(x, y);
-    m_endPos = QPoint(x+w-1, y+h-1);
+    m_startPos = TQPoint(x, y);
+    m_endPos = TQPoint(x+w-1, y+h-1);
     m_org_cenX = (m_startPos.x() + m_endPos.x()) / 2.0;
     m_org_cenY = (m_startPos.y() + m_endPos.y()) / 2.0;
 
@@ -264,10 +264,10 @@ void KisToolTransform::initHandles()
 
 void KisToolTransform::paint(KisCanvasPainter& gc)
 {
-    paintOutline(gc, QRect());
+    paintOutline(gc, TQRect());
 }
 
-void KisToolTransform::paint(KisCanvasPainter& gc, const QRect& rc)
+void KisToolTransform::paint(KisCanvasPainter& gc, const TQRect& rc)
 {
     paintOutline(gc, rc);
 }
@@ -275,7 +275,7 @@ void KisToolTransform::paint(KisCanvasPainter& gc, const QRect& rc)
 
 void KisToolTransform::buttonPress(KisButtonPressEvent *e)
 {
-    if (m_subject && e->button() == QMouseEvent::LeftButton) {
+    if (m_subject && e->button() == TQMouseEvent::LeftButton) {
         m_wasPressed = true;
     }
 
@@ -286,42 +286,42 @@ void KisToolTransform::buttonPress(KisButtonPressEvent *e)
             switch(m_function)
             {
                 case ROTATE:
-                    m_clickoffset = e->pos().floorQPoint()
-                        - QPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY));
+                    m_clickoffset = e->pos().floorTQPoint()
+                        - TQPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY));
                     m_clickangle = -m_a - atan2(m_clickoffset.x(),m_clickoffset.y());
-                    m_clickoffset = QPoint(0, 0);
+                    m_clickoffset = TQPoint(0, 0);
                     break;
                 case MOVE:
-                    m_clickoffset = e->pos().floorQPoint()
-                        - QPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY));
+                    m_clickoffset = e->pos().floorTQPoint()
+                        - TQPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY));
                     break;
                 case TOPSCALE:
-                    m_clickoffset = e->pos().floorQPoint()
-                            - QPoint((m_topleft + m_topright)/2);
+                    m_clickoffset = e->pos().floorTQPoint()
+                            - TQPoint((m_topleft + m_topright)/2);
                     break;
                 case TOPRIGHTSCALE:
-                    m_clickoffset = e->pos().floorQPoint() - m_topright;
+                    m_clickoffset = e->pos().floorTQPoint() - m_topright;
                     break;
                 case RIGHTSCALE:
-                    m_clickoffset = e->pos().floorQPoint()
-                            - QPoint((m_topright + m_bottomright)/2);
+                    m_clickoffset = e->pos().floorTQPoint()
+                            - TQPoint((m_topright + m_bottomright)/2);
                     break;
                 case BOTTOMRIGHTSCALE:
-                    m_clickoffset = e->pos().floorQPoint() - m_bottomright;
+                    m_clickoffset = e->pos().floorTQPoint() - m_bottomright;
                     break;
                 case BOTTOMSCALE:
-                    m_clickoffset = e->pos().floorQPoint()
-                            - QPoint((m_bottomleft + m_bottomright)/2);
+                    m_clickoffset = e->pos().floorTQPoint()
+                            - TQPoint((m_bottomleft + m_bottomright)/2);
                     break;
                 case BOTTOMLEFTSCALE:
-                    m_clickoffset = e->pos().floorQPoint() - m_bottomleft;
+                    m_clickoffset = e->pos().floorTQPoint() - m_bottomleft;
                     break;
                 case LEFTSCALE:
-                    m_clickoffset = e->pos().floorQPoint()
-                            - QPoint((m_topleft + m_bottomleft)/2);
+                    m_clickoffset = e->pos().floorTQPoint()
+                            - TQPoint((m_topleft + m_bottomleft)/2);
                     break;
                 case TOPLEFTSCALE:
-                    m_clickoffset = e->pos().floorQPoint() - m_topleft;
+                    m_clickoffset = e->pos().floorTQPoint() - m_topleft;
                     break;
             }
             m_selecting = true;
@@ -330,11 +330,11 @@ void KisToolTransform::buttonPress(KisButtonPressEvent *e)
     }
 }
 
-int KisToolTransform::det(QPoint v,QPoint w)
+int KisToolTransform::det(TQPoint v,TQPoint w)
 {
     return v.x()*w.y()-v.y()*w.x();
 }
-int KisToolTransform::distsq(QPoint v,QPoint w)
+int KisToolTransform::distsq(TQPoint v,TQPoint w)
 {
     v -= w;
     return v.x()*v.x() + v.y()*v.y();
@@ -391,12 +391,12 @@ void KisToolTransform::move(KisMoveEvent *e)
         KisCanvasController *controller = m_subject->canvasController();
 
         Q_ASSERT(controller);
-        QPoint topleft = m_topleft;
-        QPoint topright = m_topright;
-        QPoint bottomleft = m_bottomleft;
-        QPoint bottomright = m_bottomright;
+        TQPoint topleft = m_topleft;
+        TQPoint topright = m_topright;
+        TQPoint bottomleft = m_bottomleft;
+        TQPoint bottomright = m_bottomright;
 
-        QPoint mousePos = e->pos().floorQPoint();
+        TQPoint mousePos = e->pos().floorTQPoint();
 
         if (m_subject && m_selecting) {
             paintOutline();
@@ -428,7 +428,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX>0) // handle the mirrored cases
                         m_scaleX = fabs(m_scaleY);
@@ -446,7 +446,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY);
 
                 // enforce same aspect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX < m_scaleY)
                     {
@@ -473,7 +473,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleX = (newX - dx) / (m_endPos.x() - m_org_cenX);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleY>0) // handle the mirrored cases
                         m_scaleY = fabs(m_scaleX);
@@ -491,7 +491,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX < m_scaleY)
                     {
@@ -518,7 +518,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX>0) // handle the mirrored cases
                         m_scaleX = fabs(m_scaleY);
@@ -536,7 +536,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX < m_scaleY)
                     {
@@ -563,7 +563,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleX = (newX - dx) / (m_startPos.x() - m_org_cenX);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleY>0) // handle the mirrored cases
                         m_scaleY = fabs(m_scaleX);
@@ -581,7 +581,7 @@ void KisToolTransform::move(KisMoveEvent *e)
                 m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY);
 
                 // enforce same acpect if shift button is pressed
-                if(e->state() & Qt::ShiftButton)
+                if(e->state() & TQt::ShiftButton)
                 {
                     if(m_scaleX < m_scaleY)
                     {
@@ -646,7 +646,7 @@ void KisToolTransform::move(KisMoveEvent *e)
 
 void KisToolTransform::buttonRelease(KisButtonReleaseEvent *e)
 {
-    if (m_subject && e->button() == QMouseEvent::LeftButton) {
+    if (m_subject && e->button() == TQMouseEvent::LeftButton) {
         if(!m_wasPressed) return;
         m_wasPressed = false;
 
@@ -660,9 +660,9 @@ void KisToolTransform::buttonRelease(KisButtonReleaseEvent *e)
         if(m_actualyMoveWhileSelected)
         {
             paintOutline();
-            QApplication::setOverrideCursor(KisCursor::waitCursor());
+            TQApplication::setOverrideCursor(KisCursor::waitCursor());
             transform();
-            QApplication::restoreOverrideCursor();
+            TQApplication::restoreOverrideCursor();
         }
     }
 }
@@ -673,7 +673,7 @@ void KisToolTransform::paintOutline()
         KisCanvasController *controller = m_subject->canvasController();
         KisCanvas *canvas = controller->kiscanvas();
         KisCanvasPainter gc(canvas);
-        QRect rc;
+        TQRect rc;
 
         paintOutline(gc, rc);
     }
@@ -688,38 +688,38 @@ void KisToolTransform::recalcOutline()
 
     x = (m_startPos.x() - m_org_cenX) * m_scaleX;
     y = (m_startPos.y() - m_org_cenY) * m_scaleY;
-    m_topleft = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
+    m_topleft = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
 
     x = (m_endPos.x() - m_org_cenX) * m_scaleX;
     y = (m_startPos.y() - m_org_cenY) * m_scaleY;
-    m_topright = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
+    m_topright = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
 
     x = (m_startPos.x() - m_org_cenX) * m_scaleX;
     y = (m_endPos.y() - m_org_cenY) * m_scaleY;
-    m_bottomleft = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
+    m_bottomleft = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
 
     x = (m_endPos.x() - m_org_cenX) * m_scaleX;
     y = (m_endPos.y() - m_org_cenY) * m_scaleY;
-    m_bottomright = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
+    m_bottomright = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5));
 }
 
-void KisToolTransform::paintOutline(KisCanvasPainter& gc, const QRect&)
+void KisToolTransform::paintOutline(KisCanvasPainter& gc, const TQRect&)
 {
     if (m_subject) {
         KisCanvasController *controller = m_subject->canvasController();
         RasterOp op = gc.rasterOp();
-        QPen old = gc.pen();
-        QPen pen(Qt::SolidLine);
+        TQPen old = gc.pen();
+        TQPen pen(TQt::SolidLine);
         pen.setWidth(1);
         Q_ASSERT(controller);
 
         recalcOutline();
-        QPoint topleft = controller->windowToView(m_topleft);
-        QPoint topright = controller->windowToView(m_topright);
-        QPoint bottomleft = controller->windowToView(m_bottomleft);
-        QPoint bottomright = controller->windowToView(m_bottomright);
+        TQPoint topleft = controller->windowToView(m_topleft);
+        TQPoint topright = controller->windowToView(m_topright);
+        TQPoint bottomleft = controller->windowToView(m_bottomleft);
+        TQPoint bottomright = controller->windowToView(m_bottomright);
 
-        gc.setRasterOp(Qt::NotROP);
+        gc.setRasterOp(TQt::NotROP);
         gc.setPen(pen);
         gc.drawRect(topleft.x()-4, topleft.y()-4, 8, 8);
         gc.drawLine(topleft.x(), topleft.y(), (topleft.x()+topright.x())/2, (topleft.y()+topright.y())/2);
@@ -759,7 +759,7 @@ void KisToolTransform::transform()
                                                 m_scaleX, m_scaleY, m_translateX, m_translateY, m_a, m_origSelection, m_startPos, m_endPos);
 
     // Copy the original state back.
-    QRect rc = m_origDevice->extent();
+    TQRect rc = m_origDevice->extent();
     rc = rc.normalize();
     img->activeDevice()->clear();
     KisPainter gc(img->activeDevice());
@@ -769,8 +769,8 @@ void KisToolTransform::transform()
     // Also restore the original selection.
     if(m_origSelection)
     {
-        //QRect rc = m_origSelection->extent();
-        QRect rc = m_origSelection->selectedRect();
+        //TQRect rc = m_origSelection->extent();
+        TQRect rc = m_origSelection->selectedRect();
         rc = rc.normalize();
         img->activeDevice()->selection()->clear();
         KisPainter sgc(img->activeDevice()->selection().data());
@@ -856,27 +856,27 @@ void KisToolTransform::slotLayerActivated(KisLayerSP)
 }
 
 
-QWidget* KisToolTransform::createOptionWidget(QWidget* parent)
+TQWidget* KisToolTransform::createOptionWidget(TQWidget* tqparent)
 {
 
-    m_optWidget = new WdgToolTransform(parent);
+    m_optWidget = new WdgToolTransform(tqparent);
     Q_CHECK_PTR(m_optWidget);
 
     m_optWidget->cmbFilter->clear();
     m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys());
 
     m_optWidget->cmbFilter->setCurrentText("Mitchell");
-    connect(m_optWidget->cmbFilter, SIGNAL(activated(const KisID &)),
-        this, SLOT(slotSetFilter(const KisID &)));
+    connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)),
+        this, TQT_SLOT(slotSetFilter(const KisID &)));
 
     KisID filterID = m_optWidget->cmbFilter->currentItem();
     m_filter = KisFilterStrategyRegistry::instance()->get(filterID);
 
 /*
-    connect(m_optWidget->intStartX, SIGNAL(valueChanged(int)), this, SLOT(setStartX(int)));
-    connect(m_optWidget->intStartY, SIGNAL(valueChanged(int)), this, SLOT(setStartY(int)));
-    connect(m_optWidget->intEndX, SIGNAL(valueChanged(int)), this, SLOT(setEndX(int)));
-    connect(m_optWidget->intEndY, SIGNAL(valueChanged(int)), this, SLOT(setEndY(int)));
+    connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int)));
+    connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int)));
+    connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int)));
+    connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int)));
 */
     m_optWidget->intStartX->hide();
     m_optWidget->intStartY->hide();
@@ -889,7 +889,7 @@ QWidget* KisToolTransform::createOptionWidget(QWidget* parent)
     return m_optWidget;
 }
 
-QWidget* KisToolTransform::optionWidget()
+TQWidget* KisToolTransform::optionWidget()
 {
     return m_optWidget;
 }
@@ -903,7 +903,7 @@ void KisToolTransform::setup(KActionCollection *collection)
                         "tool_transform",
                         0,
                         this,
-                        SLOT(activate()),
+                        TQT_SLOT(activate()),
                         collection,
                         name());
         Q_CHECK_PTR(m_action);
diff --git a/krita/plugins/tools/tool_transform/kis_tool_transform.h b/krita/plugins/tools/tool_transform/kis_tool_transform.h
index 9ae4f4da..3d5ff8b3 100644
--- a/krita/plugins/tools/tool_transform/kis_tool_transform.h
+++ b/krita/plugins/tools/tool_transform/kis_tool_transform.h
@@ -22,7 +22,7 @@
 #ifndef KIS_TOOL_TRANSFORM_H_
 #define KIS_TOOL_TRANSFORM_H_
 
-#include <qpoint.h>
+#include <tqpoint.h>
 
 #include <kis_tool_non_paint.h>
 #include <kis_tool_factory.h>
@@ -42,19 +42,20 @@ class KisToolTransform : public KisToolNonPaint, KisCommandHistoryListener {
 
     typedef KisToolNonPaint super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KisToolTransform();
     virtual ~KisToolTransform();
 
-    virtual QWidget* createOptionWidget(QWidget* parent);
-    virtual QWidget* optionWidget();
+    virtual TQWidget* createOptionWidget(TQWidget* tqparent);
+    virtual TQWidget* optionWidget();
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
-    virtual Q_UINT32 priority() { return 3; }
+    virtual TQ_UINT32 priority() { return 3; }
     virtual void paint(KisCanvasPainter& gc);
-    virtual void paint(KisCanvasPainter& gc, const QRect& rc);
+    virtual void paint(KisCanvasPainter& gc, const TQRect& rc);
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
@@ -75,15 +76,15 @@ public:
 
 private:
 
-    void paintOutline(KisCanvasPainter& gc, const QRect& rc);
+    void paintOutline(KisCanvasPainter& gc, const TQRect& rc);
     void transform();
     void recalcOutline();
     double rotX(double x, double y) { return m_cosa*x - m_sina*y;};
     double rotY(double x, double y) { return m_sina*x + m_cosa*y;};
     double invrotX(double x, double y) { return m_cosa*x + m_sina*y;};
     double invrotY(double x, double y) { return -m_sina*x + m_cosa*y;};
-    int det(QPoint v,QPoint w);
-    int distsq(QPoint v,QPoint w);
+    int det(TQPoint v,TQPoint w);
+    int distsq(TQPoint v,TQPoint w);
     void setFunctionalCursor();
     void initHandles();
 
@@ -102,21 +103,21 @@ protected slots:
 private:
     enum function {ROTATE,MOVE,TOPLEFTSCALE,TOPSCALE,TOPRIGHTSCALE,RIGHTSCALE,
 		   BOTTOMRIGHTSCALE, BOTTOMSCALE,BOTTOMLEFTSCALE, LEFTSCALE};
-    QCursor m_sizeCursors[8];
+    TQCursor m_sizeCursors[8];
     function m_function;
-    QPoint m_startPos;
-    QPoint m_endPos;
+    TQPoint m_startPos;
+    TQPoint m_endPos;
     bool m_selecting;
     bool m_actualyMoveWhileSelected;
-    QPoint m_topleft;
-    QPoint m_topright;
-    QPoint m_bottomleft;
-    QPoint m_bottomright;
+    TQPoint m_topleft;
+    TQPoint m_topright;
+    TQPoint m_bottomleft;
+    TQPoint m_bottomright;
     double m_scaleX;
     double m_scaleY;
     double m_translateX;
     double m_translateY;
-    QPoint m_clickoffset;
+    TQPoint m_clickoffset;
     double m_org_cenX;
     double m_org_cenY;
     double m_cosa;
diff --git a/krita/plugins/tools/tool_transform/tool_transform.cc b/krita/plugins/tools/tool_transform/tool_transform.cc
index e8c77aa7..b91ab784 100644
--- a/krita/plugins/tools/tool_transform/tool_transform.cc
+++ b/krita/plugins/tools/tool_transform/tool_transform.cc
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <vector>
 
-#include <qpoint.h>
+#include <tqpoint.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -42,14 +42,14 @@ typedef KGenericFactory<ToolTransform> ToolTransformFactory;
 K_EXPORT_COMPONENT_FACTORY( kritatooltransform, ToolTransformFactory( "krita" ) )
 
 
-ToolTransform::ToolTransform(QObject *parent, const char *name, const QStringList &)
-    : KParts::Plugin(parent, name)
+ToolTransform::ToolTransform(TQObject *tqparent, const char *name, const TQStringList &)
+    : KParts::Plugin(tqparent, name)
 {
     setInstance(ToolTransformFactory::instance());
 
-    if ( parent->inherits("KisToolRegistry") )
+    if ( tqparent->inherits("KisToolRegistry") )
     {
-        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent);
+        KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent);
         KisToolTransformFactory * f = new KisToolTransformFactory();
         Q_CHECK_PTR(f);
         r->add(f);
diff --git a/krita/plugins/tools/tool_transform/tool_transform.h b/krita/plugins/tools/tool_transform/tool_transform.h
index 42eba788..04bfbaa9 100644
--- a/krita/plugins/tools/tool_transform/tool_transform.h
+++ b/krita/plugins/tools/tool_transform/tool_transform.h
@@ -29,8 +29,9 @@ class KisView;
 class ToolTransform : public KParts::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ToolTransform(QObject *parent, const char *name, const QStringList &);
+    ToolTransform(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~ToolTransform();
 
 private:
diff --git a/krita/plugins/tools/tool_transform/wdg_tool_transform.ui b/krita/plugins/tools/tool_transform/wdg_tool_transform.ui
index b9307451..2f41e1b3 100644
--- a/krita/plugins/tools/tool_transform/wdg_tool_transform.ui
+++ b/krita/plugins/tools/tool_transform/wdg_tool_transform.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WdgToolTransform</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WdgToolTransform</cstring>
     </property>
@@ -25,31 +25,31 @@
         <property name="spacing">
             <number>3</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout1</cstring>
+                                <cstring>tqlayout1</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -70,15 +70,15 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel2</cstring>
                                     </property>
@@ -101,23 +101,23 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel3</cstring>
                                     </property>
@@ -138,15 +138,15 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel4</cstring>
                                     </property>
@@ -171,14 +171,14 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
@@ -235,7 +235,7 @@
     <tabstop>intEndX</tabstop>
     <tabstop>intEndY</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>kis_cmb_idlist.h</includehint>