Remove additional unneeded tq method conversions

102 files changed, 448 insertions, 448 deletions

diff --git a/chalk/IMAGE_LIBRARIES b/chalk/IMAGE_LIBRARIES
index f2f0c1dc1..1d26fb969 100644
--- a/chalk/IMAGE_LIBRARIES
+++ b/chalk/IMAGE_LIBRARIES
@@ -153,7 +153,7 @@ Disadvantages:
 
 Libart isn't really an image library, but rather a canvas that can be
 used to paint images on. It is optimized for vector graphics, and is
-used by Karbon to render tqshapes before display.
+used by Karbon to render shapes before display.
 
 Advantages:
 
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc
index b769a3d3c..a67652f77 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.cc
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc
@@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol
 }
 
 TQString KisBasicU8HistogramProducer::positionToString(double pos) const {
-    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs)
@@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC
 
 TQString KisBasicU16HistogramProducer::positionToString(double pos) const
 {
-    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 double KisBasicU16HistogramProducer::maximalZoom() const
@@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC
 }
 
 TQString KisBasicF32HistogramProducer::positionToString(double pos) const {
-    return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
 }
 
 double KisBasicF32HistogramProducer::maximalZoom() const {
@@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID&
 }
 
 TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
 }
 
 double KisBasicF16HalfHistogramProducer::maximalZoom() const {
@@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() {
 }
 
 TQString KisGenericRGBHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 double KisGenericRGBHistogramProducer::maximalZoom() const {
@@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() {
 }
 
 TQString KisGenericLabHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
+    return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
 }
 
 double KisGenericLabHistogramProducer::maximalZoom() const {
diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cc
index 2d0ad98f4..3f5815adb 100644
--- a/chalk/chalkcolor/kis_profile.cc
+++ b/chalk/chalkcolor/kis_profile.cc
@@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile)
 
     // Make a raw data image ready for saving
     _cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size
-    if(m_rawData.tqresize(bytesNeeded))
+    if(m_rawData.resize(bytesNeeded))
     {
         _cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
         cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c
index d69402948..d2e27cd1c 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.c
+++ b/chalk/colorspaces/wetsticky/ws/canvas.c
@@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];
 
 /*  This module maintains a list of the addresses of cells that have
     been modified since the last redraw and therefore need updating.
-    Points are added to this list by the need_to_tqrepaint() routine
-    and are removed by the next_cell_for_tqrepaint() function.  The
+    Points are added to this list by the need_to_repaint() routine
+    and are removed by the next_cell_for_repaint() function.  The
     pointer to the current tail of the list is updated by side-effect. */
 
 static POINT need_repainting[REDRAW_LIMIT];
 static int   next_free = 0;
-static int   next_to_tqrepaint = 0;
+static int   next_to_repaint = 0;
 
 /* *********************************************************************** */
 
@@ -50,7 +50,7 @@ int number_of_repaints_needed()
 
 /* *********************************************************************** */
 
-void need_to_tqrepaint(point)
+void need_to_repaint(point)
 /*  The cell at this location needs to be redrawn since it has
     been altered.   Scan the list to see if it is already
     scheduled for a repainting operation and only add it if
@@ -62,7 +62,7 @@ POINT point;
    int k;
 
 
-   /*  If the list is already full then simply ignore the tqrepaint
+   /*  If the list is already full then simply ignore the repaint
        request - it will get done eventually anyway.  */
 
    if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;
 
 /* *********************************************************************** */
 
-void next_cell_for_tqrepaint(cell, locus)
+void next_cell_for_repaint(cell, locus)
 /*  This routine returns the next cell to be repainted, together with its
     location on the canvas.  This is determined by taking the next point 
     from the need_repainting list and accessing its cell.  If the list is 
@@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus)
    POINT_PTR locus;
 
 {
-   if (next_to_tqrepaint >= next_free) {
-      next_to_tqrepaint = next_free = 0;
+   if (next_to_repaint >= next_free) {
+      next_to_repaint = next_free = 0;
       *(cell) = NIL;
       return;
    }
 
-   *(cell) = get_cell(need_repainting[next_to_tqrepaint]);
-   locus->x = need_repainting[next_to_tqrepaint].x;
-   locus->y = need_repainting[next_to_tqrepaint].y;
-   next_to_tqrepaint++;
+   *(cell) = get_cell(need_repainting[next_to_repaint]);
+   locus->x = need_repainting[next_to_repaint].x;
+   locus->y = need_repainting[next_to_repaint].y;
+   next_to_repaint++;
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h
index 57453e7b8..2df50140d 100644
--- a/chalk/colorspaces/wetsticky/ws/canvas.h
+++ b/chalk/colorspaces/wetsticky/ws/canvas.h
@@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
 extern int number_of_repaints_needed();
 /*  Returns the number of cells needing to repainted.  */
 
-extern void need_to_tqrepaint (/* POINT */);
+extern void need_to_repaint (/* POINT */);
 /*  Requests that the cell at the given point be repainted
     at the next update as it has been modified.  */
 
-extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR  */);
+extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR  */);
 /*  Returns a pointer to a cell that needs to be updated as well
     as the location of that cell on the canvas.   If there are
     no more cells to be redrawn then the pointer will be NIL.  */
diff --git a/chalk/colorspaces/wetsticky/ws/engine.c b/chalk/colorspaces/wetsticky/ws/engine.c
index b3855bda5..19097d9fc 100644
--- a/chalk/colorspaces/wetsticky/ws/engine.c
+++ b/chalk/colorspaces/wetsticky/ws/engine.c
@@ -192,7 +192,7 @@ int      amount;
 
    }
 
-   need_to_tqrepaint(destLocus);
+   need_to_repaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c
index fceb0c055..03a7d4f32 100644
--- a/chalk/colorspaces/wetsticky/ws/engine3.c
+++ b/chalk/colorspaces/wetsticky/ws/engine3.c
@@ -191,7 +191,7 @@ int      amount;
 
    }
 
-   need_to_tqrepaint(destLocus);
+   need_to_repaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c
index 953b10c8a..76a552a9c 100644
--- a/chalk/colorspaces/wetsticky/ws/ogl_interface.c
+++ b/chalk/colorspaces/wetsticky/ws/ogl_interface.c
@@ -255,7 +255,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_tqrepaint(&cell, &p);
+      next_cell_for_repaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
 	   glFlush();
diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c
index 7c36a303b..f4cb49013 100644
--- a/chalk/colorspaces/wetsticky/ws/x_interface.c
+++ b/chalk/colorspaces/wetsticky/ws/x_interface.c
@@ -700,7 +700,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_tqrepaint(&cell, &p);
+      next_cell_for_repaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
    } 
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 31ee9d181..247bc7df9 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
         // or scaling it to less than half size.
         scaledImage = srcImage.smoothScale(width, height);
 
-        //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height);
+        //filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height);
     }
     else {
         scaledImage.create(width, height, 32);
@@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
             }
         }
 
-        //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
+        //filename = TQString("bilinear_%1x%2.png").arg(width).arg(height);
     }
 
     //scaledImage.save(filename, "PNG");
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 850998776..1981bd02b 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cc
@@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_BYTE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT8)0);
                 } else {
@@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SHORT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT16)0);
                 } else {
@@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_LONG:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT32)0);
                 } else {
@@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt)
             for(uint i = 0; i < components(); i++)
             {
                 KisExifRational r;
-                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_UINT32)0;
                 } else {
                     r.numerator = (TQ_UINT32) attr.toUInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
                 {
                     r.denominator = (TQ_UINT32)0;
                 } else {
@@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SBYTE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT8)0);
                 } else {
@@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SSHORT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT16)0);
                 } else {
@@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SLONG:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT32)0);
                 } else {
@@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt)
             for(uint i = 0; i < components(); i++)
             {
                 KisExifSRational r;
-                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_INT32)0;
                 } else {
                     r.numerator = (TQ_INT32) attr.toInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
                 {
                     r.denominator = (TQ_UINT32)0;
                 } else {
@@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_FLOAT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (float)0);
                 } else {
@@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_DOUBLE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
                 {
                     setValue(i, (double)0);
                 } else {
@@ -310,30 +310,30 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
     {
         case EXIF_TYPE_BYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
             break;
         case EXIF_TYPE_ASCII:
             elmt.setAttribute("value", asAscii() );
             break;
         case EXIF_TYPE_SHORT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) );
             break;
         case EXIF_TYPE_LONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
             break;
         case EXIF_TYPE_RATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifRational r = asRational(i);
-                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_SBYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
             break;
         case EXIF_TYPE_UNDEFINED:
         {
@@ -348,27 +348,27 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
             break;
         case EXIF_TYPE_SSHORT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
             break;
         case EXIF_TYPE_SLONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
             break;
         case EXIF_TYPE_SRATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifSRational r = asSRational(i);
-                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_FLOAT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
             break;
         case EXIF_TYPE_DOUBLE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) );
