1 files changed, 188 insertions, 188 deletions

diff --git a/krita/ui/kis_canvas_painter.cc b/krita/ui/kis_canvas_painter.cc
index f9103e65..51338b42 100644
--- a/krita/ui/kis_canvas_painter.cc
+++ b/krita/ui/kis_canvas_painter.cc
@@ -41,31 +41,31 @@ void KisCanvasWidgetPainter::restore()
 {
 }
 
-QFontMetrics KisCanvasWidgetPainter::fontMetrics() const
+TQFontMetrics KisCanvasWidgetPainter::fontMetrics() const
 {
-    return QFontMetrics(QFont());
+    return TQFontMetrics(TQFont());
 }
 
-QFontInfo KisCanvasWidgetPainter::fontInfo() const
+TQFontInfo KisCanvasWidgetPainter::fontInfo() const
 {
-    return QFontInfo(QFont());
+    return TQFontInfo(TQFont());
 }
 
-const QFont& KisCanvasWidgetPainter::font() const
+const TQFont& KisCanvasWidgetPainter::font() const
 {
     return m_defaultFont;
 }
 
-void KisCanvasWidgetPainter::setFont(const QFont& /*font*/)
+void KisCanvasWidgetPainter::setFont(const TQFont& /*font*/)
 {
 }
 
-const QPen& KisCanvasWidgetPainter::pen() const
+const TQPen& KisCanvasWidgetPainter::pen() const
 {
     return m_defaultPen;
 }
 
-void KisCanvasWidgetPainter::setPen(const QPen& /*pen*/)
+void KisCanvasWidgetPainter::setPen(const TQPen& /*pen*/)
 {
 }
 
@@ -73,60 +73,60 @@ void KisCanvasWidgetPainter::setPen(Qt::PenStyle /*penStyle*/)
 {
 }
 
-void KisCanvasWidgetPainter::setPen(const QColor& /*color*/)
+void KisCanvasWidgetPainter::setPen(const TQColor& /*color*/)
 {
 }
 
-const QBrush& KisCanvasWidgetPainter::brush() const
+const TQBrush& KisCanvasWidgetPainter::brush() const
 {
     return m_defaultBrush;
 }
 
-void KisCanvasWidgetPainter::setBrush(const QBrush& /*brush*/)
+void KisCanvasWidgetPainter::setBrush(const TQBrush& /*brush*/)
 {
 }
 
-void KisCanvasWidgetPainter::setBrush(Qt::BrushStyle /*brushStyle*/)
+void KisCanvasWidgetPainter::setBrush(TQt::BrushStyle /*brushStyle*/)
 {
 }
 
-void KisCanvasWidgetPainter::setBrush(const QColor& /*color*/)
+void KisCanvasWidgetPainter::setBrush(const TQColor& /*color*/)
 {
 }
 
-QPoint KisCanvasWidgetPainter::pos() const
+TQPoint KisCanvasWidgetPainter::pos() const
 {
-    return QPoint();
+    return TQPoint();
 }
 
-const QColor& KisCanvasWidgetPainter::backgroundColor() const
+const TQColor& KisCanvasWidgetPainter::backgroundColor() const
 {
     return m_defaultColor;
 }
 
-void KisCanvasWidgetPainter::setBackgroundColor(const QColor& /*color*/)
+void KisCanvasWidgetPainter::setBackgroundColor(const TQColor& /*color*/)
 {
 }
 
-Qt::Qt::BGMode KisCanvasWidgetPainter::backgroundMode() const
+TQt::Qt::BGMode KisCanvasWidgetPainter::backgroundMode() const
 {
-    return Qt::TransparentMode;
+    return TQt::TransparentMode;
 }
 
-void KisCanvasWidgetPainter::setBackgroundMode(Qt::Qt::BGMode /*bgMode*/)
+void KisCanvasWidgetPainter::setBackgroundMode(TQt::Qt::BGMode /*bgMode*/)
 {
 }
 
-Qt::Qt::RasterOp KisCanvasWidgetPainter::rasterOp() const
+TQt::TQt::RasterOp KisCanvasWidgetPainter::rasterOp() const
 {
-    return Qt::CopyROP;
+    return TQt::CopyROP;
 }
 
-void KisCanvasWidgetPainter::setRasterOp(Qt::RasterOp /*rasterOp*/)
+void KisCanvasWidgetPainter::setRasterOp(TQt::RasterOp /*rasterOp*/)
 {
 }
 
-const QPoint& KisCanvasWidgetPainter::brushOrigin() const
+const TQPoint& KisCanvasWidgetPainter::brushOrigin() const
 {
     return m_defaultBrushOrigin;
 }
@@ -135,7 +135,7 @@ void KisCanvasWidgetPainter::setBrushOrigin(int /*x*/, int /*y*/)
 {
 }
 
-void KisCanvasWidgetPainter::setBrushOrigin(const QPoint& /*origin*/)
+void KisCanvasWidgetPainter::setBrushOrigin(const TQPoint& /*origin*/)
 {
 }
 
@@ -153,12 +153,12 @@ void KisCanvasWidgetPainter::setViewXForm(bool /*enable*/)
 {
 }
 
-QRect KisCanvasWidgetPainter::window() const
+TQRect KisCanvasWidgetPainter::window() const
 {
-    return QRect();
+    return TQRect();
 }
 
-void KisCanvasWidgetPainter::setWindow(const QRect& /*r*/)
+void KisCanvasWidgetPainter::setWindow(const TQRect& /*r*/)
 {
 }
 
