Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

89 files changed, 388 insertions, 388 deletions

diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc
index 09955e9e..cfe6905d 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cc
@@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name)
     , m_image(TQPixmap())
 {
     m_label = new TQLabel( viewport());
-    setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     setCursor(KisCursor::handCursor());
     addChild(m_label);
 }
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 1d7932cb..c7f9e0ad 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -73,21 +73,21 @@ void KCurve::reset(void)
 {
     m_grab_point   = NULL;    
     m_guideVisible = false;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setCurveGuide(TQColor color)
 {
     m_guideVisible = true;
     m_colorGuide   = color;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setPixmap(TQPixmap pix)
 {
     if (m_pix) delete m_pix;
     m_pix = new TQPixmap(pix);
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::keyPressEvent(TQKeyEvent *e)
@@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e)
             m_points.remove(m_grab_point);
         }
         m_grab_point = closest_point;
-        repaint(false);
+        tqrepaint(false);
     }
     else
         TQWidget::keyPressEvent(e);
@@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *)
     
     TQPixmap pm(size());
     TQPainter p1;
-    p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+    p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
     
     //  draw background
     if(m_pix)
@@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e )
         }
         p = m_points.next();
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
@@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
     
     setCursor( KCursor::arrowCursor() );    
     m_dragging = false;
-    repaint(false);
+    tqrepaint(false);
     emit modified();
 }
 
@@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
     double x = e->pos().x() / (float)width();
     double y = 1.0 - e->pos().y() / (float)height();
     
-    if (m_dragging == false)   // If no point is selected set the the cursor shape if on top
+    if (m_dragging == false)   // If no point is selected set the the cursor tqshape if on top
     {
         double distance = 1000;
         double ydistance = 1000;
@@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
         emit modified();
     }
         
-    repaint(false);
+    tqrepaint(false);
 }
 
 double KCurve::getCurveValue(double x)
diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc
index bd5b80fb..318bf305 100644
--- a/chalk/ui/kis_autogradient.cc
+++ b/chalk/ui/kis_autogradient.cc
@@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color)
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( color, segment->endColor().alpha() ) );
-    gradientSlider->repaint();
+    gradientSlider->tqrepaint();
 
     paramChanged();
 }
@@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }
@@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index b1f9d724..0bc9ae08 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "layout.h"
+#include "tqlayout.h"
 #include "tqlabel.h"
 #include "tqpixmap.h"
 #include "tqpainter.h"
@@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
     hl->addWidget(m_exposureLabel);
 
     m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this);
-    m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     hl->addWidget(m_exposureDoubleWidget);
     TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images"));
     l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding));
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index d567b76a..20de3c5b 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 #include <koIconChooser.h>
@@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
 
     m_lbName = new TQLabel(this);
 
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
 
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
@@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item)
     if (kisItem) {
         KisBrush *brush = static_cast<KisBrush *>(kisItem->resource());
 
-        TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height());
+        TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height());
 
         m_lbName->setText(text);
         m_slSpacing->setValue(brush->spacing());
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc
index d38c7ea1..16872418 100644
--- a/chalk/ui/kis_canvas.cc
+++ b/chalk/ui/kis_canvas.cc
@@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height)
     dynamic_cast<TQWidget *>(m_canvasWidget)->update(x, y, width, height);
 }
 
-void KisCanvas::repaint()
+void KisCanvas::tqrepaint()
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint();
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint();
 }
 
-void KisCanvas::repaint(bool erase)
+void KisCanvas::tqrepaint(bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase);
 }
 
-void KisCanvas::repaint(int x, int y, int width, int height, bool erase)
+void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase);
 }
 
-void KisCanvas::repaint(const TQRect& r, bool erase)
+void KisCanvas::tqrepaint(const TQRect& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
-void KisCanvas::repaint(const TQRegion& r, bool erase)
+void KisCanvas::tqrepaint(const TQRegion& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
 bool KisCanvas::isUpdatesEnabled() const
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index 5f717468..4d92a4ce 100644
--- a/chalk/ui/kis_canvas.h
+++ b/chalk/ui/kis_canvas.h
@@ -313,11 +313,11 @@ public:
     void update();
     void update(const TQRect& r);
     void update(int x, int y, int width, int height);
-    void repaint();
-    void repaint(bool erase);
-    void repaint(int x, int y, int width, int height, bool erase = true);
-    void repaint(const TQRect& r, bool erase = true);
-    void repaint(const TQRegion& r, bool erase = true);
+    void tqrepaint();
+    void tqrepaint(bool erase);
+    void tqrepaint(int x, int y, int width, int height, bool erase = true);
+    void tqrepaint(const TQRect& r, bool erase = true);
+    void tqrepaint(const TQRegion& r, bool erase = true);
 
     void updateGeometry();
 
diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc
index 9b3666e8..ed5be01d 100644
--- a/chalk/ui/kis_canvas_painter.cc
+++ b/chalk/ui/kis_canvas_painter.cc
@@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const
+const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
@@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable)
     }
 }
 
-const TQWMatrix& KisCanvasPainter::worldMatrix() const
+const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
 {
     if (m_canvasWidgetPainter != 0) {
-        return m_canvasWidgetPainter->worldMatrix();
+        return m_canvasWidgetPainter->tqworldMatrix();
     }
     return m_defaultWorldMatrix;
 }
@@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text
     }
 }
 
-void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& 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 TQPoint& p, const TQTextItem& 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);
     }
 }
 
diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h
index a5ad2d84..9a719eea 100644
--- a/chalk/ui/kis_canvas_painter.h
+++ b/chalk/ui/kis_canvas_painter.h
@@ -78,7 +78,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -168,8 +168,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
@@ -241,7 +241,7 @@ public:
     void setViewport(int x, int y, int w, int h);
 
     void setWorldXForm(bool);
-    const TQWMatrix&worldMatrix() const;
+    const TQWMatrix&tqworldMatrix() const;
     void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     void saveWorldMatrix();
@@ -331,8 +331,8 @@ public:
     void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc
index 7eb3607a..d52f5ec9 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqobject.h>
 #include <tqimage.h>
 #include <tqmessagebox.h>
@@ -52,7 +52,7 @@ KisClipboard::KisClipboard()
     clipboardDataChanged();
 
     // Make sure we are notified when clipboard changes
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
          this, TQT_SLOT( clipboardDataChanged() ) );
 }
 