+                elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
             break;
         case EXIF_TYPE_UNKNOW:
             break;
@@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i)
     switch(type())
     {
         case EXIF_TYPE_BYTE:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
+            return TQString("%1 ").arg( asExifNumber( i ).m_byte );
         case EXIF_TYPE_SHORT:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
+            return TQString("%1 ").arg( asExifNumber( i ).m_short );
         case EXIF_TYPE_LONG:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
+            return TQString("%1 ").arg( asExifNumber( i ).m_long );
         case EXIF_TYPE_RATIONAL:
-            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
+            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
         case EXIF_TYPE_SBYTE:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
+            return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
         case EXIF_TYPE_SSHORT:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
+            return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
         case EXIF_TYPE_SLONG:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
+            return TQString("%1 ").arg( asExifNumber( i ).m_slong );
         case EXIF_TYPE_SRATIONAL:
-            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
+            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
         case EXIF_TYPE_FLOAT:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
+            return TQString("%1 ").arg( asExifNumber( i ).m_float );
         case EXIF_TYPE_DOUBLE:
-            return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
+            return TQString("%1 ").arg( asExifNumber( i ).m_double );
         default:
             return "unknow ";
     }
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc
index 2258d8991..672747a51 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cc
@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),
 
 bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
                        const KisPoint& gradientVectorEnd,
-                       enumGradientShape tqshape,
+                       enumGradientShape shape,
                        enumGradientRepeat repeat,
                        double antiAliasThreshold,
                        bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
 
     if (!m_gradient) return false;
 
-    GradientShapeStrategy *tqshapeStrategy = 0;
+    GradientShapeStrategy *shapeStrategy = 0;
 