@@ -166,12 +166,12 @@ void KisCanvasWidgetPainter::setWindow(int /*x*/, int /*y*/, int /*w*/, int /*h*
 {
 }
 
-QRect KisCanvasWidgetPainter::viewport() const
+TQRect KisCanvasWidgetPainter::viewport() const
 {
-    return QRect();
+    return TQRect();
 }
 
-void KisCanvasWidgetPainter::setViewport(const QRect& /*r*/)
+void KisCanvasWidgetPainter::setViewport(const TQRect& /*r*/)
 {
 }
 
@@ -184,12 +184,12 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const QWMatrix& KisCanvasWidgetPainter::worldMatrix() const
+const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
 
-void KisCanvasWidgetPainter::setWorldMatrix(const QWMatrix& /*matrix*/, bool /*combine*/)
+void KisCanvasWidgetPainter::setWorldMatrix(const TQWMatrix& /*matrix*/, bool /*combine*/)
 {
 }
 
@@ -231,42 +231,42 @@ double KisCanvasWidgetPainter::translationY() const
     return 0;
 }
 
-QPoint KisCanvasWidgetPainter::xForm(const QPoint& point) const
+TQPoint KisCanvasWidgetPainter::xForm(const TQPoint& point) const
 {
     return point;
 }
 
-QRect KisCanvasWidgetPainter::xForm(const QRect& r) const
+TQRect KisCanvasWidgetPainter::xForm(const TQRect& r) const
 {
     return r;
 }
 
-QPointArray KisCanvasWidgetPainter::xForm(const QPointArray& pointArray) const
+TQPointArray KisCanvasWidgetPainter::xForm(const TQPointArray& pointArray) const
 {
     return pointArray;
 }
 
-QPointArray KisCanvasWidgetPainter::xForm(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const
+TQPointArray KisCanvasWidgetPainter::xForm(const TQPointArray& pointArray, int /*index*/, int /*npoints*/) const
 {
     return pointArray;
 }
 
-QPoint KisCanvasWidgetPainter::xFormDev(const QPoint& point) const
+TQPoint KisCanvasWidgetPainter::xFormDev(const TQPoint& point) const
 {
     return point;
 }
 
-QRect KisCanvasWidgetPainter::xFormDev(const QRect& r) const
+TQRect KisCanvasWidgetPainter::xFormDev(const TQRect& r) const
 {
     return r;
 }
 
-QPointArray KisCanvasWidgetPainter::xFormDev(const QPointArray& pointArray) const
+TQPointArray KisCanvasWidgetPainter::xFormDev(const TQPointArray& pointArray) const
 {
     return pointArray;
 }
 
-QPointArray KisCanvasWidgetPainter::xFormDev(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const
+TQPointArray KisCanvasWidgetPainter::xFormDev(const TQPointArray& pointArray, int /*index*/, int /*npoints*/) const
 {
     return pointArray;
 }
@@ -280,20 +280,20 @@ bool KisCanvasWidgetPainter::hasClipping() const
     return true;
 }
 
-QRegion KisCanvasWidgetPainter::clipRegion(QPainter::CoordinateMode /*mode*/) const
+TQRegion KisCanvasWidgetPainter::clipRegion(TQPainter::CoordinateMode /*mode*/) const
 {
-    return QRegion();
+    return TQRegion();
 }
 
-void KisCanvasWidgetPainter::setClipRect(const QRect& /*r*/, QPainter::CoordinateMode /*mode*/)
+void KisCanvasWidgetPainter::setClipRect(const TQRect& /*r*/, TQPainter::CoordinateMode /*mode*/)
 {
 }
 
-void KisCanvasWidgetPainter::setClipRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, QPainter::CoordinateMode /*mode*/)
+void KisCanvasWidgetPainter::setClipRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, TQPainter::CoordinateMode /*mode*/)
 {
 }
 
-void KisCanvasWidgetPainter::setClipRegion(const QRegion& /*rgn*/, QPainter::CoordinateMode /*mode*/)
+void KisCanvasWidgetPainter::setClipRegion(const TQRegion& /*rgn*/, TQPainter::CoordinateMode /*mode*/)
 {
 }
 
@@ -301,11 +301,11 @@ void KisCanvasWidgetPainter::drawPoint(int /*x*/, int /*y*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPoint(const QPoint& /*point*/)
+void KisCanvasWidgetPainter::drawPoint(const TQPoint& /*point*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPoints(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
+void KisCanvasWidgetPainter::drawPoints(const TQPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
 {
 }
 
@@ -313,7 +313,7 @@ void KisCanvasWidgetPainter::moveTo(int /*x*/, int /*y*/)
 {
 }
 
-void KisCanvasWidgetPainter::moveTo(const QPoint& /*point*/)
+void KisCanvasWidgetPainter::moveTo(const TQPoint& /*point*/)
 {
 }
 
@@ -321,7 +321,7 @@ void KisCanvasWidgetPainter::lineTo(int /*x*/, int /*y*/)
 {
 }
 
-void KisCanvasWidgetPainter::lineTo(const QPoint& /*point*/)
+void KisCanvasWidgetPainter::lineTo(const TQPoint& /*point*/)
 {
 }
 
@@ -329,7 +329,7 @@ void KisCanvasWidgetPainter::drawLine(int /*x1*/, int /*y1*/, int /*x2*/, int /*
 {
 }
 
-void KisCanvasWidgetPainter::drawLine(const QPoint& /*start*/, const QPoint& /*end*/)
+void KisCanvasWidgetPainter::drawLine(const TQPoint& /*start*/, const TQPoint& /*end*/)
 {
 }
 
@@ -337,7 +337,7 @@ void KisCanvasWidgetPainter::drawRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/
 {
 }
 