@@ -132,20 +132,20 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
     multiDrag->addDragObject( storeDrag );
 
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     cb->setData(multiDrag);
     m_pushedClipboard = true;
 }
 
 KisPaintDeviceSP KisClipboard::clip()
 {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
     if(cbData && cbData->provides(mimeType))
     {
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
@@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged()
 {
     if (!m_pushedClipboard) {
         m_hasClip = false;
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         TQImage qimg = cb->image();
         TQMimeSource *cbData = cb->data();
         TQCString mimeType("application/x-chalk-selection");
@@ -235,7 +235,7 @@ bool KisClipboard::hasClip()
 TQSize KisClipboard::clipSize()
 {
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
@@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize()
     
     if(cbData && cbData->provides(mimeType)) {
         
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index 2a2c4b8d..4d2103d8 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -81,7 +81,7 @@ void KisColorCup::slotClicked()
     emit changed(m_color);
 }
 
-TQSize KisColorCup::sizeHint() const
+TQSize KisColorCup::tqsizeHint() const
 {
     return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
             expandedTo(TQApplication::globalStrut());
@@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
     TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
     r.rect(&x, &y, &w, &h);
 
-    int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
+    int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
     x += margin;
     y += margin;
     w -= 2*margin;
     h -= 2*margin;
 
     if (isOn() || isDown()) {
-        x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-        y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+        x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+        y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
     }
 
-    qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
+    qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
     if ( m_color.isValid() )
         painter->fillRect( x+1, y+1, w-2, h-2, m_color );
 
     if ( hasFocus() ) {
         TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
     }
 
 }
diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h
index 8c7fd2b5..2cf9ddef 100644
--- a/chalk/ui/kis_color_cup.h
+++ b/chalk/ui/kis_color_cup.h
@@ -72,7 +72,7 @@ signals:
 
 public:
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
 
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 21debef1..fab8c4bb 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqframe.h>
 #include <tqwidget.h>
@@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view)
 
     m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup");
 
-    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout");
+    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout");
 
     TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab");
     m_brushesTab->setTabShape(TQTabWidget::Triangular);
@@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view)
 {
     m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout");
 
     TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab");
     m_patternsTab->setTabShape(TQTabWidget::Triangular);
@@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
 {
     m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout");
 
     TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab");
     m_gradientTab->setTabShape(TQTabWidget::Triangular);
diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc
index 41263237..93c82977 100644
--- a/chalk/ui/kis_custom_image_widget.cc
+++ b/chalk/ui/kis_custom_image_widget.cc
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tqpushbutton.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <KoUnitWidgets.h>
 #include <tqlabel.h>
 
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index ac762953..f84bf24d 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() {
 
     if (!m_palette->save()) {
         KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.")
-                                   .arg(m_palette->filename()), i18n("Palette"));
+                                   .tqarg(m_palette->filename()), i18n("Palette"));
         return;
     }
 
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index 5d09bf3b..1cdd309c 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
     }
     setCaption(caption);
     TQWidget * page = new TQWidget(this, "page widget");
-    TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6);
     setMainWidget(page);
 
     m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
     m_preview->slotSetDevice( dev );
 
     connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
-    layout->addWidget(m_preview, 1, 1);
+    tqlayout->addWidget(m_preview, 1, 1);
 
-    TQVBoxLayout *v1 = new TQVBoxLayout( layout );
+    TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout );
     TQHBoxLayout *hl = new TQHBoxLayout( v1 );
 
     TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName");
@@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
 
     m_layerName = new KLineEdit(page, "m_layerName");
     m_layerName->setText(layerName);
-    m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     hl->addWidget(m_layerName, 0, 1);
     connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) );
 
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 83893b0b..13caff98 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -102,10 +102,10 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
 
     m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
                                         m_configWidgetHolder);
-    m_configWidgetHolder->layout()->add(m_labelNoConfigWidget);
+    m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
     m_labelNoConfigWidget->hide();
 
-    resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
+    resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
 
     m_currentConfigWidget = 0;
 
@@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if ( m_currentConfigWidget != 0 )
     {
-        m_configWidgetHolder->layout()->remove(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
 
         delete m_currentConfigWidget;
         m_currentConfigWidget = 0;
@@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if (m_currentConfigWidget != 0)
     {
-        m_configWidgetHolder->layout()->add(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
     } else {
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 2d5e8a90..5c136738 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
     m_page = new WdgApplyProfile(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     // XXX: This is BAD! (bsar)
     fillCmbProfiles(KisID("RGBA", ""));
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index 20fdac28..ca6a1b72 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -19,11 +19,11 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent,
     m_image = image;
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->txtName->setText(image->name());
     m_page->m_createButton->hide();
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc
index 5dc65047..7742969b 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cc
@@ -17,7 +17,7 @@
  */
 #include <limits.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>
 #include <tqstring.h>
@@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
     : super(parent, name, f, name, Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     opacity = int((opacity * 100.0) / 255 + 0.5);
 
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc
index c762a3c5..154dbf2c 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cc
@@ -20,7 +20,7 @@
  */
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
     : super(parent, name, true, "", Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     setCaption(i18n("New Layer"));
 
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index b9313fa9..a19edebe 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )
 
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
+    m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
     grpDockability->setButton(cfg.dockability());
     numDockerFontSize->setValue((int)cfg.dockerFontSize());
 }
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
 {
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
+    m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
     grpDockability->setButton(cfg.getDefaultDockability());
     numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
 }
 
 enumCursorStyle GeneralTab::cursorStyle()
 {
-    return (enumCursorStyle)m_cmbCursorShape->currentItem();
+    return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
 }
 
 enumKoDockability GeneralTab::dockability()
@@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
                                                                           TQWidget *parent, const char *name)
     : super(parent, name, true, "", Ok | Cancel)
 {
-    setCaption(i18n("Configure %1").arg(deviceName));
+    setCaption(i18n("Configure %1").tqarg(deviceName));
 
     m_page = new WdgTabletDeviceSettings(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
         TQString axisString;
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 70141dea..6bae7e78 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc)
 }
 
 bool KisDoc::loadChildren(KoStore* store) {
-    TQPtrListIterator<KoDocumentChild> it(children());
+    TQPtrListIterator<KoDocumentChild> it(tqchildren());
     for( ; it.current(); ++it ) {
         if (!it.current()->loadDocument(store)) {
             return false;
diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc
index 8768e81a..6c03b3e9 100644
--- a/chalk/ui/kis_double_widget.cc
+++ b/chalk/ui/kis_double_widget.cc
@@ -20,7 +20,7 @@
  */
 
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 
 #include <knuminput.h>
@@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max)
     connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
     connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
 
-    m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout");
+    m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout");
 
     m_layout->addWidget(m_slider);
     m_layout->addSpacing(5);
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index a2775bc7..e8bf5ba8 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -18,7 +18,7 @@
  */
 
 #include "tqsignalmapper.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
@@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac)
 
         // Create action
         KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac,
-                                  TQString("chalk_filter_%1").arg((*it) . id()).ascii());
+                                  TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());
 
         // Add action to the right submenu
         KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
@@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i)
         if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "lab16degradation") != KMessageBox::Continue) return;