-    switch (tqshape) {
+    switch (shape) {
     case GradientShapeLinear:
-        tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeBiLinear:
-        tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeRadial:
-        tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeSquare:
-        tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConical:
-        tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConicalSymetric:
-        tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     }
-    Q_CHECK_PTR(tqshapeStrategy);
+    Q_CHECK_PTR(shapeStrategy);
 
     GradientRepeatStrategy *repeatStrategy = 0;
 
@@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
     for (int y = starty; y <= endy; y++) {
         for (int x = startx; x <= endx; x++) {
 
-            double t = tqshapeStrategy->valueAt( x, y);
+            double t = shapeStrategy->valueAt( x, y);
             t = repeatStrategy->valueAt(t);
 
             if (reverseGradient) {
@@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
                             double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth;
                             double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth;
 
-                            double t = tqshapeStrategy->valueAt(sampleX, sampleY);
+                            double t = shapeStrategy->valueAt(sampleX, sampleY);
                             t = repeatStrategy->valueAt(t);
 
                             if (reverseGradient) {
@@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
         dev->writeBytes(layer.bits(), startx, starty, width, height);
         bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height);
     }
-    delete tqshapeStrategy;
+    delete shapeStrategy;
 
     emit notifyProgressDone();
 
diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h
index fc31b117a..2c0e29c27 100644
--- a/chalk/core/kis_gradient_painter.h
+++ b/chalk/core/kis_gradient_painter.h
@@ -66,7 +66,7 @@ public:
      */
     bool paintGradient(const KisPoint& gradientVectorStart,
                const KisPoint& gradientVectorEnd,
-               enumGradientShape tqshape,
+               enumGradientShape shape,
                enumGradientRepeat repeat,
                double antiAliasThreshold,
                bool reverseGradient,
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index 1f08dbddc..0e2f90d25 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x)
         m_layers.erase(m_layers.begin() + reverseIndex(index));
         setDirty(removedLayer->extent());
         if (childCount() < 1) {
-            // No tqchildren, nothing to show for it.
+            // No children, nothing to show for it.
             m_projection->clear();
             setDirty();
         }
@@ -308,7 +308,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc)
     // Get the first layer in this group to start compositing with
     KisLayerSP child = lastChild();
 
-    // No child -- clear the projection. Without tqchildren, a group layer is empty.
+    // No child -- clear the projection. Without children, a group layer is empty.
     if (!child) m_projection->clear();
 
     KisLayerSP startWith = 0;
diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h
index a516ac723..58a3ddab9 100644
--- a/chalk/core/kis_group_layer.h
+++ b/chalk/core/kis_group_layer.h
@@ -80,7 +80,7 @@ public:
         {
 //            kdDebug(41001) << "GROUP\t\t" << name()
 //                    << " dirty: " << dirty()
-//                    << ", " << m_layers.count() << " tqchildren "
+//                    << ", " << m_layers.count() << " children "
 //                    << ", projection: " << m_projection
 //                    << "\n";
             return v.visit(this);
diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc
index ff66144d6..4cb51a989 100644
--- a/chalk/core/kis_nameserver.cc
+++ b/chalk/core/kis_nameserver.cc
@@ -29,7 +29,7 @@ KisNameServer::~KisNameServer()
 
 TQString KisNameServer::name()
 {
-    return m_prefix.tqarg(m_generator++);
+    return m_prefix.arg(m_generator++);
 }
 
 TQ_INT32 KisNameServer::currentSeed() const
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 03d766162..69b90fe3e 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -215,7 +215,7 @@ void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageR
         TQRegion region = uniformRegion & TQRegion(imageRect);
 
         if (!region.isEmpty()) {
-            TQMemArray<TQRect> rects = region.tqrects();
+            TQMemArray<TQRect> rects = region.rects();
 
             for (unsigned int i = 0; i < rects.count(); i++) {
                 TQRect r = rects[i];
diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete
index 10ab8dbb6..f702d9206 100644
--- a/chalk/doc/DESIGN.obsolete
+++ b/chalk/doc/DESIGN.obsolete
@@ -21,7 +21,7 @@ Design Patterns
   changes:
 
             * Change brushes handling to a generic Mediator pattern
-              (kis_resource_mediator). Resources are brush tqshapes,
+              (kis_resource_mediator). Resources are brush shapes,
               patterns (and colours, too?) Patrick intended a Flyweight
               here.
 
diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt
index aa3bf87b7..2b860773c 100644
--- a/chalk/doc/background_paper.txt
+++ b/chalk/doc/background_paper.txt
@@ -79,6 +79,6 @@ We need perhaps to add a light source or two, in OpenGL mode... I think
 we do.
 
 On top of the layers are what Xara calls blobs: the temporary droppings of
-tools, like rubber bands, vector paths, brush tqshape cursors.
+tools, like rubber bands, vector paths, brush shape cursors.
 
 
diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features
index 1c737ce68..4bca9d00c 100644
--- a/chalk/doc/chalk-features
+++ b/chalk/doc/chalk-features
@@ -201,10 +201,10 @@ of a tablet. Tilt and rotation is not yet supported.
 
 * Brushes
 
-** gimp brush tqshapes. Support for colored and grayscale brushes and
+** gimp brush shapes. Support for colored and grayscale brushes and
    pipe brushes. Support from Gimp parasites in brushes.
-** custom brush tqshapes
-** text brush tqshapes
+** custom brush shapes
+** text brush shapes
 ** brushes created from layers or images. These brushes can be saved
 ** colored brushes can also be used as masks
 
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 8aa43e5a1..b209cfa9f 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -473,15 +473,15 @@ managed by this KisTileMgr" visibility="public" xmi.id="354" type="Q_INT32" name
     <UML:Operation comment="Returns true if this KisTileMgr does not manage any
 tiles." visibility="public" xmi.id="362" type="bool" name="empty" />
     <UML:Operation comment="Height in pixels of the total area managed by this KisTileMgr" visibility="public" xmi.id="363" type="Q_INT32" name="height" />
-    <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="365" value="" type="KisTileSP" name="tile" />
      <UML:Parameter visibility="private" xmi.id="366" value="" type="Q_INT32" name="xpix" />
      <UML:Parameter visibility="private" xmi.id="367" value="" type="Q_INT32" name="ypix" />
     </UML:Operation>
-    <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="369" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="371" value="" type="Q_INT32" name="xpix" />
      <UML:Parameter visibility="private" xmi.id="372" value="" type="Q_INT32" name="ypix" />
     </UML:Operation>
@@ -1705,17 +1705,17 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1359" value="" type="const enumImgType &amp;" name="imgType" />
      <UML:Parameter visibility="private" xmi.id="1360" value="" type="const QString &amp;" name="name" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="tqinvalidate" />
-    <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="invalidate" />
+    <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1363" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1365" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1366" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="1367" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="1368" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1370" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1371" type="KisLayerSP" name="layer" >
@@ -1930,17 +1930,17 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1529" type="const KisImageSP" name="image" />
     <UML:Operation visibility="protected" xmi.id="1530" type="void" name="init" />
-    <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="tqinvalidate" />
-    <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="invalidate" />
+    <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1533" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1535" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1536" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="1537" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="1538" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="1540" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1541" type="void" name="maskBounds" >
@@ -2649,17 +2649,17 @@ in the constructor, you have to call loadAsync.
     <UML:Operation visibility="public" xmi.id="2090" type="" name="KisRenderInterface" >
      <UML:Parameter visibility="private" xmi.id="2091" value="" type="const KisRenderInterface &amp;" name="rhs" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="tqinvalidate" />
-    <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="invalidate" />
+    <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="2094" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="2096" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="2097" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="2098" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="2099" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" >
+    <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="invalidate" >
      <UML:Parameter visibility="private" xmi.id="2101" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2102" type="virtual Q_INT32" isAbstract="true" name="tileNum" >
@@ -3926,10 +3926,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1353" label="index" />
       <listitem open="0" type="815" id="1351" label="index" />
       <listitem open="0" type="815" id="1355" label="init" />
-      <listitem open="0" type="815" id="1362" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1361" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1369" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1364" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1362" label="invalidate" />
+      <listitem open="0" type="815" id="1361" label="invalidate" />
+      <listitem open="0" type="815" id="1369" label="invalidate" />
+      <listitem open="0" type="815" id="1364" label="invalidate" />
       <listitem open="0" type="815" id="1371" label="layer" />
       <listitem open="0" type="815" id="1373" label="layer" />
       <listitem open="0" type="815" id="1375" label="layers" />
@@ -4126,10 +4126,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1526" label="height" />
       <listitem open="0" type="815" id="1529" label="image" />
       <listitem open="0" type="815" id="1530" label="init" />
-      <listitem open="0" type="815" id="1532" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1531" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1539" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1534" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1532" label="invalidate" />
+      <listitem open="0" type="815" id="1531" label="invalidate" />
+      <listitem open="0" type="815" id="1539" label="invalidate" />
+      <listitem open="0" type="815" id="1534" label="invalidate" />
       <listitem open="0" type="815" id="1541" label="maskBounds" />
       <listitem open="0" type="815" id="1543" label="maskBounds" />
       <listitem open="0" type="815" id="1548" label="move" />
@@ -4263,10 +4263,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="2087" label="=" />
       <listitem open="0" type="815" id="2089" label="KisRenderInterface" />
       <listitem open="0" type="815" id="2090" label="KisRenderInterface" />
-      <listitem open="0" type="815" id="2093" label="tqinvalidate" />
-      <listitem open="0" type="815" id="2095" label="tqinvalidate" />
-      <listitem open="0" type="815" id="2092" label="tqinvalidate" />
-      <listitem open="0" type="815" id="2100" label="tqinvalidate" />
+      <listitem open="0" type="815" id="2093" label="invalidate" />
+      <listitem open="0" type="815" id="2095" label="invalidate" />
+      <listitem open="0" type="815" id="2092" label="invalidate" />
+      <listitem open="0" type="815" id="2100" label="invalidate" />
       <listitem open="0" type="815" id="2102" label="tileNum" />
       <listitem open="0" type="815" id="2105" label="tiles" />
       <listitem open="0" type="815" id="2106" label="validate" />
@@ -4535,9 +4535,9 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="359" label="duplicate" />
       <listitem open="0" type="815" id="362" label="empty" />
       <listitem open="0" type="815" id="363" label="height" />
-      <listitem open="0" type="815" id="364" label="tqinvalidate" />
-      <listitem open="0" type="815" id="370" label="tqinvalidate" />
-      <listitem open="0" type="815" id="368" label="tqinvalidate" />
+      <listitem open="0" type="815" id="364" label="invalidate" />
+      <listitem open="0" type="815" id="370" label="invalidate" />
+      <listitem open="0" type="815" id="368" label="invalidate" />
       <listitem open="0" type="815" id="373" label="invalidateTile" />
       <listitem open="0" type="815" id="376" label="invalidateTiles" />
       <listitem open="0" type="815" id="378" label="memSize" />
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 7d2427134..ceacf630a 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -3219,12 +3219,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1726" isRoot="false" initialValue="" type="1701" isAbstract="false" name="m_ac" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1751" isRoot="false" initialValue="" type="1750" isAbstract="false" name="m_toolDockManager" />
       <UML:Attribute comment="// Sliders" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1753" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_layerchannelslider" />
-      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_tqshapesslider" />
+      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_shapesslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1755" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_fillsslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1756" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_toolcontrolslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1757" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_colorslider" />
       <UML:Attribute comment="// Dockers" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1759" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_layerchanneldocker" />
-      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_tqshapesdocker" />
+      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_shapesdocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1761" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_fillsdocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1762" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_toolcontroldocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1763" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_colordocker" />
@@ -36138,7 +36138,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="// Sliders" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
+          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -36163,7 +36163,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="// Dockers" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
+          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -36382,14 +36382,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
                 <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
+              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
               <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
@@ -36432,14 +36432,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
                 <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
               <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
@@ -36982,19 +36982,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
+       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
+       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
@@ -37082,19 +37082,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
diff --git a/chalk/doc/selections b/chalk/doc/selections
index 32bffe498..37d787022 100644
--- a/chalk/doc/selections
+++ b/chalk/doc/selections
@@ -117,7 +117,7 @@ discarded.
 
 If a transform is applied to a image, all layers are transformed. The 
 selection is transformed, too: in the new situation, the layer that has a 
-selection active still has a selection, but the tqshape of the selection is 
+selection active still has a selection, but the shape of the selection is 
 transformed.
 
 If a layer is moved, the selection moves with the layer (this is not 
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc
index 0217b7e17..8d3604974 100644
--- a/chalk/plugins/filters/blur/kis_blur_filter.cc
+++ b/chalk/plugins/filters/blur/kis_blur_filter.cc
@@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w)
         config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() );
         config->setProperty("rotate", wCTA->widget()->intAngle->value() );
         config->setProperty("strength", wCTA->widget()->intStrength->value() );
-        config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem());
+        config->setProperty("shape", wCTA->widget()->cbShape->currentItem());
     }
     return config;
 }
@@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
     if(!config) config = new KisFilterConfiguration(id().id(), 1);
 
     TQVariant value;
-    int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0;
+    int shape = (config->getProperty("shape", value)) ? value.toInt() : 0;
     uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5;
     uint width = 2 * halfWidth + 1;
     uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5;
@@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
 
     KisAutobrushShape* kas;
     kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl;
-    switch(tqshape)
+    switch(shape)
     {
         case 1:
             kas = new KisAutobrushRectShape(width, height , hFade, vFade);
diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc
index dc836971f..d4213bb58 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cc
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc
@@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name
 void KisWdgBlur::setConfiguration(KisFilterConfiguration* config)
 {
     TQVariant value;
-    if (config->getProperty("tqshape", value))
+    if (config->getProperty("shape", value))
     {
         widget()->cbShape->setCurrentItem( value.toUInt() );
     }
diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
index 4e1bdf431..2934623a8 100644
--- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
+++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
@@ -52,7 +52,7 @@ layer, the current layer will be used.</string>
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -82,7 +82,7 @@ layer, the current layer will be used.</string>
             <property name="title">
                 <string>Settings</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignAuto</set>
             </property>
             <grid>
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index abd1bb66c..23c7e221e 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -3749,8 +3749,8 @@ namespace cimg_library {
         then this image is displayed in the current display window.
         \param list     : The list of images to display.
         \param axe      : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'.
-        \param align : Defines the relative tqalignment of images when displaying images of different sizes.
-        Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment).
+        \param align : Defines the relative alignment of images when displaying images of different sizes.
+        Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment).
 
         \see CImg::get_append()
     **/
@@ -7772,7 +7772,7 @@ namespace cimg_library {
 
     //! Return a resized image.
     /**
-       \param src = Image giving the tqgeometry of the resize.
+       \param src = Image giving the geometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7788,7 +7788,7 @@ namespace cimg_library {
 
     //! Return a resized image.
     /**
-       \param disp = Display giving the tqgeometry of the resize.
+       \param disp = Display giving the geometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7830,7 +7830,7 @@ namespace cimg_library {
 
     //! Resize the image.
     /**
-       \param src = Image giving the tqgeometry of the resize.
+       \param src = Image giving the geometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7846,7 +7846,7 @@ namespace cimg_library {
 
     //! Resize the image
     /**
-       \param disp = Display giving the tqgeometry of the resize.
+       \param disp = Display giving the geometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -12881,7 +12881,7 @@ namespace cimg_library {
        \param sharpness = define the contour preservation.
        \param anisotropy = define the smoothing anisotropy.
        \param alpha = image pre-blurring (gaussian).
-       \param sigma = regularity of the tensor-valued tqgeometry.
+       \param sigma = regularity of the tensor-valued geometry.
        \param dl = spatial discretization.
        \param da = angular discretization.
        \param gauss_prec = precision of the gaussian function.
@@ -17550,7 +17550,7 @@ namespace cimg_library {
     //! Return a single image which is the concatenation of all images of the current CImgl instance.
     /**
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \return A CImg<T> image corresponding to the concatenation is returned.
     **/
     CImg<T> get_append(const char axe='x',const char align='c') const {
@@ -17740,7 +17740,7 @@ namespace cimg_library {
        The function returns immediately.
        \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \return A reference to the current CImgl instance is returned.
     **/
     const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { 
@@ -17755,7 +17755,7 @@ namespace cimg_library {
        The function returns when a key is pressed or the display window is closed by the user.
        \param title : specify the title of the opening display window.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \param min_size : specify the minimum size of the opening display window. Images having dimensions below this
        size will be upscaled.
        \param max_size : specify the maximum size of the opening display window. Images having dimensions above this
@@ -17774,7 +17774,7 @@ namespace cimg_library {
        Images of the list are concatenated in a single temporarly image for visualization purposes.
        The function returns when a key is pressed or the display window is closed by the user.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \param min_size : specify the minimum size of the opening display window. Images having dimensions below this
        size will be upscaled.
        \param max_size : specify the maximum size of the opening display window. Images having dimensions above this
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
index 665dfc098..9c3a7543d 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
@@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint()
 
 bool KisCImgFilter::prepare_resize()
 {
-    const char *geom  = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry");
+    const char *geom  = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry");
     const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels");
     if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)");
     int w,h; get_geom(geom,w,h);
@@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize()
 
 bool KisCImgFilter::prepare_visuflow()
 {
-    const char *geom     = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry");
+    const char *geom     = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry");
     //const char *file_i   = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image");
     const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow");
 
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index a97f809bd..e12243010 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
         }
         n = n.nextSibling();
     }
-    // If the adjustment was cached, it now has changed - tqinvalidate it
+    // If the adjustment was cached, it now has changed - invalidate it
     delete m_adjustment;
     m_adjustment = 0;
 }
diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
index 2e8496581..8cd59c000 100644
--- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
+++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
@@ -193,7 +193,7 @@
                     <property name="text">
                         <string>Contrast</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -226,7 +226,7 @@
                     <property name="text">
                         <string>Brightness</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc
index 7b836436e..b36e5ce97 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.cc
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc
@@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *)
     /*if (!m_dragging) {*/
         TQPixmap pm(size());
         TQPainter p1;
-        p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+        p1.begin(TQT_TQPAINTDEVICE(&pm), this);
 
         pm.fill();
 
@@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )
             m_gamma = 1.0 / pow (10, tmp);
             break;
        }
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
@@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
         return;
 
     m_dragging = false;
-    tqrepaint(false);
+    repaint(false);
 
     switch (m_grab_cursor) {
         case BlackCursor:
@@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e )
         }
     }
 
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KGradientSlider::leaveEvent( TQEvent * )
@@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * )
 void KGradientSlider::enableGamma(bool b)
 {
     m_gammaEnabled = b;
-    tqrepaint(false);
+    repaint(false);
 }
 
 double KGradientSlider::getGamma(void)