-void KisCanvasWidgetPainter::drawRect(const QRect& /*r*/)
+void KisCanvasWidgetPainter::drawRect(const TQRect& /*r*/)
 {
 }
 
@@ -345,15 +345,15 @@ void KisCanvasWidgetPainter::drawWinFocusRect(int /*x*/, int /*y*/, int /*w*/, i
 {
 }
 
-void KisCanvasWidgetPainter::drawWinFocusRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const QColor& /*bgColor*/)
+void KisCanvasWidgetPainter::drawWinFocusRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const TQColor& /*bgColor*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawWinFocusRect(const QRect& /*r*/)
+void KisCanvasWidgetPainter::drawWinFocusRect(const TQRect& /*r*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawWinFocusRect(const QRect& /*r*/, const QColor& /*bgColor*/)
+void KisCanvasWidgetPainter::drawWinFocusRect(const TQRect& /*r*/, const TQColor& /*bgColor*/)
 {
 }
 
@@ -361,7 +361,7 @@ void KisCanvasWidgetPainter::drawRoundRect(int /*x*/, int /*y*/, int /*w*/, int
 {
 }
 
-void KisCanvasWidgetPainter::drawRoundRect(const QRect& /*r*/, int /*xRnd*/, int /*yRnd*/)
+void KisCanvasWidgetPainter::drawRoundRect(const TQRect& /*r*/, int /*xRnd*/, int /*yRnd*/)
 {
 }
 
@@ -369,7 +369,7 @@ void KisCanvasWidgetPainter::drawEllipse(int /*x*/, int /*y*/, int /*w*/, int /*
 {
 }
 
-void KisCanvasWidgetPainter::drawEllipse(const QRect& /*r*/)
+void KisCanvasWidgetPainter::drawEllipse(const TQRect& /*r*/)
 {
 }
 
@@ -377,7 +377,7 @@ void KisCanvasWidgetPainter::drawArc(int /*x*/, int /*y*/, int /*w*/, int /*h*/,
 {
 }
 
-void KisCanvasWidgetPainter::drawArc(const QRect& /*r*/, int /*a*/, int /*alen*/)
+void KisCanvasWidgetPainter::drawArc(const TQRect& /*r*/, int /*a*/, int /*alen*/)
 {
 }
 
@@ -385,7 +385,7 @@ void KisCanvasWidgetPainter::drawPie(int /*x*/, int /*y*/, int /*w*/, int /*h*/,
 {
 }
 
-void KisCanvasWidgetPainter::drawPie(const QRect& /*r*/, int /*a*/, int /*alen*/)
+void KisCanvasWidgetPainter::drawPie(const TQRect& /*r*/, int /*a*/, int /*alen*/)
 {
 }
 
@@ -393,79 +393,79 @@ void KisCanvasWidgetPainter::drawChord(int /*x*/, int /*y*/, int /*w*/, int /*h*
 {
 }
 
-void KisCanvasWidgetPainter::drawChord(const QRect& /*r*/, int /*a*/, int /*alen*/)
+void KisCanvasWidgetPainter::drawChord(const TQRect& /*r*/, int /*a*/, int /*alen*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawLineSegments(const QPointArray& /*pointArray*/, int /*index*/, int /*nlines*/)
+void KisCanvasWidgetPainter::drawLineSegments(const TQPointArray& /*pointArray*/, int /*index*/, int /*nlines*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPolyline(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
+void KisCanvasWidgetPainter::drawPolyline(const TQPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPolygon(const QPointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/)
+void KisCanvasWidgetPainter::drawPolygon(const TQPointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawConvexPolygon(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
+void KisCanvasWidgetPainter::drawConvexPolygon(const TQPointArray& /*pointArray*/, int /*index*/, int /*npoints*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawCubicBezier(const QPointArray& /*pointArray*/, int /*index*/)
+void KisCanvasWidgetPainter::drawCubicBezier(const TQPointArray& /*pointArray*/, int /*index*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPixmap(int /*x*/, int /*y*/, const QPixmap& /*pixmap*/, int /*sx*/, int /*sy*/, int /*sw*/, int /*sh*/)
+void KisCanvasWidgetPainter::drawPixmap(int /*x*/, int /*y*/, const TQPixmap& /*pixmap*/, int /*sx*/, int /*sy*/, int /*sw*/, int /*sh*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPixmap(const QPoint& /*point*/, const QPixmap& /*pixmap*/, const QRect& /*sr*/)
+void KisCanvasWidgetPainter::drawPixmap(const TQPoint& /*point*/, const TQPixmap& /*pixmap*/, const TQRect& /*sr*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPixmap(const QPoint& /*point*/, const QPixmap& /*pixmap*/)
+void KisCanvasWidgetPainter::drawPixmap(const TQPoint& /*point*/, const TQPixmap& /*pixmap*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawPixmap(const QRect& /*r*/, const QPixmap& /*pixmap*/)
+void KisCanvasWidgetPainter::drawPixmap(const TQRect& /*r*/, const TQPixmap& /*pixmap*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawImage(int /*x*/, int /*y*/, const QImage& /*image*/, int /*sx*/, int /*sy*/, int /*sw*/, int /*sh*/, int /*conversionFlags*/)
+void KisCanvasWidgetPainter::drawImage(int /*x*/, int /*y*/, const TQImage& /*image*/, int /*sx*/, int /*sy*/, int /*sw*/, int /*sh*/, int /*conversionFlags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawImage(const QPoint& /*point*/, const QImage& /*image*/, const QRect& /*sr*/, int /*conversionFlags*/)
+void KisCanvasWidgetPainter::drawImage(const TQPoint& /*point*/, const TQImage& /*image*/, const TQRect& /*sr*/, int /*conversionFlags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawImage(const QPoint& /*point*/, const QImage& /*image*/, int /*conversion_flags*/)
+void KisCanvasWidgetPainter::drawImage(const TQPoint& /*point*/, const TQImage& /*image*/, int /*conversion_flags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawImage(const QRect& /*r*/, const QImage& /*image*/)
+void KisCanvasWidgetPainter::drawImage(const TQRect& /*r*/, const TQImage& /*image*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTiledPixmap(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const QPixmap& /*pixmap*/, int /*sx*/, int /*sy*/)
+void KisCanvasWidgetPainter::drawTiledPixmap(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const TQPixmap& /*pixmap*/, int /*sx*/, int /*sy*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTiledPixmap(const QRect& /*r*/, const QPixmap& /*pixmap*/, const QPoint& /*point*/)
+void KisCanvasWidgetPainter::drawTiledPixmap(const TQRect& /*r*/, const TQPixmap& /*pixmap*/, const TQPoint& /*point*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTiledPixmap(const QRect& /*r*/, const QPixmap& /*pixmap*/)
+void KisCanvasWidgetPainter::drawTiledPixmap(const TQRect& /*r*/, const TQPixmap& /*pixmap*/)
 {
 }
 
-void KisCanvasWidgetPainter::fillRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const QBrush& /*brush*/)
+void KisCanvasWidgetPainter::fillRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const TQBrush& /*brush*/)
 {
 }
 
-void KisCanvasWidgetPainter::fillRect(const QRect& /*r*/, const QBrush& /*brush*/)
+void KisCanvasWidgetPainter::fillRect(const TQRect& /*r*/, const TQBrush& /*brush*/)
 {
 }
 
@@ -473,50 +473,50 @@ void KisCanvasWidgetPainter::eraseRect(int /*x*/, int /*y*/, int /*w*/, int /*h*
 {
 }
 
-void KisCanvasWidgetPainter::eraseRect(const QRect& /*r*/)
+void KisCanvasWidgetPainter::eraseRect(const TQRect& /*r*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, const QString& /*text*/, int /*len*/, QPainter::TextDirection /*dir*/)
+void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, const TQString& /*text*/, int /*len*/, TQPainter::TextDirection /*dir*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(const QPoint& /*point*/, const QString& /*text*/, int /*len*/, QPainter::TextDirection /*dir*/)
+void KisCanvasWidgetPainter::drawText(const TQPoint& /*point*/, const TQString& /*text*/, int /*len*/, TQPainter::TextDirection /*dir*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, const QString& /*text*/, int /*pos*/, int /*len*/, QPainter::TextDirection /*dir*/)
+void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, const TQString& /*text*/, int /*pos*/, int /*len*/, TQPainter::TextDirection /*dir*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(const QPoint& /*point*/, const QString& /*text*/, int /*pos*/, int /*len*/, QPainter::TextDirection /*dir*/)
+void KisCanvasWidgetPainter::drawText(const TQPoint& /*point*/, const TQString& /*text*/, int /*pos*/, int /*len*/, TQPainter::TextDirection /*dir*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, int /*w*/, int /*h*/, int /*flags*/, const QString& /*text*/, int /*len*/, QRect */*br*/, QTextParag **/*intern*/)
+void KisCanvasWidgetPainter::drawText(int /*x*/, int /*y*/, int /*w*/, int /*h*/, int /*flags*/, const TQString& /*text*/, int /*len*/, TQRect */*br*/, TQTextParag **/*intern*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawText(const QRect& /*r*/, int /*flags*/, const QString& /*text*/, int /*len*/, QRect */*br*/, QTextParag **/*intern*/)
+void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const TQString& /*text*/, int /*len*/, TQRect */*br*/, TQTextParag **/*intern*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const QTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(const QPoint& /*p*/, const QTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-QRect KisCanvasWidgetPainter::boundingRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, int /*flags*/, const QString& /*text*/, int /*len*/, QTextParag **/*intern*/)
+TQRect KisCanvasWidgetPainter::boundingRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/, int /*flags*/, const TQString& /*text*/, int /*len*/, TQTextParag **/*intern*/)
 {
-    return QRect();
+    return TQRect();
 }
 