@@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i)
         else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "rgba8degradation") != KMessageBox::Continue) return;
@@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i)
 
         widgetLayout->addWidget(m_lastWidget, 0 , 0);
 
-        m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize());
+        m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize());
 
         refreshPreview();
 
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 0112ceb0..f2d63cc3 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -154,7 +154,7 @@ void KisFiltersListView::init()
     setCaption(i18n("Filters List"));
     setItemsMovable(false);
     setSelectionMode(TQIconView::Single);
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
     setMinimumWidth(160);
 
 }
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc
index f66bb80a..203f0718 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cc
@@ -17,7 +17,7 @@
  */
 #include <klocale.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kdialogbase.h>
@@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c
     KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient");
     connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show()));
     
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
     
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index a8fdf71e..cda77d68 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
 {
     TQWidget::paintEvent( pe );
     TQPixmap pixmap( width(), height() );
-    pixmap.fill( colorGroup().background() );
+    pixmap.fill( tqcolorGroup().background() );
     TQPainter painter( &pixmap );
     painter.setPen( TQt::black );
     painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE );
@@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
                     height()- HANDLE_SIZE - MARGIN,
                     tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ),
                     HANDLE_SIZE );
-            painter.fillRect( selection, TQBrush( colorGroup().highlight() ) );
+            painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) );
         }
 
         TQPointArray triangle(3);
@@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
             emit sigSelectedSegment( m_selectedSegment );
         }
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e )
@@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e )
     if ( m_drag != NO_DRAG)
         emit sigChangedSegment( m_currentSegment );
 
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e )
@@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id )
             break;
     }
     emit sigSelectedSegment( m_selectedSegment );
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "kis_gradient_slider_widget.moc"
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 2d704d86..1375cacc 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvalidator.h>
 
 #include <knuminput.h>
@@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val)
     l->insertStretch(0, 1);
     d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox");
 
-    d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     d->m_numinput->setSuffix("%");
     l->addWidget( d->m_numinput );
 
@@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val)
     d->m_prevValue = val;
     setValue(val);
     setFocusProxy(d->m_numinput);
-    layout();
+    tqlayout();
 
     connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int)));
     connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
@@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/)
     lower = kMin(upper, lower);
     d->m_slider->setRange(lower, upper);
 
-    layout();
+    tqlayout();
 }
 
 void KisIntSpinbox::setMinValue(int min)
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index 5920c3d0..c081111f 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 #include <tqcursor.h>
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 31756d7c..424c405d 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -21,11 +21,11 @@
 
 #include <tqbutton.h>
 #include <tqtoolbutton.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqrect.h>
@@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
     vbox->setAutoAdd(true);
 
     m_lst = new WdgLayerBox(this);
-    setMinimumSize(m_lst->minimumSizeHint());
+    setMinimumSize(m_lst->tqminimumSizeHint());
 
     TQToolTip::add(m_lst->bnAdd, i18n("Create new layer"));
 
@@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
     TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);
 
     if (pixmap.isNull())
-        KMessageBox::error(0, i18n("Cannot find %1").arg(filename),
+        KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename),
                            i18n("Canvas"));
 
     return pixmap;
@@ -626,7 +626,7 @@ void KisLayerBox::printChalkLayers() const
         return;
     TQString s = root->name();
     if( dynamic_cast<KisGroupLayer*>( root ) )
-        s = TQString("[%1]").arg( s );
+        s = TQString("[%1]").tqarg( s );
     if( m_image->activeLayer().data() == root )
         s.prepend("*");
     kdDebug() << (TQString().fill(' ', indent) +  s) << endl;
@@ -658,7 +658,7 @@ void KisLayerBox::printLayerboxLayers() const
     }
     TQString s = root->displayName();
     if( root->isFolder() )
-        s = TQString("[%1]").arg( s );
+        s = TQString("[%1]").tqarg( s );
     if( list()->activeLayer() == root )
         s.prepend("*");
     kdDebug() << (TQString().fill(' ', indent) +  s) << endl;
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 24ae2738..985bd0c6 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -181,16 +181,16 @@ TQString KisLayerItem::tooltip() const
     TQString text = super::tooltip();
     text = text.left( text.length() - 8 ); //HACK -- strip the </table>
     TQString row = "<tr><td>%1</td><td>%2</td></tr>";
-    text += row.arg( i18n( "Opacity:" ) ).arg( "%1%" ).arg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) );
-    text += row.arg( i18n( "Composite mode:" ) ).arg( m_layer->compositeOp().id().name() );
+    text += row.tqarg( i18n( "Opacity:" ) ).tqarg( "%1%" ).tqarg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) );
+    text += row.tqarg( i18n( "Composite mode:" ) ).tqarg( m_layer->compositeOp().id().name() );
     if( KisPaintLayer *player = dynamic_cast<KisPaintLayer*>( m_layer ) )
     {
-        text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() );
+        text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() );
         if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() )
-            text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() );
+            text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() );
     }
     if( KisAdjustmentLayer *alayer = dynamic_cast<KisAdjustmentLayer*>( m_layer ) )
-        text += row.arg( i18n( "Filter: " ) ).arg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() );
+        text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() );
     if( KisPartLayerImpl *player = dynamic_cast<KisPartLayerImpl*>( m_layer ) ) {
         TQString type = player->docType();
 
@@ -198,7 +198,7 @@ TQString KisLayerItem::tooltip() const
             type = player->childDoc()->document()->instance()->aboutData()->programName();
         }
 
-        text += row.arg( i18n( "Document type: " ) ).arg( type );
+        text += row.tqarg( i18n( "Document type: " ) ).tqarg( type );
     }
     text += "</table>";
 
diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui
index 2b866c2f..ca238b60 100644
--- a/chalk/ui/kis_matrix_widget.ui
+++ b/chalk/ui/kis_matrix_widget.ui
@@ -104,7 +104,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc
index 56d8265c..806998bf 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_bool_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc
index 5bccdcef..486bc770 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_double_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <knuminput.h>
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc
index 0cecabcc..130a03d1 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_integer_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <knuminput.h>
diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc
index e6551f81..6ae12305 100644
--- a/chalk/ui/kis_opengl_canvas_painter.cc
+++ b/chalk/ui/kis_opengl_canvas_painter.cc
@@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const
+const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h
index 24f2e2e2..47983ce2 100644
--- a/chalk/ui/kis_opengl_canvas_painter.h
+++ b/chalk/ui/kis_opengl_canvas_painter.h
@@ -85,7 +85,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -175,8 +175,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 6a5a3885..20197dd2 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <klocale.h>
@@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget()
     if (m_optionWidget != 0) {
         m_layout->remove(m_optionWidget);
         m_optionWidget->hide();
-        m_layout->invalidate();
+        m_layout->tqinvalidate();
     }
 
     const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice());
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 2bfe1985..a424d9ac 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
@@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth,
     minSize += TQSize(cellSize);
 
     setMinimumSize(minSize);
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
 }
 
 KisPaletteView::~KisPaletteView()
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 3618e8ad..2feb74c8 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
@@ -67,16 +67,16 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
 
     m_currentPalette = 0;
 
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
     combo = new TQComboBox( false, this );
     combo->setFocusPolicy( TQ_ClickFocus );
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     m_view = new KisPaletteView(this, 0, minWidth, cols);
-    layout->addWidget( m_view );
+    tqlayout->addWidget( m_view );
 