@@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) {
             double tmp   = log10 (1.0 / m_gamma);
             m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
         }
-        tqrepaint(false);
+        repaint(false);
     }
 }
 void KGradientSlider::modifyWhite(int v) {
@@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) {
             double tmp   = log10 (1.0 / m_gamma);
             m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
         }
-        tqrepaint(false);
+        repaint(false);
     }
 }
 void KGradientSlider::modifyGamma(double v) {
@@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) {
     double mid   = (double)m_blackcursor + delta;
     double tmp   = log10 (1.0 / m_gamma);
     m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
-    tqrepaint(false);
+    repaint(false);
 }
 
 #include "kgradientslider.moc"
diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui
index 15dcff1ff..6ce5874b7 100644
--- a/chalk/plugins/filters/levelfilter/wdg_level.ui
+++ b/chalk/plugins/filters/levelfilter/wdg_level.ui
@@ -148,7 +148,7 @@
                                     <property name="text">
                                         <string>1.0</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignCenter</set>
                                     </property>
                                 </widget>
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
index e7537c277..346ff44a1 100644
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
@@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intHAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("horizontaltqshape", value))
+    if (config->getProperty("horizontalshape", value))
     {
         widget()->cbHShape->setCurrentItem( value.toUInt() );
     }
@@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intVAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("verticaltqshape", value))
+    if (config->getProperty("verticalshape", value))
     {
         widget()->cbVShape->setCurrentItem( value.toUInt() );
     }
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc
index ddcfc4bd4..a7a9264e9 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cc
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cc
@@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w)
         config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() );
         config->setProperty("horizontalshift", wN->widget()->intHShift->value() );
         config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() );
-        config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() );
+        config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() );
         config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() );
         config->setProperty("verticalshift", wN->widget()->intVShift->value() );
         config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() );
-        config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() );
+        config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() );
     }
     return config;
 }
@@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
     int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50;
     int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50;
     int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4;
-    int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0;
+    int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0;
     int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50;
     int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50;
     int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4;
-    int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0;
+    int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0;
     KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true );
     KisWaveCurve* verticalcurve;
-    if(verticaltqshape == 1)
+    if(verticalshape == 1)
         verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     else
         verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     KisWaveCurve* horizontalcurve;
-    if(horizontaltqshape == 1)
+    if(horizontalshape == 1)
         horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
     else
         horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index c5f938642..7338ef545 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
@@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
 //
 // Most graphics apps -- especially the simple ones like Kolourpaint
 // and the previous version of this routine in Chalk took a brush
-// tqshape -- often a simple ellipse -- and filled that tqshape with a
+// shape -- often a simple ellipse -- and filled that shape with a
 // random 'spray' of single pixels.
 //
 // Other, more advanced graphics apps, like the Gimp or Photoshop,
-// take the brush tqshape and paint just as with the brush paint op,
+// take the brush shape and paint just as with the brush paint op,
 // only making the initial dab more transparent, and perhaps adding
 // extra transparence near the edges. Then, using a timer, when the
 // cursor stays in place, dab upon dab is positioned in the same
 // place, which makes the result less and less transparent.
 //
 // What I want to do here is create an airbrush that approaches a real
-// one. It won't use brush tqshapes, instead going for the old-fashioned
+// one. It won't use brush shapes, instead going for the old-fashioned
 // circle. Depending upon pressure, both the size of the dab and the
 // rate of paint deposition is determined. The edges of the dab are
 // more transparent than the center, with perhaps even some fully
@@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
 
     KisPaintDeviceSP device = m_painter->device();
 
-    // For now: use the current brush tqshape -- it beats calculating
+    // For now: use the current brush shape -- it beats calculating
     // ellipes and cones, and it shows the working of the timer.
     if (!device) return;
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 6aff68c8d..3eb7468d6 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)
             palette->add(ent);
 
             if (!palette->save()) {
-                KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette"));
+                KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette"));
             }
         }
     }
@@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor()
             TQString channelValueText;
 
             if (m_normaliseValues) {
-                channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
+                channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
             } else {
                 channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i);
             }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 6df9f8da4..b29e5e3af 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient()
     m_endPos = KisPoint(0, 0);
 
     m_reverse = false;
-    m_tqshape = KisGradientPainter::GradientShapeLinear;
+    m_shape = KisGradientPainter::GradientShapeLinear;
     m_repeat = KisGradientPainter::GradientRepeatNone;
     m_antiAliasThreshold = 0.2;
 }
@@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e)
                 progress->setSubject(&painter, true, true);
             }
 
-            bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());
+            bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());
 
             if (painted) {
                 // does whole thing at moment
@@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check");
     connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool)));
 
-    m_cmbShape = new TQComboBox(false, widget, "tqshape_combo");
+    m_cmbShape = new TQComboBox(false, widget, "shape_combo");
     connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int)));
     m_cmbShape->insertItem(i18n("Linear"));
     m_cmbShape->insertItem(i18n("Bi-Linear"));
@@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     return widget;
 }
 
-void KisToolGradient::slotSetShape(int tqshape)
+void KisToolGradient::slotSetShape(int shape)
 {
-    m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape);
+    m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape);
 }
 
 void KisToolGradient::slotSetRepeat(int repeat)
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
index 29df8bf7b..08ab06abb 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
@@ -88,7 +88,7 @@ private:
 
     KisCanvasSubject *m_subject;
 