-QRect KisCanvasWidgetPainter::boundingRect(const QRect& /*r*/, int /*flags*/, const QString& /*text*/, int /*len*/, QTextParag **/*intern*/)
+TQRect KisCanvasWidgetPainter::boundingRect(const TQRect& /*r*/, int /*flags*/, const TQString& /*text*/, int /*len*/, TQTextParag **/*intern*/)
 {
-    return QRect();
+    return TQRect();
 }
 
 int	KisCanvasWidgetPainter::tabStops() const
@@ -549,9 +549,9 @@ KisCanvasPainter::KisCanvasPainter(KisCanvas *canvas)
     m_canvasWidgetPainter = canvas->createPainter();
 }
 
-KisCanvasPainter::KisCanvasPainter(const QPaintDevice *paintDevice)
+KisCanvasPainter::KisCanvasPainter(const TQPaintDevice *paintDevice)
 {
-    m_canvasWidgetPainter = new KisQPaintDeviceCanvasPainter(paintDevice);
+    m_canvasWidgetPainter = new KisTQPaintDeviceCanvasPainter(paintDevice);
 }
 
 KisCanvasPainter::~KisCanvasPainter()
@@ -566,11 +566,11 @@ bool KisCanvasPainter::begin(KisCanvas *canvas, bool unclipped)
     return m_canvasWidgetPainter->begin(canvas->canvasWidget(), unclipped);
 }
 