-    //setFixedSize(sizeHint());
+    //setFixedSize(tqsizeHint());
 
     connect(combo, TQT_SIGNAL(activated(const TQString &)),
             this, TQT_SLOT(slotSetPalette(const TQString &)));
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 5846a67b..ace29965 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -94,19 +94,19 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child)
 // Called when another layer is made inactive
 void KisPartLayerImpl::childDeactivated(bool activated)
 {
-    // We probably changed, notify the image that it needs to repaint where we currently updated
-    // We use the original geometry
+    // We probably changed, notify the image that it needs to tqrepaint where we currently updated
+    // We use the original tqgeometry
     if (m_activated && !activated /* no clue, but debugging suggests it is false here */) {
         TQPtrList<KoView> views = m_doc->parentDocument()->views();
         Q_ASSERT(views.count());
         views.at(0)->disconnect(TQT_SIGNAL(activated(bool)));
         m_activated = false;
-        setDirty(m_doc->geometry());
+        setDirty(m_doc->tqgeometry());
     }
 }
 
 void KisPartLayerImpl::setX(TQ_INT32 x) {
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here,
     // since the part is not necesarily started at (0,0)
@@ -115,7 +115,7 @@ void KisPartLayerImpl::setX(TQ_INT32 x) {
 }
 
 void KisPartLayerImpl::setY(TQ_INT32 y) {
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here,
     // since the part is not necesarily started at (0,0)
@@ -125,7 +125,7 @@ void KisPartLayerImpl::setY(TQ_INT32 y) {
 
 void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) {
     uchar *j = img.bits();
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     for (int y2 = y; y2 < h + y; ++y2) {
         for (int x2 = x; x2 < w + x; ++x2) {
diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h
index 377b37a0..d2ff10eb 100644
--- a/chalk/ui/kis_part_layer.h
+++ b/chalk/ui/kis_part_layer.h
@@ -95,10 +95,10 @@ public:
 
     virtual void setX(TQ_INT32 x);
     virtual void setY(TQ_INT32 y);
-    virtual TQ_INT32 x() const { return m_doc->geometry() . x(); }
-    virtual TQ_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); }
-    virtual TQRect extent() const { return m_doc->geometry(); }
-    virtual TQRect exactBounds() const { return m_doc->geometry(); }
+    virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); }
+    virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); }
+    virtual TQRect extent() const { return m_doc->tqgeometry(); }
+    virtual TQRect exactBounds() const { return m_doc->tqgeometry(); }
 
     virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h);
 
@@ -113,7 +113,7 @@ public:
     virtual bool saveToXML(TQDomDocument doc, TQDomElement elem);
 private slots:
     /// Repaints our device with the data from the embedded part
-    //void repaint();
+    //void tqrepaint();
     /// When we activate the embedding, we clear ourselves
     void childActivated(KoDocumentChild* child);
     void childDeactivated(bool activated);
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc
index 39ffe61e..70484b0a 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <koIconChooser.h>
 
@@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super
 {
     m_lbName = new TQLabel(this);
 
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
 
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
@@ -47,7 +47,7 @@ void KisPatternChooser::update(KoIconItem *item)
     if (item) {
         KisPattern *pattern = static_cast<KisPattern *>(kisItem->resource());
 
-        TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height());
+        TQString text = TQString("%1 (%2 x %3)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height());
 
         m_lbName->setText(text);
     }
diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc
index e9fb8443..e2857c19 100644
--- a/chalk/ui/kis_previewdialog.cc
+++ b/chalk/ui/kis_previewdialog.cc
@@ -20,7 +20,7 @@
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kis_previewwidget.h"
 #include "kis_previewdialog.h"
@@ -28,14 +28,14 @@
 KisPreviewDialog::KisPreviewDialog( TQWidget *  parent, const char * name, bool modal, const TQString &caption)
     : super (parent, name, modal, caption, Ok | Cancel, Ok)
 {
-    TQHBox* layout = new TQHBox(this);
-    layout->setSpacing( 6 );
+    TQHBox* tqlayout = new TQHBox(this);
+    tqlayout->setSpacing( 6 );
 
-    m_containerFrame = new TQFrame( layout, "container" );
+    m_containerFrame = new TQFrame( tqlayout, "container" );
 
-    m_preview = new KisPreviewWidget( layout, "previewWidget" );
+    m_preview = new KisPreviewWidget( tqlayout, "previewWidget" );
 
-    setMainWidget(layout);
+    setMainWidget(tqlayout);
 }
 
 KisPreviewDialog::~KisPreviewDialog()
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index 9bc7eb46..2598e79d 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 #include <tqcolor.h>
diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui
index 6ba86353..f1b52244 100644
--- a/chalk/ui/kis_previewwidgetbase.ui
+++ b/chalk/ui/kis_previewwidgetbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -56,13 +56,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>150</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>1000</width>
                             <height>1000</height>
@@ -73,7 +73,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,7 +122,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -130,7 +130,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
index 5bf891ac..4233bc11 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
@@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un
     TQWidget *widget = dynamic_cast<TQWidget *>(canvasWidget);
 
     if (widget != 0) {
-        return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped);
+        return m_painter.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped);
     } else {
         return false;
     }
@@ -46,7 +46,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un
 
 bool KisTQPaintDeviceCanvasPainter::begin(const TQPaintDevice* paintDevice, bool unclipped)
 {
-    return m_painter.begin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
+    return m_painter.tqbegin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
 }
 
 bool KisTQPaintDeviceCanvasPainter::end()
@@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable)
     m_painter.setWorldXForm(enable);
 }
 
-const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const
+const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const
 {
-    return m_painter.worldMatrix();
+    return m_painter.tqworldMatrix();
 }
 
 void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine)
@@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr
 
 void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.drawPolyline(pointArray, index, npoints);