-    KisGradientPainter::enumGradientShape m_tqshape;
+    KisGradientPainter::enumGradientShape m_shape;
     KisGradientPainter::enumGradientRepeat m_repeat;
 
     bool m_reverse;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index bf23b4412..392fa2126 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
 
 void KisToolText::setFont() {
     KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
-    m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
+    m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
 }
 
 TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
@@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
 
     TQHBox *fontBox = new TQHBox(widget);
     m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1")
-        .tqarg(m_font.pointSize()), fontBox);
+        .arg(m_font.pointSize()), fontBox);
     m_btnMoreFonts = new TQPushButton("...", fontBox);
 
     connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont()));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
index faeb32d8b..9fd07e6dd 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
@@ -32,7 +32,7 @@ class KisSelectionOptions;
 
 /**
  * The selection brush creates a selection by painting with the current
- * brush tqshape. Not sure what kind of an icon could represent this... 
+ * brush shape. Not sure what kind of an icon could represent this... 
  * Depends a bit on how we're going to visualize selections.
  */
 class KisToolSelectBrush : public KisToolFreehand {
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index d16ab740e..3028d1210 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e)
                 rc = rc.normalize();
                 
                 KisSelectionSP tmpSel = new KisSelection(dev);
-                KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1);
+                KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1);
                 TQ_UINT8 value;
                 for (int y = 0; y <= rc.height(); y++)
                     for (int x = 0; x <= rc.width(); x++)
                     {
-                        value = MAX_SELECTED - tqshape.valueAt(x,y);
+                        value = MAX_SELECTED - shape.valueAt(x,y);
                         tmpSel->setSelected( x+rc.x(), y+rc.y(), value);
                     }
                 switch(m_selectAction)
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
index c796ec3c7..cb8b82ed2 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
@@ -30,7 +30,7 @@ class KisSelectionOptions;
 
 /**
  * The selection eraser makes a selection smaller by painting with the
- * current eraser tqshape. Not sure what kind of an icon could represent
+ * current eraser shape. Not sure what kind of an icon could represent
  * this... Depends a bit on how we're going to visualize selections.
  */
 class KisToolSelectEraser : public KisToolFreehand {
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 8f5c9e5f8..371075088 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&)
         gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height());
         gc.drawLine(endx,0,endx,starty - m_handleSize / 2);
         gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty);
-        TQMemArray <TQRect> rects = m_handlesRegion.tqrects ();
+        TQMemArray <TQRect> rects = m_handlesRegion.rects ();
         for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it)
         {
             gc.fillRect (*it, TQt::black);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
index c2a3715b0..582c89cd7 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
@@ -57,7 +57,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); }
+    virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); }
 };
 
 #endif //__KIS_TOOL_CURVE_PAINT_H_
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h
index e7bfd89ef..ad77204ec 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h
@@ -60,7 +60,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); }
+    virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); }
 };
 
 
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h
index 947dae25c..8128dcdf3 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.h
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.h
@@ -94,7 +94,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); }
+    virtual KisID id() { return KisID("starshape", i18n("Star Tool")); }
 };
 
 
diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
index 445231f7a..8be9071b8 100644
--- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
+++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
@@ -178,7 +178,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
index 6dba5c01f..4655a4d90 100644
--- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
+++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
@@ -233,7 +233,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
index 0498505d1..00c0c8200 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
@@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion()
         if (KMessageBox::warningContinueCancel(m_view,
             i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n"
                     "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
-                    .tqarg(image->colorSpace()->id().name()),
+                    .arg(image->colorSpace()->id().name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
             "lab16degradation") != KMessageBox::Continue) return;
@@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion()
         if (KMessageBox::warningContinueCancel(m_view,
             i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n"
                     "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
-                    .tqarg(dev->colorSpace()->id().name()),
+                    .arg(dev->colorSpace()->id().name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
             "lab16degradation") != KMessageBox::Continue) return;
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
index 854dcd0af..8e8ca43df 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
@@ -197,7 +197,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -214,7 +214,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -307,7 +307,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
index 13cd72a8c..b9b3e400a 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
@@ -76,7 +76,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -93,7 +93,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
index d3a8326a9..72a70c8a3 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
@@ -96,7 +96,7 @@
                     <property name="text">
                         <string>100</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc
index 8a137374a..b88dac9d9 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cc
@@ -140,7 +140,7 @@ void PerfTest::slotPerfTest()
         }
         if (dlgPerfTest->page()->chkShape->isChecked()) {
             kdDebug() << "Shapetest\n";
-            TQString s = tqshapeTest(testCount);
+            TQString s = shapeTest(testCount);
             report = report.append(s);
             kdDebug() << s << "\n";
         }
@@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n")
-                   .tqarg(testCount)
-                   .tqarg(opacity)
-                   .tqarg(op.id().name())
-                   .tqarg(t.elapsed()));
+                   .arg(testCount)
+                   .arg(opacity)
+                   .arg(op.id().name())
+                   .arg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n")
-                   .tqarg(testCount)
-                   .tqarg(opacity)
-                   .tqarg(op.id().name())
-                   .tqarg(t.elapsed()));
+                   .arg(testCount)
+                   .arg(opacity)
+                   .arg(op.id().name())
+                   .arg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     }
     p.end();
     report = report.append(TQString("   %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n")
-                   .tqarg(testCount)
-                   .tqarg(opacity)
-                   .tqarg(op.id().name())
-                   .tqarg(t.elapsed()));
+                   .arg(testCount)
+                   .arg(opacity)
+                   .arg(op.id().name())
+                   .arg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     }
     p.end();
     report = report.append(TQString("   %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n")
-                   .tqarg(testCount)
-                   .tqarg(opacity)
-                   .tqarg(op.id().name())
-                   .tqarg(t.elapsed()));
+                   .arg(testCount)
+                   .arg(opacity)
+                   .arg(op.id().name())
+                   .arg(t.elapsed()));
 
     // ------------------------------------------------------------------------------
     // Small with varied source opacity
@@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n")
-                   .tqarg(testCount)
-                   .tqarg(opacity)
-                   .tqarg(op.id().name())
-                   .tqarg(t.elapsed()));
+                   .arg(testCount)
+                   .arg(opacity)
+                   .arg(op.id().name())
+                   .arg(t.elapsed()));
 
     return report;
 
@@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(0, 0, 1000, 1000);
         }
-        report = report.append(TQString("    Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(50, 50, 500, 500);
         }
-        report = report.append(TQString("    Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(-50, -50, 1100, 1100);
         }
-        report = report.append(TQString("    Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         // Opaque Rect fill
@@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
         // Transparent rect fill
 
@@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
         // Colour fill
 
@@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
             p.setCompositeOp(COMPOSITE_OVER);
             p.fillColor(0,0);
         }
-        report = report.append(TQString("    Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
         // Pattern fill
@@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
             p.setCompositeOp(COMPOSITE_OVER);
             p.fillPattern(0,0);
         }
-        report = report.append(TQString("    Opaque patternfill  of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    Opaque patternfill  of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
 
 
@@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
                 }
             }
          }
-        report = report.append(TQString("    read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
         c= TQt::black;
          t.restart();
@@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
                 }
             }
          }
-        report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
     }
 
@@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
 
 }
 
-TQString PerfTest::tqshapeTest(TQ_UINT32 testCount)
+TQString PerfTest::shapeTest(TQ_UINT32 testCount)
 {
     return TQString("Shape test\n");
 }
@@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount)
                 delete img;
             }
         }
-        report = report.append(TQString("    rotated  1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+        report = report.append(TQString("    rotated  1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed()));
     }
     return report;
 }
@@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount)
                 img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,""));
                 delete img2;
             }
-            report = report.append(TQString("    converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+            report = report.append(TQString("    converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
         }
 
@@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount)
                 f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000));
                 f->disableProgress();
             }
-            report = report.append(TQString("    filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+            report = report.append(TQString("    filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
 
         }
 
@@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
         delete[] newData;
     }
 
-    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed()));
 
     // On tiles with data
 
@@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
         delete[] newData;
     }
 
-    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed()));
 
     return report;
 }
@@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount)
         l->writeBytes(data, 0, 0, 1000, 1000);
     }
     delete[] data;
-    report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+    report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
     return report;
 
 
@@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 
 
 }
@@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 }
 
 TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
@@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 
 
 }
@@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
 
 }
 
@@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount)
     }
 
 
-    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
 
 
 }
@@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
     CALLGRIND_DUMP_STATS();
 #endif
 
-    report = report.append(TQString("    painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
 
     img->newLayer("layer 2", OPACITY_OPAQUE);
     l = img->activeDevice();
@@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
         m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512));
     }
 