-bool KisCanvasPainter::begin(const QPaintDevice *paintDevice, bool unclipped)
+bool KisCanvasPainter::begin(const TQPaintDevice *paintDevice, bool unclipped)
 {
     delete m_canvasWidgetPainter;
-    m_canvasWidgetPainter = new KisQPaintDeviceCanvasPainter();
-    return static_cast<KisQPaintDeviceCanvasPainter *>(m_canvasWidgetPainter)->begin(paintDevice, unclipped);
+    m_canvasWidgetPainter = new KisTQPaintDeviceCanvasPainter();
+    return static_cast<KisTQPaintDeviceCanvasPainter *>(m_canvasWidgetPainter)->begin(paintDevice, unclipped);
 }
 
 bool KisCanvasPainter::end()
@@ -595,23 +595,23 @@ void KisCanvasPainter::restore()
     }
 }
 
-QFontMetrics KisCanvasPainter::fontMetrics() const
+TQFontMetrics KisCanvasPainter::fontMetrics() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->fontMetrics();
     }
-    return QFontMetrics(QFont());
+    return TQFontMetrics(TQFont());
 }
 
-QFontInfo KisCanvasPainter::fontInfo() const
+TQFontInfo KisCanvasPainter::fontInfo() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->fontInfo();
     }
-    return QFontInfo(QFont());
+    return TQFontInfo(TQFont());
 }
 
-const QFont& KisCanvasPainter::font() const
+const TQFont& KisCanvasPainter::font() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->font();
@@ -619,14 +619,14 @@ const QFont& KisCanvasPainter::font() const
     return m_defaultFont;
 }
 
-void KisCanvasPainter::setFont(const QFont& font)
+void KisCanvasPainter::setFont(const TQFont& font)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setFont(font);
     }
 }
 
-const QPen& KisCanvasPainter::pen() const
+const TQPen& KisCanvasPainter::pen() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->pen();
@@ -634,7 +634,7 @@ const QPen& KisCanvasPainter::pen() const
     return m_defaultPen;
 }
 
-void KisCanvasPainter::setPen(const QPen& pen)
+void KisCanvasPainter::setPen(const TQPen& pen)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setPen(pen);
@@ -648,14 +648,14 @@ void KisCanvasPainter::setPen(Qt::PenStyle penStyle)
     }
 }
 
-void KisCanvasPainter::setPen(const QColor& color)
+void KisCanvasPainter::setPen(const TQColor& color)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setPen(color);;
     }
 }
 
-const QBrush& KisCanvasPainter::brush() const
+const TQBrush& KisCanvasPainter::brush() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->brush();
@@ -663,36 +663,36 @@ const QBrush& KisCanvasPainter::brush() const
     return m_defaultBrush;
 }
 
-void KisCanvasPainter::setBrush(const QBrush& brush)
+void KisCanvasPainter::setBrush(const TQBrush& brush)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setBrush(brush);
     }
 }
 
-void KisCanvasPainter::setBrush(Qt::BrushStyle brushStyle)
+void KisCanvasPainter::setBrush(TQt::BrushStyle brushStyle)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setBrush(brushStyle);
     }
 }
 
-void KisCanvasPainter::setBrush(const QColor& color)
+void KisCanvasPainter::setBrush(const TQColor& color)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setBrush(color);
     }
 }
 
-QPoint KisCanvasPainter::pos() const
+TQPoint KisCanvasPainter::pos() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->pos();
     }
-    return QPoint();
+    return TQPoint();
 }
 
-const QColor& KisCanvasPainter::backgroundColor() const
+const TQColor& KisCanvasPainter::backgroundColor() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->backgroundColor();
@@ -700,7 +700,7 @@ const QColor& KisCanvasPainter::backgroundColor() const
     return m_defaultColor;
 }
 
-void KisCanvasPainter::setBackgroundColor(const QColor& color)
+void KisCanvasPainter::setBackgroundColor(const TQColor& color)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setBackgroundColor(color);
@@ -712,7 +712,7 @@ Qt::BGMode KisCanvasPainter::backgroundMode() const
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->backgroundMode();
     }
-    return Qt::TransparentMode;
+    return TQt::TransparentMode;
 }
 
 void KisCanvasPainter::setBackgroundMode(Qt::BGMode bgMode)
@@ -722,22 +722,22 @@ void KisCanvasPainter::setBackgroundMode(Qt::BGMode bgMode)
     }
 }
 
-Qt::RasterOp KisCanvasPainter::rasterOp() const
+TQt::RasterOp KisCanvasPainter::rasterOp() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->rasterOp();
     }
-    return Qt::CopyROP;
+    return TQt::CopyROP;
 }
 
-void KisCanvasPainter::setRasterOp(Qt::RasterOp rasterOp)
+void KisCanvasPainter::setRasterOp(TQt::RasterOp rasterOp)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setRasterOp(rasterOp);
     }
 }
 
-const QPoint& KisCanvasPainter::brushOrigin() const
+const TQPoint& KisCanvasPainter::brushOrigin() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->brushOrigin();
@@ -752,7 +752,7 @@ void KisCanvasPainter::setBrushOrigin(int x, int y)
     }
 }
 
-void KisCanvasPainter::setBrushOrigin(const QPoint& origin)
+void KisCanvasPainter::setBrushOrigin(const TQPoint& origin)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setBrushOrigin(origin);
@@ -782,15 +782,15 @@ void KisCanvasPainter::setViewXForm(bool enable)
     }
 }
 
-QRect KisCanvasPainter::window() const
+TQRect KisCanvasPainter::window() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->window();
     }
-    return QRect();
+    return TQRect();
 }
 