+    m_painter.tqdrawPolyline(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints)
 {
-    m_painter.drawPolygon(pointArray, winding, index, npoints);
+    m_painter.tqdrawPolygon(pointArray, winding, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.drawConvexPolygon(pointArray, index, npoints);
+    m_painter.tqdrawConvexPolygon(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index)
@@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T
 #endif // USE_QT4
 }
 
-void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
-    m_painter.drawTextItem(x, y, ti, textflags);
+    m_painter.tqdrawTextItem(x, y, ti, textflags);
 }
 
-void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
-    m_painter.drawTextItem(p, ti, textflags);
+    m_painter.tqdrawTextItem(p, ti, textflags);
 }
 
 TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h
index cef260b4..0dca7322 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.h
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h
@@ -80,7 +80,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -170,8 +170,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc
index 8a8929a7..44e86cae 100644
--- a/chalk/ui/kis_ruler.cc
+++ b/chalk/ui/kis_ruler.cc
@@ -131,7 +131,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
     if (m_pixmapBuffer) {
         if (m_orientation == Qt::Horizontal) {
             if (m_currentPosition != -1)
-                repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
+                tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
 
             if (x != -1) {
                 bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT);
@@ -139,7 +139,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
             }
         } else {
             if (m_currentPosition != -1)
-                repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
+                tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
 
             if (y != -1) {
                 bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH);
@@ -184,8 +184,8 @@ void KisRuler::drawRuler()
         return;
 
     p.begin(m_pixmapBuffer);
-    p.setPen(colorGroup().text());
-    p.setBackgroundColor(colorGroup().base());
+    p.setPen(tqcolorGroup().text());
+    p.setBackgroundColor(tqcolorGroup().base());
     p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height());
 
     switch (m_unit) {
diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h
index de98548c..1205632b 100644
--- a/chalk/ui/kis_save_visitor.h
+++ b/chalk/ui/kis_save_visitor.h
@@ -50,7 +50,7 @@ public:
         //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8)));
 
         TQString location = m_external ? TQString() : m_uri;
-        location += m_img->name() + TQString("/layers/layer%1").arg(m_count);
+        location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count);
 
         // Layer data
         if (m_store->open(location)) {
@@ -70,7 +70,7 @@ public:
             if (annotation) {
                 // save layer profile
                 location = m_external ? TQString() : m_uri;
-                location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".icc";
+                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".icc";
 
                 if (m_store->open(location)) {
                     m_store->write(annotation->annotation());
@@ -85,7 +85,7 @@ public:
             if (mask) {
                 // save layer profile
                 location = m_external ? TQString() : m_uri;
-                location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".mask";
+                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask";
 
                 if (m_store->open(location)) {
                     if (!mask->write(m_store)) {
@@ -130,7 +130,7 @@ public:
 
         if (layer->selection()) {
             TQString location = m_external ? TQString() : m_uri;
-            location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".selection";
+            location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".selection";
 
             // Layer data
             if (m_store->open(location)) {
@@ -147,7 +147,7 @@ public:
         if (layer->filter()) {
             TQString location = m_external ? TQString() : m_uri;
             location = m_external ? TQString() : m_uri;
-            location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".filterconfig";
+            location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".filterconfig";
 
             if (m_store->open(location)) {
                 TQString s = layer->filter()->toString();
diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h
index b5e3d930..15580752 100644
--- a/chalk/ui/kis_savexml_visitor.h
+++ b/chalk/ui/kis_savexml_visitor.h
@@ -54,7 +54,7 @@ public:
         layerElement.setAttribute("visible", layer->visible());
         layerElement.setAttribute("locked", layer->locked());
         layerElement.setAttribute("layertype", "paintlayer");
-        layerElement.setAttribute("filename", TQString("layer%1").arg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count));
         layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id());
         layerElement.setAttribute("hasmask", layer->hasMask());
         m_elem.appendChild(layerElement);
@@ -124,7 +124,7 @@ public:
         layerElement.setAttribute("visible", layer->visible());
         layerElement.setAttribute("locked", layer->locked());
         layerElement.setAttribute("layertype", "adjustmentlayer");
-        layerElement.setAttribute("filename", TQString("layer%1").arg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count));
         layerElement.setAttribute("x", layer->x());
         layerElement.setAttribute("y", layer->y());
         m_elem.appendChild(layerElement);
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index 60ab80c7..0655b834 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -18,7 +18,7 @@
 
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
 
@@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection)
 //                   this, TQT_SLOT(save()),
 //                   collection, "save_selection");
 
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged()));
 }
 
diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc
index 17562722..32933b5a 100644
--- a/chalk/ui/kis_selection_options.cc
+++ b/chalk/ui/kis_selection_options.cc
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <kcolorbtn.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kis_canvas_controller.h"
 #include "kis_canvas_subject.h"
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index b2ae9f36..ad681c75 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cc
@@ -63,7 +63,7 @@ void KisTextBrush::getFont()
 
 void KisTextBrush::rebuildTextBrush()
 {
-	lblFont->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
+	lblFont->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
 	lblFont->setFont(m_font);
 	m_textBrushResource->setFont(m_font);
 	m_textBrushResource->setText(lineEdit->text());
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 807b8ffc..d6e600af 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -56,9 +56,9 @@ KisTool::~KisTool()
 TQWidget* KisTool::createOptionWidget(TQWidget* parent)
 {
     
-    d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent);
+    d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
     d->optionWidget->setCaption(d->uiname);
-    d->optionWidget->setAlignment(TQt::AlignCenter);
+    d->optionWidget->tqsetAlignment(TQt::AlignCenter);
     return d->optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index bda3b7e7..b9abdc75 100644
--- a/chalk/ui/kis_tool.h
+++ b/chalk/ui/kis_tool.h
@@ -47,7 +47,7 @@ class KisMoveEvent;
 class KisCanvasPainter;
 
 enum enumToolType {
-    TOOL_SHAPE = 0,   // Geometric shapes like ellipses and lines
+    TOOL_SHAPE = 0,   // Geometric tqshapes like ellipses and lines
     TOOL_FREEHAND = 1, // Freehand drawing tools
     TOOL_TRANSFORM = 2, // Tools that transform the layer
     TOOL_FILL = 3, // Tools that fill parts of the canvas
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index bc478d4e..51eb1407 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent)
 {
     m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent);
     m_optionWidget->setCaption(i18n("No Active Tool"));
-    m_optionWidget->setAlignment(TQt::AlignCenter);
+    m_optionWidget->tqsetAlignment(TQt::AlignCenter);
     return m_optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index bb7dbc1e..adbf9b8a 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -20,7 +20,7 @@
  */
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqrect.h>
 
@@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {
     }
 
     KisCanvas *canvas = controller->kiscanvas();
-    canvas->repaint();
+    canvas->tqrepaint();
 
     KisBrush *brush = m_subject->currentBrush();
     // There may not be a brush present, and we shouldn't crash in that case
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index e3cf7152..9d37dae6 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -18,7 +18,7 @@
 
 #include <tqwidget.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
@@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget()
     return m_optionWidget;
 }
 
-void KisToolPaint::addOptionWidgetLayout(TQLayout *layout)
+void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout)
 {
     Q_ASSERT(m_optionWidget != 0);
     Q_ASSERT(m_optionWidgetLayout != 0);
     int rowCount = m_optionWidgetLayout->numRows();
-    m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1);
+    m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1);
 }
 
 void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label)
diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h
index 05dbf450..7fb4b819 100644
--- a/chalk/ui/kis_tool_paint.h
+++ b/chalk/ui/kis_tool_paint.h
@@ -20,7 +20,7 @@
 #define KIS_TOOL_PAINT_H_
 
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <koffice_export.h>
 
@@ -88,8 +88,8 @@ public slots:
 protected:
     void notifyModified() const;
 
-    // Add the tool-specific layout to the default option widget's layout.
-    void addOptionWidgetLayout(TQLayout *layout);
+    // Add the tool-specific tqlayout to the default option widget's tqlayout.
+    void addOptionWidgetLayout(TQLayout *tqlayout);
 
 private:
     void updateCompositeOpComboBox();
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc
index 045b43f9..e7696f0b 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cc
@@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0;
 KisToolRegistry::KisToolRegistry()
 {
     // Load all modules: color models, paintops, filters
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc
index 0c9ddc4a..9e76f159 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -17,7 +17,7 @@
  */
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
@@ -29,7 +29,7 @@
 
 KisToolShape::KisToolShape(const TQString& UIName) : super(UIName)
 {
-    m_shapeOptionsWidget = 0;
+    m_tqshapeOptionsWidget = 0;
     m_optionLayout = 0;
 }
 
@@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent)
 {
     TQWidget *widget = super::createOptionWidget(parent);
 
-    m_shapeOptionsWidget = new WdgGeometryOptions(0);
-    Q_CHECK_PTR(m_shapeOptionsWidget);
+    m_tqshapeOptionsWidget = new WdgGeometryOptions(0);
+    Q_CHECK_PTR(m_tqshapeOptionsWidget);
 
     m_optionLayout = new TQGridLayout(widget, 2, 1);
    // super::addOptionWidgetLayout(m_optionLayout);
 
-    m_shapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true);
-    m_shapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true);
-    addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3);
+    m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true);
+    m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true);
+    addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3);
 
     return widget;
 }
 
 KisPainter::FillStyle KisToolShape::fillStyle(void)
 {
-    if (m_shapeOptionsWidget) {
-        return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem());
+    if (m_tqshapeOptionsWidget) {
+        return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem());
     } else {
         return KisPainter::FillStyleNone;
     }
diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h
index 45767fe4..e8974c79 100644
--- a/chalk/ui/kis_tool_shape.h
+++ b/chalk/ui/kis_tool_shape.h
@@ -46,7 +46,7 @@ protected:
 
 private:
     TQGridLayout *m_optionLayout;
-        WdgGeometryOptions *m_shapeOptionsWidget;
+        WdgGeometryOptions *m_tqshapeOptionsWidget;
 };
 
 #endif // KIS_TOOL_SHAPE_H_
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 629072ff..4455f17d 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);
 
     // Load all plugins
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
     KTrader::OfferList::ConstIterator iter;
     for(iter = offers.begin(); iter != offers.end(); ++iter)
@@ -494,11 +494,11 @@ void KisView::setupRulers()
 void KisView::updateStatusBarZoomLabel ()
 {
     if (zoom() < 1 - EPSILON) {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4));
     } else {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0));
     }
-    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("0.8888  ")));
+    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888  ")));
 }
 
 void KisView::updateStatusBarSelectionLabel()
@@ -513,7 +513,7 @@ void KisView::updateStatusBarSelectionLabel()
         if (dev) {
             if (dev->hasSelection()) {
                 TQRect r = dev->selection()->selectedExactRect();
-                m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").arg(r.x()).arg(r.y()).arg( r.width()).arg( r.height()));
+                m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height()));
                 return;
             }
         }
@@ -682,7 +682,7 @@ void KisView::setupActions()
     new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()),
                 actionCollection(), "edit_palette");
 
-    // XXX: This triggers a repaint of the image, but way too early
+    // XXX: This triggers a tqrepaint of the image, but way too early
     //showRuler();
 
 }
@@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
     }
 
     KisImageSP img = currentImg();
-    TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
+    TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
     TQ_INT32 drawH;
     TQ_INT32 drawW;
     TQ_INT32 docW;
@@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *)
 
             if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) {
 
-                TQMemArray<TQRect> rects = exposedRegion.rects();
+                TQMemArray<TQRect> rects = exposedRegion.tqrects();
 
                 for (unsigned int i = 0; i < rects.count(); i++) {
                     TQRect r = rects[i];
@@ -958,11 +958,11 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                     TQRegion rg(vr);
                     rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height())));
 
-                    TQMemArray<TQRect> rects = rg.rects();
+                    TQMemArray<TQRect> rects = rg.tqrects();
 
                     for (unsigned int i = 0; i < rects.count(); i++) {
                         TQRect er = rects[i];
-                        gc.fillRect(er, colorGroup().mid());
+                        gc.fillRect(er, tqcolorGroup().mid());
                     }
                     wr &= TQRect(0, 0, img->width(), img->height());
                 }
@@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                 }
 //                    paintGuides();
             } else {
-                gc.fillRect(vr, colorGroup().mid());
+                gc.fillRect(vr, tqcolorGroup().mid());
             }
         }
     }
@@ -1025,7 +1025,7 @@ void KisView::paintTQPaintDeviceView(const TQRegion& canvasRegion)
     Q_ASSERT(m_canvas->TQPaintDeviceWidget() != 0);
 
     if (m_canvas->TQPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) {
-        TQMemArray<TQRect> rects = canvasRegion.rects();
+        TQMemArray<TQRect> rects = canvasRegion.tqrects();
 
         for (unsigned int i = 0; i < rects.count(); i++) {
             TQRect r = rects[i];
@@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect)
 
     glDrawBuffer(GL_BACK);
 
-    TQColor widgetBackgroundColor = colorGroup().mid();
+    TQColor widgetBackgroundColor = tqcolorGroup().mid();
 
     glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect)
     } else {
         updateTQPaintDeviceCanvas(imageRect);
         //m_canvas->update(windowToView(imageRect));
-        m_canvas->repaint(windowToView(imageRect));
+        m_canvas->tqrepaint(windowToView(imageRect));
     }
 }
 
@@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas()
     updateCanvas(imageRect);
 
     // Enable this if updateCanvas does an m_canvas->update()
-    //m_canvas->repaint();
+    //m_canvas->tqrepaint();
 }
 
 void KisView::selectionDisplayToggled(bool displaySelection)