-    report = report.append(TQString("    painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
 
     return report;
 }
@@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest()
     CALLGRIND_DUMP_STATS();
 #endif
 
-    report = report.append(TQString("    painted current view at %1 frames per second\n").tqarg(numViewsPainted));
+    report = report.append(TQString("    painted current view at %1 frames per second\n").arg(numViewsPainted));
 
     return report;
 }
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h
index cbd8799fb..959233e4c 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.h
+++ b/chalk/plugins/viewplugins/performancetest/perftest.h
@@ -46,7 +46,7 @@ private:
     TQString fillTest(TQ_UINT32 testCount);
     TQString gradientTest(TQ_UINT32 testCount);
     TQString pixelTest(TQ_UINT32 testCount);
-    TQString tqshapeTest(TQ_UINT32 testCount);
+    TQString shapeTest(TQ_UINT32 testCount);
     TQString layerTest(TQ_UINT32 testCount);
     TQString scaleTest(TQ_UINT32 testCount);
     TQString rotateTest(TQ_UINT32 testCount);
diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
index 450f8fda0..841341f7b 100644
--- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
+++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
@@ -65,7 +65,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -96,7 +96,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index 6e942c389..2a4c5029f 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url )
 
         TQString caption = i18n("Unable to Save Image");
         TQString text = i18n("KSnapshot was unable to save the image to\n%1.")
-            .tqarg(url.prettyURL());
+            .arg(url.prettyURL());
         KMessageBox::error(this, text, caption);
     }
 
@@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 )
             return w;
     }
     Window root, parent;
-    Window* tqchildren;
-    unsigned int ntqchildren;
+    Window* children;
+    unsigned int nchildren;
     Window ret = None;
-    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
+    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
         for( unsigned int i = 0;
-             i < ntqchildren && ret == None;
+             i < nchildren && ret == None;
              ++i )
-            ret = findRealWindow( tqchildren[ i ], depth + 1 );
-        if( tqchildren != NULL )
-            XFree( tqchildren );
+            ret = findRealWindow( children[ i ], depth + 1 );
+        if( children != NULL )
+            XFree( children );
     }
     return ret;
 }
@@ -365,12 +365,12 @@ void KSnapshot::performGrab()
         h += 2 * border;
 
         Window parent;
-        Window* tqchildren;
-        unsigned int ntqchildren;
+        Window* children;
+        unsigned int nchildren;
         if( XQueryTree( qt_xdisplay(), child, &root, &parent,
-                &tqchildren, &ntqchildren ) != 0 ) {
-            if( tqchildren != NULL )
-                XFree( tqchildren );
+                &children, &nchildren ) != 0 ) {
+            if( children != NULL )
+                XFree( children );
             int newx, newy;
             Window dummy;
             if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(),
@@ -390,7 +390,7 @@ void KSnapshot::performGrab()
             int count, order;
             XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child,
                                  ShapeBounding, &count, &order);
-            //The ShapeBounding region is the outermost tqshape of the window;
+            //The ShapeBounding region is the outermost shape of the window;
             //ShapeBounding - ShapeClipping is defined to be the border.
             //Since the border area is part of the window, we use bounding
             // to limit our work region
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 7d6e52f44..374033d6d 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name )
 
 void SizeTip::setTip( const TQRect &rect )
 {
-  TQString tip = TQString( "%1x%2" ).tqarg( rect.width() )
-      .tqarg( rect.height() );
+  TQString tip = TQString( "%1x%2" ).arg( rect.width() )
+      .arg( rect.height() );
 
   setText( tip );
   adjustSize();
@@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect )
 
 void SizeTip::positionTip( const TQRect &rect )
 {
-  TQRect tipRect = tqgeometry();
+  TQRect tipRect = geometry();
   tipRect.moveTopLeft( TQPoint( 0, 0 ) );
 
   if ( rect.intersects( tipRect ) )
@@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect )
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
     if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
-      tipRect.moveBottomRight( tqgeometry().bottomRight() );
+      tipRect.moveBottomRight( geometry().bottomRight() );
   }
 
   move( tipRect.topLeft() );
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index 04f7b6537..45c1705af 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
@@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args)
     KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), "");
     if(!cs)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) );
         return 0;
     }
 