-void KisCanvasPainter::setWindow(const QRect& r)
+void KisCanvasPainter::setWindow(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setWindow(r);
@@ -804,15 +804,15 @@ void KisCanvasPainter::setWindow(int x, int y, int w, int h)
     }
 }
 
-QRect KisCanvasPainter::viewport() const
+TQRect KisCanvasPainter::viewport() const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->viewport();
     }
-    return QRect();
+    return TQRect();
 }
 
-void KisCanvasPainter::setViewport(const QRect& r)
+void KisCanvasPainter::setViewport(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setViewport(r);
@@ -833,15 +833,15 @@ void KisCanvasPainter::setWorldXForm(bool enable)
     }
 }
 
-const QWMatrix& KisCanvasPainter::worldMatrix() const
+const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
 {
     if (m_canvasWidgetPainter != 0) {
-        return m_canvasWidgetPainter->worldMatrix();
+        return m_canvasWidgetPainter->tqworldMatrix();
     }
     return m_defaultWorldMatrix;
 }
 
-void KisCanvasPainter::setWorldMatrix(const QWMatrix& matrix, bool combine)
+void KisCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setWorldMatrix(matrix, combine);
@@ -913,7 +913,7 @@ double KisCanvasPainter::translationY() const
     return 0;
 }
 
-QPoint KisCanvasPainter::xForm(const QPoint& point) const
+TQPoint KisCanvasPainter::xForm(const TQPoint& point) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xForm(point);
@@ -921,7 +921,7 @@ QPoint KisCanvasPainter::xForm(const QPoint& point) const
     return point;
 }
 
-QRect KisCanvasPainter::xForm(const QRect& r) const
+TQRect KisCanvasPainter::xForm(const TQRect& r) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xForm(r);
@@ -929,7 +929,7 @@ QRect KisCanvasPainter::xForm(const QRect& r) const
     return r;
 }
 
-QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray) const
+TQPointArray KisCanvasPainter::xForm(const TQPointArray& pointArray) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xForm(pointArray);
@@ -937,7 +937,7 @@ QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray) const
     return pointArray;
 }
 
-QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray, int index, int npoints) const
+TQPointArray KisCanvasPainter::xForm(const TQPointArray& pointArray, int index, int npoints) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xForm(pointArray, index, npoints);
@@ -945,7 +945,7 @@ QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray, int index, in
     return pointArray;
 }
 
-QPoint KisCanvasPainter::xFormDev(const QPoint& point) const
+TQPoint KisCanvasPainter::xFormDev(const TQPoint& point) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xFormDev(point);
@@ -953,7 +953,7 @@ QPoint KisCanvasPainter::xFormDev(const QPoint& point) const
     return point;
 }
 
-QRect KisCanvasPainter::xFormDev(const QRect& r) const
+TQRect KisCanvasPainter::xFormDev(const TQRect& r) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xFormDev(r);
@@ -961,7 +961,7 @@ QRect KisCanvasPainter::xFormDev(const QRect& r) const
     return r;
 }
 
-QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray) const
+TQPointArray KisCanvasPainter::xFormDev(const TQPointArray& pointArray) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xFormDev(pointArray);
@@ -969,7 +969,7 @@ QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray) const
     return pointArray;
 }
 
-QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray, int index, int npoints) const
+TQPointArray KisCanvasPainter::xFormDev(const TQPointArray& pointArray, int index, int npoints) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->xFormDev(pointArray, index, npoints);
@@ -992,29 +992,29 @@ bool KisCanvasPainter::hasClipping() const
     return true;
 }
 
-QRegion KisCanvasPainter::clipRegion(QPainter::CoordinateMode mode) const
+TQRegion KisCanvasPainter::clipRegion(TQPainter::CoordinateMode mode) const
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->clipRegion(mode);
     }
-    return QRegion();
+    return TQRegion();
 }
 
-void KisCanvasPainter::setClipRect(const QRect& r, QPainter::CoordinateMode mode)
+void KisCanvasPainter::setClipRect(const TQRect& r, TQPainter::CoordinateMode mode)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setClipRect(r, mode);
     }
 }
 
-void KisCanvasPainter::setClipRect(int x, int y, int w, int h, QPainter::CoordinateMode mode)
+void KisCanvasPainter::setClipRect(int x, int y, int w, int h, TQPainter::CoordinateMode mode)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setClipRect(x, y, w, h, mode);
     }
 }
 
-void KisCanvasPainter::setClipRegion(const QRegion& rgn, QPainter::CoordinateMode mode)
+void KisCanvasPainter::setClipRegion(const TQRegion& rgn, TQPainter::CoordinateMode mode)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->setClipRegion(rgn, mode);
@@ -1028,14 +1028,14 @@ void KisCanvasPainter::drawPoint(int x, int y)
     }
 }
 
-void KisCanvasPainter::drawPoint(const QPoint& point)
+void KisCanvasPainter::drawPoint(const TQPoint& point)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPoint(point);
     }
 }
 
-void KisCanvasPainter::drawPoints(const QPointArray& pointArray, int index, int npoints)
+void KisCanvasPainter::drawPoints(const TQPointArray& pointArray, int index, int npoints)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPoints(pointArray, index, npoints);
@@ -1049,7 +1049,7 @@ void KisCanvasPainter::moveTo(int x, int y)
     }
 }
 
-void KisCanvasPainter::moveTo(const QPoint& point)
+void KisCanvasPainter::moveTo(const TQPoint& point)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->moveTo(point);
@@ -1063,7 +1063,7 @@ void KisCanvasPainter::lineTo(int x, int y)
     }
 }
 