@@ -2965,7 +2965,7 @@ void KisView::layerDuplicate()
         return;
 
     KisLayerSP dup = active->clone();
-    dup->setName(i18n("Duplicate of '%1'").arg(active->name()));
+    dup->setName(i18n("Duplicate of '%1'").tqarg(active->name()));
     img->addLayer(dup, active->parent().data(), active);
     if (dup) {
         img->activate( dup );
@@ -3086,7 +3086,7 @@ void KisView::scrollH(int value)
                 bitBlt(&m_canvasPixmap, xShift, 0, &m_canvasPixmap, 0, 0, m_canvasPixmap.width() - xShift, m_canvasPixmap.height());
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         } else if (xShift < 0) {
 
@@ -3098,7 +3098,7 @@ void KisView::scrollH(int value)
                 bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, -xShift, 0, m_canvasPixmap.width() + xShift, m_canvasPixmap.height());
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         }
 	if (m_oldTool) {
@@ -3131,7 +3131,7 @@ void KisView::scrollV(int value)
                 bitBlt(&m_canvasPixmap, 0, yShift, &m_canvasPixmap, 0, 0, m_canvasPixmap.width(), m_canvasPixmap.height() - yShift);
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         } else if (yShift < 0) {
 
@@ -3143,7 +3143,7 @@ void KisView::scrollV(int value)
                 bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, 0, -yShift, m_canvasPixmap.width(), m_canvasPixmap.height() + yShift);
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         }
 	if (m_oldTool) {
@@ -3470,7 +3470,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
 
         // We ignore device change due to mouse events for a short duration
         // after a tablet event, since these are almost certainly mouse events
-        // sent to receivers that don't accept the tablet event.
+        // sent to tqreceivers that don't accept the tablet event.
         m_tabletEventTimer.start();
         break;
     }
@@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
         mgr = img->guides();
 
         if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
-            bool flag = geometry().contains(pt);
+            bool flag = tqgeometry().contains(pt);
             KisGuideSP gd;
 
             if (m_currentGuide == 0 && flag) {
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 3ec87a6e..542e257d 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -19,7 +19,7 @@
  */
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqframe.h>
 #include <tqlabel.h>
@@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v )
 
 void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos)
 {
-    m_page->txtX->setText(TQString("%L1").arg(xpos, 5));
-    m_page->txtY->setText(TQString("%L1").arg(ypos, 5));
+    m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5));
+    m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5));
 }
 
 void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider)
@@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r)
 
                 TQPainter painter(&m_thumbnail);
 
-                painter.fillRect(thumbnailRect, colorGroup().mid());
+                painter.fillRect(thumbnailRect, tqcolorGroup().mid());
                 painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage);
             }
         }
@@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView()
 
         TQPainter painter(&m_viewBuffer);
 
-        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid());
+        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid());
 
         if (!m_thumbnail.isNull()) {
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 19f49200..96e1e032 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -142,9 +142,9 @@ public:
     {
         m_img = m_item->tooltipPreview();
         m_timer.start( 15000, true );
-        if( !isVisible() || sizeHint() != size() )
+        if( !isVisible() || tqsizeHint() != size() )
         {
-            resize( sizeHint() );
+            resize( tqsizeHint() );
             position();
         }
         if( !isVisible() )
@@ -168,8 +168,8 @@ public:
     {
         TQPixmap buf( width(), height() );
         TQPainter p( &buf );
-        buf.fill( colorGroup().background() );
-        p.setPen( colorGroup().foreground() );
+        buf.fill( tqcolorGroup().background() );
+        p.setPen( tqcolorGroup().foreground() );
         p.drawRect( buf.rect() );
 
         TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() );
@@ -188,12 +188,12 @@ public:
             p.translate( m_img.width() + 10, 0 );
         }
 
-        text.draw( &p, 0, 0, rect(), colorGroup() );
+        text.draw( &p, 0, 0, rect(), tqcolorGroup() );
 
         painter->drawPixmap( 0, 0, buf );
     }
 
-    virtual TQSize sizeHint() const
+    virtual TQSize tqsizeHint() const
     {
         if( !m_item )
             return TQSize( 0, 0 );
@@ -217,7 +217,7 @@ public:
     void position()
     {
         const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
-        const TQSize size = sizeHint();
+        const TQSize size = tqsizeHint();
         const int width = size.width(), height = size.height();
         const TQRect tmp = m_item->rect();
         const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() );
@@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const
 {
     TQString tip;
     tip += "<table cellspacing=\"0\" cellpadding=\"0\">";
-    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( displayName() );
+    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").tqarg( displayName() );
     TQString row = "<tr><td>%1</td><td>%2</td></tr>";
     for( int i = 0, n = listView()->d->properties.count(); i < n; ++i )
         if( !isFolder() || listView()->d->properties[i].validForFolders )
         {
             if( d->properties[i] )
-                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) );
+                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) );
             else
-                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) );
+                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) );
         }
     tip += "</table>";
     return tip;
@@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum
 
     p.setFont( font() );
 
-    const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled();
+    const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled();
 
     const TQColor bg = isSelected()  ? cg_.highlight()
                     : isAlternate() ? listView()->alternateBackground()
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 31a044f2..6b957a26 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos )
     TQListBoxItem* selectedItem = listBox->itemAt( pos );
     if (selectedItem)
     {
-        TQRect positionToolTip = listBox->itemRect( selectedItem );
+        TQRect positionToolTip = listBox->tqitemRect( selectedItem );
         TQString toolTipText = m_originalWidget->itemHighlighted();
         if (!toolTipText.isNull())
             tip(positionToolTip, toolTipText);
@@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const
     return false;
 }
 