@@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager)
     : Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0)
 {
 
-    TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
-    kdDebug(41011) << " there are " << tqchildren.size() << endl;
-    for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++)
+    TQMap<TQString, Object::Ptr> children = manager->getChildren();
+    kdDebug(41011) << " there are " << children.size() << endl;
+    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
     {
         kdDebug(41011) << it.key() << " " << it.data() << endl;
     }
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
index d719edd6e..5ddb004de 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
@@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore {
              */
             Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr);
             /**
-             * This function return a Brush with a circular tqshape
+             * This function return a Brush with a circular shape
              * It takes at least two arguments :
              *  - width
              *  - height
@@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore {
              */
             Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr);
             /**
-             * This function return a Brush with a rectangular tqshape
+             * This function return a Brush with a rectangular shape
              * It takes at least two arguments :
              *  - width
              *  - height
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
index ecac55013..e2f09a582 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
@@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args)
     PaintLayer* src = (PaintLayer*)args->item(0).data();
     if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace()))
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) );
     }
     TQRect rect;
     if( args->count() >1)
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
index c93d6e880..1486d4153 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
@@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args)
     KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), "");
     if(!dstCS)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
         return 0;
     }
     m_image->convertTo(dstCS);
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index b01ba0a89..0b22ebf56 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
                         pixel.push_back( *((float*) data) );
                         break;
                     default:
-                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl;
                         kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
                         break;
                 }
@@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
                         *((float*) data) = pixel[i].toDouble();
                         break;
                     default:
-                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl;
                         kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
                         break;
                 }
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
index 5f800f6ae..9f27adc6a 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
@@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args)
     {
         return new Histogram( paintLayer().data(), factory->generate() , type);
     } else {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) );
     }
     return 0;
 }
@@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar
     if(!dstCS)
     {
         // FIXME: inform user
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
         return 0;
     }
     paintLayer()->paintDevice()->convertTo(dstCS);
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
index 449913036..5aee14319 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
@@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
     TQVariant firstlineVariant = *kernelH.begin();
     if(firstlineVariant.type() != TQVariant::List)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
     }
     
     TQValueList<TQVariant> firstline = firstlineVariant.toList();
@@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
         TQVariant lineVariant = *kernelH.begin();
         if(lineVariant.type() != TQVariant::List)
         {
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
         }
         TQValueList<TQVariant> line = firstlineVariant.toList();
         if(line.size() != kernel.width)
         {
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
         }
         uint j = 0;
         for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ )
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
index e166de7cb..c8ef92c50 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
@@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args)
     TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0));
     if( n > m_numCoeff)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     return new Kross::Api::Variant(*(m_wavelet->coeffs + n ));
 }
@@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args)
     double v = Kross::Api::Variant::toDouble(args->item(1));
     if( n > m_numCoeff)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     *(m_wavelet->coeffs + n ) = v;
     return 0;
@@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args)
     TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1));
     if( x > m_wavelet->size && y > m_wavelet->size)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     return new Kross::Api::Variant(*(m_wavelet->coeffs  + (x + y * m_wavelet->size ) * m_wavelet->depth ));
 }
@@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args)
     double v = Kross::Api::Variant::toDouble(args->item(2));
     if( x > m_wavelet->size && y > m_wavelet->size)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
     }
     *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v;
     return 0;
diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
index 1ec25dcdd..7f6a9b05b 100644
--- a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
+++ b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
@@ -60,11 +60,11 @@ for i in 1..100
         painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
     end
     # paint a point
-    tqshape = rand * 7
+    shape = rand * 7
     painter.setStrokeStyle(1)
-    if( tqshape < 1 )
+    if( shape < 1 )
         painter.paintAt(rand * width , rand * height,1.1)
-    elsif(tqshape < 2 )
+    elsif(shape < 2 )
         xs = Array.new
         ys = Array.new
         for i in 0..6
@@ -72,14 +72,14 @@ for i in 1..100
             ys[i] = rand*height
         end
         painter.paintPolyline(xs,ys)
-    elsif(tqshape < 3)
+    elsif(shape < 3)
         painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1)
-    elsif(tqshape < 4)
+    elsif(shape < 4)
         painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1)
-    elsif(tqshape < 5)
+    elsif(shape < 5)
         randomizeStyle(painter)
         painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1)
-    elsif(tqshape < 6)
+    elsif(shape < 6)
         xs = Array.new
         ys = Array.new
         for i in 0..6
@@ -88,7 +88,7 @@ for i in 1..100
         end
         randomizeStyle(painter)
         painter.paintPolygon(xs, ys)
-    elsif(tqshape < 7)
+    elsif(shape < 7)
         randomizeStyle(painter)
         painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1)
     end
diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
index b7c784fc1..68610cc58 100644
--- a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
+++ b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
@@ -91,11 +91,11 @@ class TorturePainting
                 painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
             end
             # paint a point
-            tqshape = rand * 7
+            shape = rand * 7
             painter.setStrokeStyle(1)
-            if( tqshape < 1 )
+            if( shape < 1 )
                 painter.paintAt(rand * @width , rand * @height,1.1)
-            elsif(tqshape < 2 )
+            elsif(shape < 2 )
                 xs = Array.new
                 ys = Array.new
                 for i in 0..6
@@ -103,14 +103,14 @@ class TorturePainting
                     ys[i] = rand*@height
                 end
                 painter.paintPolyline(xs,ys)
-            elsif(tqshape < 3)
+            elsif(shape < 3)
                 painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1)
-            elsif(tqshape < 4)
+            elsif(shape < 4)
                 painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(tqshape < 5)
+            elsif(shape < 5)
                 randomizeStyle(painter)
                 painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(tqshape < 6)
+            elsif(shape < 6)
                 xs = Array.new
                 ys = Array.new
                 for i in 0..6
@@ -119,7 +119,7 @@ class TorturePainting
                 end
                 randomizeStyle(painter)
                 painter.paintPolygon(xs, ys)
-            elsif(tqshape < 7)
+            elsif(shape < 7)
                 randomizeStyle(painter)
                 painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
             end
diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui
index 41553bd2c..45795b42b 100644
--- a/chalk/plugins/viewplugins/variations/wdg_variations.ui
+++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui
@@ -121,7 +121,7 @@
                 <property name="text">
                     <string>Current Pick</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -132,7 +132,7 @@
                 <property name="text">
                     <string>Original</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -348,7 +348,7 @@
                         <property name="text">
                             <string>Lighter</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -390,7 +390,7 @@
                         <property name="text">
                             <string>Current Pick</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -432,7 +432,7 @@
                         <property name="text">
                             <string>Darker</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -531,7 +531,7 @@
             <property name="text">
                 <string>More Red</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -550,7 +550,7 @@
             <property name="text">
                 <string>More Cyan</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -608,7 +608,7 @@
             <property name="text">
                 <string>More Green</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -744,7 +744,7 @@
             <property name="text">
                 <string>Current Pick</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -763,7 +763,7 @@
             <property name="text">
                 <string>More Yellow</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -863,7 +863,7 @@
             <property name="text">
                 <string>More Magenta</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -882,7 +882,7 @@
             <property name="text">
                 <string>More Blue</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/chalk/sdk/kis_canvas_controller.h b/chalk/sdk/kis_canvas_controller.h
index 6ed8f1b94..bdcb3ab0e 100644
--- a/chalk/sdk/kis_canvas_controller.h
+++ b/chalk/sdk/kis_canvas_controller.h
@@ -68,19 +68,19 @@ public:
     virtual void scrollTo(TQ_INT32 x, TQ_INT32 y) = 0;
     
     /**
-     * Tell all of the canvas to tqrepaint itself.
+     * Tell all of the canvas to repaint itself.
      */
     virtual void updateCanvas() = 0;
 
 
     /**
-     * Tell the canvas to tqrepaint the rectangle defined by x, y, w and h.
+     * Tell the canvas to repaint the rectangle defined by x, y, w and h.
      * The coordinates are image coordinates.
      */
     virtual void updateCanvas(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) = 0;
 
     /**
-     * Tell the canvas tqrepaint the specified rectangle. The coordinates
+     * Tell the canvas repaint the specified rectangle. The coordinates
      * are image coordinates, not view coordinates.
      */
     virtual void updateCanvas(const TQRect& rc) = 0;
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index c7f9e0ad8..1d7932cb4 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;
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KCurve::setCurveGuide(TQColor color)
 {
     m_guideVisible = true;
     m_colorGuide   = color;
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KCurve::setPixmap(TQPixmap pix)
 {
     if (m_pix) delete m_pix;
     m_pix = new TQPixmap(pix);
-    tqrepaint(false);
+    repaint(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;
-        tqrepaint(false);
+        repaint(false);
     }
     else
         TQWidget::keyPressEvent(e);
@@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *)
     
     TQPixmap pm(size());
     TQPainter p1;
-    p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+    p1.begin(TQT_TQPAINTDEVICE(&pm), this);
     
     //  draw background
     if(m_pix)
@@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e )
         }
         p = m_points.next();
     }
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
@@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
     
     setCursor( KCursor::arrowCursor() );    
     m_dragging = false;
-    tqrepaint(false);
+    repaint(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 tqshape if on top
+    if (m_dragging == false)   // If no point is selected set the the cursor shape if on top
     {
         double distance = 1000;
         double ydistance = 1000;
@@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
         emit modified();
     }
         
-    tqrepaint(false);
+    repaint(false);
 }
 
 double KCurve::getCurveValue(double x)
diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc
index 318bf3055..bd5b80fb4 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->tqrepaint();
+    gradientSlider->repaint();
 
     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->tqrepaint(false);
+    gradientSlider->repaint(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->tqrepaint(false);
+    gradientSlider->repaint(false);
 
     paramChanged();
 }
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index 20de3c5b7..894db607e 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -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)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height());
+        TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(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 168724186..d38c7ea10 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::tqrepaint()
+void KisCanvas::repaint()
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint();
+    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint();
 }
 
-void KisCanvas::tqrepaint(bool erase)
+void KisCanvas::repaint(bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase);
 }
 
-void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase)
+void KisCanvas::repaint(int x, int y, int width, int height, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase);
 }
 
-void KisCanvas::tqrepaint(const TQRect& r, bool erase)
+void KisCanvas::repaint(const TQRect& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
 }
 
-void KisCanvas::tqrepaint(const TQRegion& r, bool erase)
+void KisCanvas::repaint(const TQRegion& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
 }
 
 bool KisCanvas::isUpdatesEnabled() const
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index 4d92a4ce9..5f7174688 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 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 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 updateGeometry();
 
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index f84bf24d1..ac762953e 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.")
-                                   .tqarg(m_palette->filename()), i18n("Palette"));
+                                   .arg(m_palette->filename()), i18n("Palette"));
         return;
     }
 
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index f898b497b..14b19c8bb 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -383,7 +383,7 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
                                                                           TQWidget *parent, const char *name)
     : super(parent, name, true, "", Ok | Cancel)
 {
-    setCaption(i18n("Configure %1").tqarg(deviceName));
+    setCaption(i18n("Configure %1").arg(deviceName));
 
     m_page = new WdgTabletDeviceSettings(this);
 
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 6bae7e781..70141dead 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(tqchildren());
+    TQPtrListIterator<KoDocumentChild> it(children());
     for( ; it.current(); ++it ) {
         if (!it.current()->loadDocument(store)) {
             return false;
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index dc5beadf1..24569402f 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -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").tqarg((*it) . id()).ascii());
+                                  TQString("chalk_filter_%1").arg((*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. ")
-                                                       .tqarg(m_lastFilter->id().name())
-                                                       .tqarg(dev->colorSpace()->id().name()),
+                                                       .arg(m_lastFilter->id().name())
+                                                       .arg(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. ")
-                                                       .tqarg(m_lastFilter->id().name())
-                                                       .tqarg(dev->colorSpace()->id().name()),
+                                                       .arg(m_lastFilter->id().name())
+                                                       .arg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "rgba8degradation") != KMessageBox::Continue) return;
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 10d20796d..a8fdf71e7 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
             emit sigSelectedSegment( m_selectedSegment );
         }
     }
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e )
@@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e )
     if ( m_drag != NO_DRAG)
         emit sigChangedSegment( m_currentSegment );
 
-    tqrepaint(false);
+    repaint(false);
 }
 
 void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e )
@@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id )
             break;
     }
     emit sigSelectedSegment( m_selectedSegment );
-    tqrepaint(false);
+    repaint(false);
 }
 
 #include "kis_gradient_slider_widget.moc"
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index e9a1bf2dd..28235e8bc 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -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").tqarg(filename),
+        KMessageBox::error(0, i18n("Cannot find %1").arg(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]").tqarg( s );
+        s = TQString("[%1]").arg( 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]").tqarg( s );
+        s = TQString("[%1]").arg( 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 985bd0c69..24ae27382 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.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() );
+    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() );
     if( KisPaintLayer *player = dynamic_cast<KisPaintLayer*>( m_layer ) )
     {
-        text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() );
+        text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() );
         if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() )