-void KisCanvasPainter::lineTo(const QPoint& point)
+void KisCanvasPainter::lineTo(const TQPoint& point)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->lineTo(point);
@@ -1077,7 +1077,7 @@ void KisCanvasPainter::drawLine(int x1, int y1, int x2, int y2)
     }
 }
 
-void KisCanvasPainter::drawLine(const QPoint& start, const QPoint& end)
+void KisCanvasPainter::drawLine(const TQPoint& start, const TQPoint& end)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawLine(start, end);
@@ -1091,7 +1091,7 @@ void KisCanvasPainter::drawRect(int x, int y, int w, int h)
     }
 }
 
-void KisCanvasPainter::drawRect(const QRect& r)
+void KisCanvasPainter::drawRect(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawRect(r);
@@ -1105,21 +1105,21 @@ void KisCanvasPainter::drawWinFocusRect(int x, int y, int w, int h)
     }
 }
 
-void KisCanvasPainter::drawWinFocusRect(int x, int y, int w, int h, const QColor& bgColor)
+void KisCanvasPainter::drawWinFocusRect(int x, int y, int w, int h, const TQColor& bgColor)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawWinFocusRect(x, y, w, h, bgColor);
     }
 }
 
-void KisCanvasPainter::drawWinFocusRect(const QRect& r)
+void KisCanvasPainter::drawWinFocusRect(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawWinFocusRect(r);
     }
 }
 
-void KisCanvasPainter::drawWinFocusRect(const QRect& r, const QColor& bgColor)
+void KisCanvasPainter::drawWinFocusRect(const TQRect& r, const TQColor& bgColor)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawWinFocusRect(r, bgColor);
@@ -1133,7 +1133,7 @@ void KisCanvasPainter::drawRoundRect(int x, int y, int w, int h, int xRnd, int y
     }
 }
 
-void KisCanvasPainter::drawRoundRect(const QRect& r, int xRnd, int yRnd)
+void KisCanvasPainter::drawRoundRect(const TQRect& r, int xRnd, int yRnd)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawRoundRect(r, xRnd, yRnd);
@@ -1147,7 +1147,7 @@ void KisCanvasPainter::drawEllipse(int x, int y, int w, int h)
     }
 }
 
-void KisCanvasPainter::drawEllipse(const QRect& r)
+void KisCanvasPainter::drawEllipse(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawEllipse(r);
@@ -1161,7 +1161,7 @@ void KisCanvasPainter::drawArc(int x, int y, int w, int h, int a, int alen)
     }
 }
 
-void KisCanvasPainter::drawArc(const QRect& r, int a, int alen)
+void KisCanvasPainter::drawArc(const TQRect& r, int a, int alen)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawArc(r, a, alen);
@@ -1175,7 +1175,7 @@ void KisCanvasPainter::drawPie(int x, int y, int w, int h, int a, int alen)
     }
 }
 
-void KisCanvasPainter::drawPie(const QRect& r, int a, int alen)
+void KisCanvasPainter::drawPie(const TQRect& r, int a, int alen)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPie(r, a, alen);
@@ -1189,133 +1189,133 @@ void KisCanvasPainter::drawChord(int x, int y, int w, int h, int a, int alen)
     }
 }
 
-void KisCanvasPainter::drawChord(const QRect& r, int a, int alen)
+void KisCanvasPainter::drawChord(const TQRect& r, int a, int alen)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawChord(r, a, alen);
     }
 }
 
-void KisCanvasPainter::drawLineSegments(const QPointArray& pointArray, int index, int nlines)
+void KisCanvasPainter::drawLineSegments(const TQPointArray& pointArray, int index, int nlines)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawLineSegments(pointArray, index, nlines);
     }
 }
 
-void KisCanvasPainter::drawPolyline(const QPointArray& pointArray, int index, int npoints)
+void KisCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPolyline(pointArray, index, npoints);
     }
 }
 
-void KisCanvasPainter::drawPolygon(const QPointArray& pointArray, bool winding, int index, int npoints)
+void KisCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPolygon(pointArray, winding, index, npoints);
     }
 }
 
-void KisCanvasPainter::drawConvexPolygon(const QPointArray& pointArray, int index, int npoints)
+void KisCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawConvexPolygon(pointArray, index, npoints);
     }
 }
 
-void KisCanvasPainter::drawCubicBezier(const QPointArray& pointArray, int index)
+void KisCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawCubicBezier(pointArray, index);
     }
 }
 
-void KisCanvasPainter::drawPixmap(int x, int y, const QPixmap& pixmap, int sx, int sy, int sw, int sh)
+void KisCanvasPainter::drawPixmap(int x, int y, const TQPixmap& pixmap, int sx, int sy, int sw, int sh)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPixmap(x, y, pixmap, sx, sy, sw, sh);
     }
 }
 
-void KisCanvasPainter::drawPixmap(const QPoint& point, const QPixmap& pixmap, const QRect& sr)
+void KisCanvasPainter::drawPixmap(const TQPoint& point, const TQPixmap& pixmap, const TQRect& sr)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPixmap(point, pixmap, sr);
     }
 }
 
-void KisCanvasPainter::drawPixmap(const QPoint& point, const QPixmap& pixmap)
+void KisCanvasPainter::drawPixmap(const TQPoint& point, const TQPixmap& pixmap)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPixmap(point, pixmap);
     }
 }
 
-void KisCanvasPainter::drawPixmap(const QRect& r, const QPixmap& pixmap)
+void KisCanvasPainter::drawPixmap(const TQRect& r, const TQPixmap& pixmap)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawPixmap(r, pixmap);
     }
 }
 