-TQSize SqueezedComboBox::sizeHint() const
+TQSize SqueezedComboBox::tqsizeHint() const
 {
     constPolish();
     TQFontMetrics fm = fontMetrics();
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 50f4bc77..03a1cdb9 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -117,9 +117,9 @@ public:
     TQString itemHighlighted( );
 
     /**
-     * Sets the sizeHint() of this widget.
+     * Sets the tqsizeHint() of this widget.
      */
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 private slots:
     void slotTimeOut();
diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui
index 39de910a..5227d7fb 100644
--- a/chalk/ui/wdgapplyprofile.ui
+++ b/chalk/ui/wdgapplyprofile.ui
@@ -71,7 +71,7 @@
                     <property name="text">
                         <string>The image data you want to paste does not have an ICM profile associated with it. If you do not select a profile, Chalk will assume that the image data is encoded in the import profile defined in the Settings dialog.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui
index 6d3a572d..00683ca9 100644
--- a/chalk/ui/wdgautobrush.ui
+++ b/chalk/ui/wdgautobrush.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout21</cstring>
+                                <cstring>tqlayout21</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -129,13 +129,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -169,7 +169,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout23</cstring>
+                                <cstring>tqlayout23</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -242,13 +242,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -273,7 +273,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -291,7 +291,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>95</width>
                             <height>95</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui
index aec6907d..94a8a137 100644
--- a/chalk/ui/wdgautogradient.ui
+++ b/chalk/ui/wdgautogradient.ui
@@ -45,7 +45,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>30</height>
@@ -57,7 +57,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <property name="font">
                         <font>
@@ -71,7 +71,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <property name="font">
                                 <font>
@@ -95,7 +95,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout8</cstring>
+                                        <cstring>tqlayout8</cstring>
                                     </property>
                                     <property name="font">
                                         <font>
@@ -129,7 +129,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
@@ -150,7 +150,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout9</cstring>
+                                        <cstring>tqlayout9</cstring>
                                     </property>
                                     <property name="font">
                                         <font>
@@ -184,7 +184,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
@@ -207,7 +207,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <property name="font">
                                 <font>
@@ -287,7 +287,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11_2</cstring>
+                        <cstring>tqlayout11_2</cstring>
                     </property>
                     <property name="font">
                         <font>
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 506e2803..2b2b7910 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -39,7 +39,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -53,7 +53,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -71,13 +71,13 @@
                             <property name="name">
                                 <cstring>txtX</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -105,13 +105,13 @@
                             <property name="name">
                                 <cstring>txtY</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -137,7 +137,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -158,13 +158,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>75</width>
                             <height>75</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>200</width>
                             <height>75</height>
@@ -186,7 +186,7 @@
             <property name="name">
                 <cstring>toolbar</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32</height>
@@ -195,7 +195,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index f4a0f695..6f9e41e6 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>20</height>
@@ -228,7 +228,7 @@ The different rendering intent methods will affect only what is shown on screen,
                     <property name="text">
                         <string>&lt;p&gt;Select what color profile to add when pasting from external applications that do not use a color profile.&lt;/p&gt;</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen,
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen,
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui
index f1c67ffa..dba17dac 100644
--- a/chalk/ui/wdgcustombrush.ui
+++ b/chalk/ui/wdgcustombrush.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -103,7 +103,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui
index 5b03a7f0..7936f20b 100644
--- a/chalk/ui/wdgcustompattern.ui
+++ b/chalk/ui/wdgcustompattern.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -49,7 +49,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -65,7 +65,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -84,7 +84,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui
index 757b6b27..64b33f16 100644
--- a/chalk/ui/wdgdisplaysettings.ui
+++ b/chalk/ui/wdgdisplaysettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -49,7 +49,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>31</height>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 9383fbfd..53f3ef90 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -37,10 +37,10 @@
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="text">
-                                <string>&amp;Cursor shape:</string>
+                                <string>&amp;Cursor tqshape:</string>
                             </property>
                             <property name="buddy" stdset="0">
-                                <cstring>m_cmbCursorShape</cstring>
+                                <cstring>m_cmbtqCursorShape</cstring>
                             </property>
                         </widget>
                         <widget class="TQComboBox">
@@ -65,7 +65,7 @@
                                 </property>
                             </item>
                             <property name="name">
-                                <cstring>m_cmbCursorShape</cstring>
+                                <cstring>m_cmbtqCursorShape</cstring>
                             </property>
                         </widget>
                     </hbox>
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui
index dbb90e0a..18c1f528 100644
--- a/chalk/ui/wdggridsettings.ui
+++ b/chalk/ui/wdggridsettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -192,7 +192,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>34</width>
                             <height>20</height>
@@ -214,7 +214,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -222,7 +222,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -294,13 +294,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -320,7 +320,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -357,7 +357,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -427,7 +427,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui
index 02c15129..d977802e 100644
--- a/chalk/ui/wdglayerbox.ui
+++ b/chalk/ui/wdglayerbox.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>10</height>
@@ -74,7 +74,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -84,13 +84,13 @@
                     <property name="name">
                         <cstring>bnAdd</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -110,13 +110,13 @@
                     <property name="name">
                         <cstring>bnLower</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -136,13 +136,13 @@
                     <property name="name">
                         <cstring>bnRaise</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -162,13 +162,13 @@
                     <property name="name">
                         <cstring>bnProperties</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -191,7 +191,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -202,13 +202,13 @@
                     <property name="name">
                         <cstring>bnDelete</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index 82548e11..dd310483 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>131</width>
                             <height>61</height>
@@ -230,7 +230,7 @@
                     <property name="text">
                         <string>Description:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -316,7 +316,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>480</width>
                             <height>21</height>
@@ -359,7 +359,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>0</height>
diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui
index c4de4e1d..3654031b 100644
--- a/chalk/ui/wdgpalettechooser.ui
+++ b/chalk/ui/wdgpalettechooser.ui
@@ -29,7 +29,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>255</width>
                             <height>20</height>
diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui
index 82deb5b9..c8e4404b 100644
--- a/chalk/ui/wdgperformancesettings.ui
+++ b/chalk/ui/wdgperformancesettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="name">
                         <cstring>m_swappiness</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>600</width>
                             <height>32767</height>
@@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>139</height>
diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui
index 2a21e377..90f59a33 100644
--- a/chalk/ui/wdgpressuresettings.ui
+++ b/chalk/ui/wdgpressuresettings.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>89</height>
diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui
index f6f02f39..ca71ee01 100644
--- a/chalk/ui/wdgselectionoptions.ui
+++ b/chalk/ui/wdgselectionoptions.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui
index 2c485c4d..563c7dbc 100644
--- a/chalk/ui/wdgshapeoptions.ui
+++ b/chalk/ui/wdgshapeoptions.ui
@@ -35,7 +35,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui
index 44a43e94..f9dfaac6 100644
--- a/chalk/ui/wdgtabletdevicesettings.ui
+++ b/chalk/ui/wdgtabletdevicesettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
@@ -49,7 +49,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -72,7 +72,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_4</cstring>
+                        <cstring>tqlayout4_4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_2</cstring>
+                        <cstring>tqlayout4_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_3</cstring>
+                        <cstring>tqlayout4_3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -141,7 +141,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_6</cstring>
+                        <cstring>tqlayout4_6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_5</cstring>
+                        <cstring>tqlayout4_5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui
index 41be6f39..29ff9dbb 100644
--- a/chalk/ui/wdgtabletsettings.ui
+++ b/chalk/ui/wdgtabletsettings.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -91,7 +91,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index e51a4d6c..5e5d5dac 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -47,7 +47,7 @@
                             <property name="name">
                                 <cstring>lineEdit</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>120</width>
                                     <height>0</height>
@@ -65,7 +65,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>