-            text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() );
+            text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() );
     }
     if( KisAdjustmentLayer *alayer = dynamic_cast<KisAdjustmentLayer*>( m_layer ) )
-        text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() );
+        text += row.arg( i18n( "Filter: " ) ).arg( 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.tqarg( i18n( "Document type: " ) ).tqarg( type );
+        text += row.arg( i18n( "Document type: " ) ).arg( type );
     }
     text += "</table>";
 
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 20197dd26..30c2c8e95 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget()
     if (m_optionWidget != 0) {
         m_layout->remove(m_optionWidget);
         m_optionWidget->hide();
-        m_layout->tqinvalidate();
+        m_layout->invalidate();
     }
 
     const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice());
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index ace299654..5846a67b3 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 tqrepaint where we currently updated
-    // We use the original tqgeometry
+    // We probably changed, notify the image that it needs to repaint where we currently updated
+    // We use the original geometry
     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->tqgeometry());
+        setDirty(m_doc->geometry());
     }
 }
 
 void KisPartLayerImpl::setX(TQ_INT32 x) {
-    TQRect rect = m_doc->tqgeometry();
+    TQRect rect = m_doc->geometry();
 
     // 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->tqgeometry();
+    TQRect rect = m_doc->geometry();
 
     // 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->tqgeometry();
+    TQRect rect = m_doc->geometry();
 
     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 d2ff10eb2..377b37a08 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->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 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 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 tqrepaint();
+    //void repaint();
     /// 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 70484b0a3..9dd990230 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -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)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height());
+        TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height());
 
         m_lbName->setText(text);
     }
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
index 6de1aac33..5bf891ac7 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.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped);
+        return m_painter.begin(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.tqbegin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
+    return m_painter.begin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
 }
 
 bool KisTQPaintDeviceCanvasPainter::end()
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc
index 327f09d7b..8a8929a74 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)
-                tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
+                repaint(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)
-                tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
+                repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
 
             if (y != -1) {
                 bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH);
diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h
index 1205632b0..de98548cd 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").tqarg(m_count);
+        location += m_img->name() + TQString("/layers/layer%1").arg(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").tqarg(m_count) + ".icc";
+                location += m_img->name() + TQString("/layers/layer%1").arg(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").tqarg(m_count) + ".mask";
+                location += m_img->name() + TQString("/layers/layer%1").arg(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").tqarg(m_count) + ".selection";
+            location += m_img->name() + TQString("/layers/layer%1").arg(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").tqarg(m_count) + ".filterconfig";
+            location += m_img->name() + TQString("/layers/layer%1").arg(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 155807523..b5e3d9308 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").tqarg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").arg(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").tqarg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").arg(m_count));
         layerElement.setAttribute("x", layer->x());
         layerElement.setAttribute("y", layer->y());
         m_elem.appendChild(layerElement);
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index ad681c75d..b2ae9f365 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").tqarg(m_font.pointSize()));
+	lblFont->setText(TQString(m_font.family() + ", %1").arg(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 039e41905..807b8ffcc 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -56,7 +56,7 @@ KisTool::~KisTool()
 TQWidget* KisTool::createOptionWidget(TQWidget* parent)
 {
     
-    d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
+    d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent);
     d->optionWidget->setCaption(d->uiname);
     d->optionWidget->setAlignment(TQt::AlignCenter);
     return d->optionWidget;
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index b9abdc75d..bda3b7e74 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 tqshapes like ellipses and lines
+    TOOL_SHAPE = 0,   // Geometric shapes 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_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index adbf9b8ab..32ef617d9 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {
     }
 
     KisCanvas *canvas = controller->kiscanvas();
-    canvas->tqrepaint();
+    canvas->repaint();
 
     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_shape.cc b/chalk/ui/kis_tool_shape.cc
index 9e76f1596..7aba5a495 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -29,7 +29,7 @@
 
 KisToolShape::KisToolShape(const TQString& UIName) : super(UIName)
 {
-    m_tqshapeOptionsWidget = 0;
+    m_shapeOptionsWidget = 0;
     m_optionLayout = 0;
 }
 
@@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent)
 {
     TQWidget *widget = super::createOptionWidget(parent);
 
-    m_tqshapeOptionsWidget = new WdgGeometryOptions(0);
-    Q_CHECK_PTR(m_tqshapeOptionsWidget);
+    m_shapeOptionsWidget = new WdgGeometryOptions(0);
+    Q_CHECK_PTR(m_shapeOptionsWidget);
 
     m_optionLayout = new TQGridLayout(widget, 2, 1);
    // super::addOptionWidgetLayout(m_optionLayout);
 
-    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);
+    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);
 
     return widget;
 }
 
 KisPainter::FillStyle KisToolShape::fillStyle(void)
 {
-    if (m_tqshapeOptionsWidget) {
-        return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem());
+    if (m_shapeOptionsWidget) {
+        return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem());
     } else {
         return KisPainter::FillStyleNone;
     }
diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h
index e8974c791..45767fe4c 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_tqshapeOptionsWidget;
+        WdgGeometryOptions *m_shapeOptionsWidget;
 };
 
 #endif // KIS_TOOL_SHAPE_H_
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index eecfa659e..629072ffe 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -494,11 +494,11 @@ void KisView::setupRulers()
 void KisView::updateStatusBarZoomLabel ()
 {
     if (zoom() < 1 - EPSILON) {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4));
     } else {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0));
     }
-    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888  ")));
+    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("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").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height()));
+                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()));
                 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 tqrepaint of the image, but way too early
+    // XXX: This triggers a repaint of the image, but way too early
     //showRuler();
 
 }
@@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *)
 
             if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) {
 
-                TQMemArray<TQRect> rects = exposedRegion.tqrects();
+                TQMemArray<TQRect> rects = exposedRegion.rects();
 
                 for (unsigned int i = 0; i < rects.count(); i++) {
                     TQRect r = rects[i];
@@ -958,7 +958,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                     TQRegion rg(vr);
                     rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height())));
 
-                    TQMemArray<TQRect> rects = rg.tqrects();
+                    TQMemArray<TQRect> rects = rg.rects();
 
                     for (unsigned int i = 0; i < rects.count(); i++) {
                         TQRect er = rects[i];
@@ -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.tqrects();
+        TQMemArray<TQRect> rects = canvasRegion.rects();
 
         for (unsigned int i = 0; i < rects.count(); i++) {
             TQRect r = rects[i];
@@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect)
     } else {
         updateTQPaintDeviceCanvas(imageRect);
         //m_canvas->update(windowToView(imageRect));
-        m_canvas->tqrepaint(windowToView(imageRect));
+        m_canvas->repaint(windowToView(imageRect));
     }
 }
 
@@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas()
     updateCanvas(imageRect);
 
     // Enable this if updateCanvas does an m_canvas->update()
-    //m_canvas->tqrepaint();
+    //m_canvas->repaint();
 }
 
 void KisView::selectionDisplayToggled(bool displaySelection)
@@ -2965,7 +2965,7 @@ void KisView::layerDuplicate()
         return;
 
     KisLayerSP dup = active->clone();
-    dup->setName(i18n("Duplicate of '%1'").tqarg(active->name()));
+    dup->setName(i18n("Duplicate of '%1'").arg(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->tqrepaint();
+                m_canvas->repaint();
             }
         } 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->tqrepaint();
+                m_canvas->repaint();
             }
         }
 	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->tqrepaint();
+                m_canvas->repaint();
             }
         } 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->tqrepaint();
+                m_canvas->repaint();
             }
         }
 	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 tqreceivers that don't accept the tablet event.
+        // sent to receivers 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 = tqgeometry().contains(pt);
+            bool flag = geometry().contains(pt);
             KisGuideSP gd;
 
             if (m_currentGuide == 0 && flag) {
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 771e1ff87..033e0c19f 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v )
 
 void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos)
 {
-    m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5));
-    m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5));
+    m_page->txtX->setText(TQString("%L1").arg(xpos, 5));
+    m_page->txtY->setText(TQString("%L1").arg(ypos, 5));
 }
 
 void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider)
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 8393ccff9..58d283588 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -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>").tqarg( displayName() );
+    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( 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.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) );
+                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) );
             else
-                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) );
+                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) );
         }
     tip += "</table>";
     return tip;
diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui
index 5227d7fb9..39de910a8 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="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index b9912a79c..10346895a 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -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="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 217329221..9dfd1ff49 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -37,7 +37,7 @@
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="text">
-                                <string>&amp;Cursor tqshape:</string>
+                                <string>&amp;Cursor shape:</string>
                             </property>
                             <property name="buddy" stdset="0">
                                 <cstring>m_cmbCursorShape</cstring>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index 197401609..b1b607ef5 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -230,7 +230,7 @@
                     <property name="text">
                         <string>Description:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">