-void KisCanvasPainter::drawImage(int x, int y, const QImage& image, int sx, int sy, int sw, int sh, int conversionFlags)
+void KisCanvasPainter::drawImage(int x, int y, const TQImage& image, int sx, int sy, int sw, int sh, int conversionFlags)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawImage(x, y, image, sx, sy, sw, sh, conversionFlags);
     }
 }
 
-void KisCanvasPainter::drawImage(const QPoint& point, const QImage& image, const QRect& sr, int conversionFlags)
+void KisCanvasPainter::drawImage(const TQPoint& point, const TQImage& image, const TQRect& sr, int conversionFlags)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawImage(point, image, sr, conversionFlags);
     }
 }
 
-void KisCanvasPainter::drawImage(const QPoint& point, const QImage& image, int conversion_flags)
+void KisCanvasPainter::drawImage(const TQPoint& point, const TQImage& image, int conversion_flags)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawImage(point, image, conversion_flags);
     }
 }
 
-void KisCanvasPainter::drawImage(const QRect& r, const QImage& image)
+void KisCanvasPainter::drawImage(const TQRect& r, const TQImage& image)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawImage(r, image);
     }
 }
 
-void KisCanvasPainter::drawTiledPixmap(int x, int y, int w, int h, const QPixmap& pixmap, int sx, int sy)
+void KisCanvasPainter::drawTiledPixmap(int x, int y, int w, int h, const TQPixmap& pixmap, int sx, int sy)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawTiledPixmap(x, y, w, h, pixmap, sx, sy);
     }
 }
 
-void KisCanvasPainter::drawTiledPixmap(const QRect& r, const QPixmap& pixmap, const QPoint& point)
+void KisCanvasPainter::drawTiledPixmap(const TQRect& r, const TQPixmap& pixmap, const TQPoint& point)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawTiledPixmap(r, pixmap, point);
     }
 }
 
-void KisCanvasPainter::drawTiledPixmap(const QRect& r, const QPixmap& pixmap)
+void KisCanvasPainter::drawTiledPixmap(const TQRect& r, const TQPixmap& pixmap)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawTiledPixmap(r, pixmap);
     }
 }
 
-void KisCanvasPainter::fillRect(int x, int y, int w, int h, const QBrush& brush)
+void KisCanvasPainter::fillRect(int x, int y, int w, int h, const TQBrush& brush)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->fillRect(x, y, w, h, brush);
     }
 }
 
-void KisCanvasPainter::fillRect(const QRect& r, const QBrush& brush)
+void KisCanvasPainter::fillRect(const TQRect& r, const TQBrush& brush)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->fillRect(r, brush);
@@ -1329,83 +1329,83 @@ void KisCanvasPainter::eraseRect(int x, int y, int w, int h)
     }
 }
 
-void KisCanvasPainter::eraseRect(const QRect& r)
+void KisCanvasPainter::eraseRect(const TQRect& r)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->eraseRect(r);
     }
 }
 
-void KisCanvasPainter::drawText(int x, int y, const QString& text, int len, QPainter::TextDirection dir)
+void KisCanvasPainter::drawText(int x, int y, const TQString& text, int len, TQPainter::TextDirection dir)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(x, y, text, len, dir);
     }
 }
 
-void KisCanvasPainter::drawText(const QPoint& point, const QString& text, int len, QPainter::TextDirection dir)
+void KisCanvasPainter::drawText(const TQPoint& point, const TQString& text, int len, TQPainter::TextDirection dir)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(point, text, len, dir);
     }
 }
 
-void KisCanvasPainter::drawText(int x, int y, const QString& text, int pos, int len, QPainter::TextDirection dir)
+void KisCanvasPainter::drawText(int x, int y, const TQString& text, int pos, int len, TQPainter::TextDirection dir)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(x, y, text, pos, len, dir);
     }
 }
 
-void KisCanvasPainter::drawText(const QPoint& point, const QString& text, int pos, int len, QPainter::TextDirection dir)
+void KisCanvasPainter::drawText(const TQPoint& point, const TQString& text, int pos, int len, TQPainter::TextDirection dir)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(point, text, pos, len, dir);
     }
 }
 
-void KisCanvasPainter::drawText(int x, int y, int w, int h, int flags, const QString& text, int len, QRect *br, QTextParag **intern)
+void KisCanvasPainter::drawText(int x, int y, int w, int h, int flags, const TQString& text, int len, TQRect *br, TQTextParag **intern)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(x, y, w, h, flags, text, len, br, intern);
     }
 }
 
-void KisCanvasPainter::drawText(const QRect& r, int flags, const QString& text, int len, QRect *br, QTextParag **intern)
+void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text, int len, TQRect *br, TQTextParag **intern)
 {
     if (m_canvasWidgetPainter != 0) {
         m_canvasWidgetPainter->drawText(r, flags, text, len, br, intern);
     }
 }
 
-void KisCanvasPainter::drawTextItem(int x, int y, const QTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags);
     }
 }
 
-void KisCanvasPainter::drawTextItem(const QPoint& p, const QTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(p, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags);
     }
 }
 
-QRect KisCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const QString& text, int len, QTextParag **intern)
+TQRect KisCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->boundingRect(x, y, w, h, flags, text, len, intern);
     }
-    return QRect();
+    return TQRect();
 }
 
-QRect KisCanvasPainter::boundingRect(const QRect& r, int flags, const QString& text, int len, QTextParag **intern)
+TQRect KisCanvasPainter::boundingRect(const TQRect& r, int flags, const TQString& text, int len, TQTextParag **intern)
 {
     if (m_canvasWidgetPainter != 0) {
         return m_canvasWidgetPainter->boundingRect(r, flags, text, len, intern);
     }
-    return QRect();
+    return TQRect();
 }
 
 int	KisCanvasPainter::tabStops() const