Remove additional unneeded tq method conversions

1137 files changed, 6333 insertions, 6333 deletions

diff --git a/chalk/IMAGE_LIBRARIES b/chalk/IMAGE_LIBRARIES
index f2f0c1dc..1d26fb96 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 b769a3d3..a67652f7 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 2d0ad98f..3f5815ad 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 d6940294..d2e27cd1 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 57453e7b..2df50140 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 b3855bda..19097d9f 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 fceb0c05..03a7d4f3 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 953b10c8..76a552a9 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 7c36a303..f4cb4901 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 31ee9d18..247bc7df 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 85099877..1981bd02 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 2258d899..672747a5 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 fc31b117..2c0e29c2 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 1f08dbdd..0e2f90d2 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 a516ac72..58a3ddab 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 ff66144d..4cb51a98 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 03d76616..69b90fe3 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 10ab8dbb..f702d920 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 aa3bf87b..2b860773 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 1c737ce6..4bca9d00 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 8aa43e5a..b209cfa9 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 7d242713..ceacf630 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 32bffe49..37d78702 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 0217b7e1..8d360497 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 dc836971..d4213bb5 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 4e1bdf43..2934623a 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 abd1bb66..23c7e221 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 665dfc09..9c3a7543 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 a97f809b..e1224301 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 2e849658..8cd59c00 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 7b836436..b36e5ce9 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 15dcff1f..6ce5874b 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 e7537c27..346ff44a 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 ddcfc4bd..a7a9264e 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 c5f93864..7338ef54 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 6aff68c8..3eb7468d 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 6df9f8da..b29e5e3a 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 29df8bf7..08ab06ab 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 bf23b441..392fa212 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 faeb32d8..9fd07e6d 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 d16ab740..3028d121 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 c796ec3c..cb8b82ed 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 8f5c9e5f..37107508 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 c2a3715b..582c89cd 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 e7bfd89e..ad77204e 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 947dae25..8128dcdf 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 445231f7..8be9071b 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 6dba5c01..4655a4d9 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 0498505d..00c0c820 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 854dcd0a..8e8ca43d 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 13cd72a8..b9b3e400 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 d3a8326a..72a70c8a 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 8a137374..b88dac9d 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 cbd8799f..959233e4 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 450f8fda..841341f7 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 6e942c38..2a4c5029 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 7d6e52f4..374033d6 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 04f7b653..45c1705a 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 d719edd6..5ddb004d 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 ecac5501..e2f09a58 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 c93d6e88..1486d415 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 b01ba0a8..0b22ebf5 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 5f800f6a..9f27adc6 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 44991303..5aee1431 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 e166de7c..c8ef92c5 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 1ec25dcd..7f6a9b05 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 b7c784fc..68610cc5 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 41553bd2..45795b42 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 6ed8f1b9..bdcb3ab0 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 c7f9e0ad..1d7932cb 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 318bf305..bd5b80fb 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 20de3c5b..894db607 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 16872418..d38c7ea1 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 4d92a4ce..5f717468 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 f84bf24d..ac762953 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 f898b497..14b19c8b 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 6bae7e78..70141dea 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 dc5beadf..24569402 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 10d20796..a8fdf71e 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 e9a1bf2d..28235e8b 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 985bd0c6..24ae2738 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 20197dd2..30c2c8e9 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 ace29965..5846a67b 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 d2ff10eb..377b37a0 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 70484b0a..9dd99023 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 6de1aac3..5bf891ac 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 327f09d7..8a8929a7 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 1205632b..de98548c 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 15580752..b5e3d930 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 ad681c75..b2ae9f36 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 039e4190..807b8ffc 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 b9abdc75..bda3b7e7 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 adbf9b8a..32ef617d 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 9e76f159..7aba5a49 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 e8974c79..45767fe4 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 eecfa659..629072ff 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 771e1ff8..033e0c19 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 8393ccff..58d28358 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 5227d7fb..39de910a 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 b9912a79..10346895 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 21732922..9dfd1ff4 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 19740160..b1b607ef 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">
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 2194831a..5bce37b2 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -202,7 +202,7 @@ namespace {
             rawdata.resize(len);
             memcpy(rawdata.data(), imgAttr -> value, len);
             
-            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(TQString(imgAttr -> key)), "", rawdata );
+            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata );
             Q_CHECK_PTR(annotation);
 
             image -> addAnnotation(annotation);
@@ -258,7 +258,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index 5fa8e78a..c9772d9a 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -73,7 +73,7 @@ namespace {
         {
             return JCS_CMYK;
         }
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return JCS_UNKNOWN;
     }
 
diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 40a6c32a..8222cd77 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -34,7 +34,7 @@
                     <property name="text">
                         <string>Quality:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -101,7 +101,7 @@
                                     <property name="text">
                                         <string>Best</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index dd16dd0e..880a52c6 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -206,7 +206,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index be3af8ad..ed504f67 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -141,7 +141,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
     TQValueList<int> pages = wdg->pages();
     for(TQValueList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it)
     {
-        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( TQString::number(*it) + 1), TQ_UINT8_MAX);
+        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX);
         layer->paintDevice()->convertFromTQImage( pdoc->getPage( *it )->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), "");
         img->addLayer(layer, img->rootLayer(), 0);
     }
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index d3cce618..d5c4a080 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -62,7 +62,7 @@ namespace {
             return alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return -1;
 
     }
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index a635c293..dcb733b8 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Compress:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -113,7 +113,7 @@
                                     <property name="text">
                                         <string>Small</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index a5b86364..4ec8f028 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
     //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
     int oldSize = m_data->size();
-    m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim);
+    m_data->resize(oldSize + buflen, TQGArray::SpeedOptim);
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index 681e66b7..da399a53 100644
--- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
+++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
@@ -63,7 +63,7 @@ namespace {
             return true;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
         return false;
 
     }
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index b86d88ab..f1854d43 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -283,7 +283,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Quality:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Best</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                             </widget>
@@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
@@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 90d61755..3209e181 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -173,7 +173,7 @@ xcf_load_image (XcfInfo * info)
         /* add the layer to the image if its not the floating selection */
         if (layer != info->floating_sel)
             gimp_image_add_layer (gimage, layer,
-                                  gimp_container_num_tqchildren (gimage->layers));
+                                  gimp_container_num_children (gimage->layers));
 
         /* restore the saved position so we'll be ready to
          *  read the next offset.
@@ -1494,7 +1494,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage)
         GIMP_ITEM (vectors)->tattoo = tattoo;
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_tqchildren (gimage->vectors));
+                            gimp_container_num_children (gimage->vectors));
 
     return TRUE;
 }
@@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage)
     }
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_tqchildren (gimage->vectors));
+                            gimp_container_num_children (gimage->vectors));
 
     return TRUE;
 }
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index 3544baf4..a0dbb9b5 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -289,8 +289,8 @@ xcf_save_image (XcfInfo   *info,
     xcf_write_int32_print_error (info, (TQ_INT32 *) &gimage->base_type, 1);
 
     /* determine the number of layers and channels in the image */
-    nlayers   = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers);
-    nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels);
+    nlayers   = (TQ_UINT32) gimp_container_num_children (gimage->layers);
+    nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels);
 
     /* check and see if we have to save out the selection */
     have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage),
@@ -442,7 +442,7 @@ xcf_save_image_props (XcfInfo   *info,
     if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp))
         xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit));
 
-    if (gimp_container_num_tqchildren (gimage->vectors) > 0)
+    if (gimp_container_num_children (gimage->vectors) > 0)
     {
         if (gimp_vectors_compat_is_compatible (gimage))
             xcf_check_error (xcf_save_prop (info, gimage, PROP_PATHS, error));
@@ -1581,7 +1581,7 @@ xcf_save_old_paths (XcfInfo    *info,
      * then each path:-
      */
 
-    num_paths = gimp_container_num_tqchildren (gimage->vectors);
+    num_paths = gimp_container_num_children (gimage->vectors);
 
     active_vectors = gimp_image_get_active_vectors (gimage);
 
@@ -1696,7 +1696,7 @@ xcf_save_vectors (XcfInfo    *info,
         active_index = gimp_container_get_child_index (gimage->vectors,
                                                        GIMP_OBJECT (active_vectors));
 
-    num_paths = gimp_container_num_tqchildren (gimage->vectors);
+    num_paths = gimp_container_num_children (gimage->vectors);
 
     xcf_write_int32_check_error (info, &version,      1);
     xcf_write_int32_check_error (info, &active_index, 1);
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index a17f94da..82debb58 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -189,10 +189,10 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
       TQMessageBox::critical (0L, "Applixgraphics header problem",
                                   TQString ("The Applixgraphics header is not correct. "
                                            "May be it is not an applixgraphics file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 				    "Comma");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
       return KoFilter::StupidError;
     }
 
diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc
index 32a0845c..77a650bb 100644
--- a/filters/karbon/eps/epsimport.cc
+++ b/filters/karbon/eps/epsimport.cc
@@ -93,7 +93,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to )
 
 	// sed filter
 	TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\"").
-            tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
+            arg(llx).arg(lly).arg(urx).arg(ury);
 
 	// Build ghostscript call to convert ps/eps -> ai:
 	TQString command(
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 3e79e3ab..8c4c2795 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -39,18 +39,18 @@ Msod::Msod(
     m_dpi = dpi;
     m_images.setAutoDelete(true);
     m_opt = new Options(*this);
-    m_tqshape.data = 0L;
-    m_tqshape.length = 0;
+    m_shape.data = 0L;
+    m_shape.length = 0;
 }
 
 Msod::~Msod()
 {
-    delete [] m_tqshape.data;
+    delete [] m_shape.data;
     delete m_opt;
 }
 
 void Msod::drawShape(
-    unsigned tqshapeType,
+    unsigned shapeType,
     TQ_UINT32 bytes,
     TQDataStream &operands)
 {
@@ -262,25 +262,25 @@ void Msod::drawShape(
     };
     struct
     {
-        TQ_UINT32 spid;                  // The tqshape id
+        TQ_UINT32 spid;                  // The shape id
         union
         {
             TQ_UINT32 info;
             struct
             {
-                TQ_UINT32 fGroup : 1;    // This tqshape is a group tqshape
-                TQ_UINT32 fChild : 1;    // Not a top-level tqshape
-                TQ_UINT32 fPatriarch : 1; // This is the topmost group tqshape.
+                TQ_UINT32 fGroup : 1;    // This shape is a group shape
+                TQ_UINT32 fChild : 1;    // Not a top-level shape
+                TQ_UINT32 fPatriarch : 1; // This is the topmost group shape.
                                         // Exactly one of these per drawing.
                 TQ_UINT32 fDeleted : 1;  // The shape.has been deleted
-                TQ_UINT32 fOleShape : 1; // The tqshape is an OLE object
+                TQ_UINT32 fOleShape : 1; // The shape is an OLE object
                 TQ_UINT32 fHaveMaster : 1; // Shape has a hspMaster property
                 TQ_UINT32 fFlipH : 1;    // Shape is flipped horizontally
                 TQ_UINT32 fFlipV : 1;    // Shape is flipped vertically
-                TQ_UINT32 fConnector : 1; // Connector type of tqshape
+                TQ_UINT32 fConnector : 1; // Connector type of shape
                 TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind
-                TQ_UINT32 fBackground : 1; // Background tqshape
-                TQ_UINT32 fHaveSpt : 1;  // Shape has a tqshape type property
+                TQ_UINT32 fBackground : 1; // Background shape
+                TQ_UINT32 fHaveSpt : 1;  // Shape has a shape type property
                 TQ_UINT32 reserved : 20; // Not yet used
             } fields;
         } grfPersistent;
@@ -291,12 +291,12 @@ void Msod::drawShape(
     operands >> data.spid;
     operands >> data.grfPersistent.info;
     bytes -= 8;
-	kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" <<
+	kdDebug(s_area) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" <<
         (data.grfPersistent.fields.fGroup ? " group" : "") <<
         (data.grfPersistent.fields.fChild ? " child" : "") <<
         (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") <<
         (data.grfPersistent.fields.fDeleted ? " deleted" : "") <<
-        (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") <<
+        (data.grfPersistent.fields.fOleShape ? " oleshape" : "") <<
         (data.grfPersistent.fields.fHaveMaster ? " master" : "") <<
         (data.grfPersistent.fields.fFlipH ? " flipv" : "") <<
         (data.grfPersistent.fields.fConnector ? " connector" : "") <<
@@ -309,9 +309,9 @@ void Msod::drawShape(
     if ((!m_isRequiredDrawing) && (m_requestedShapeId != data.spid))
         return;
 
-    // An active tqshape! Let's draw it...
+    // An active shape! Let's draw it...
 
-    switch (tqshapeType)
+    switch (shapeType)
     {
     case 0:
         if (m_opt->m_pVertices)
@@ -493,7 +493,7 @@ TQSize Msod::normaliseSize(
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     const TQString &file,
     const char *delayStream)
 {
@@ -505,19 +505,19 @@ bool Msod::parse(
         return false;
     }
     TQDataStream stream(&in);
-    bool result = parse(tqshapeId, stream, in.size(), delayStream);
+    bool result = parse(shapeId, stream, in.size(), delayStream);
     in.close();
     return result;
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     TQDataStream &stream,
     unsigned size,
     const char *delayStream)
 {
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    m_requestedShapeId = tqshapeId;
+    m_requestedShapeId = shapeId;
     m_isRequiredDrawing = false;
     m_delayStream = delayStream;
 
@@ -854,8 +854,8 @@ void Msod::opDg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 csp;        // The number of tqshapes in this drawing.
-        TQ_UINT32 spidCur;    // The last tqshape ID given to an SP in this DG.
+        TQ_UINT32 csp;        // The number of shapes in this drawing.
+        TQ_UINT32 spidCur;    // The last shape ID given to an SP in this DG.
     } data;
 
     operands >> data.csp >> data.spidCur;
@@ -878,10 +878,10 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 spidMax;    // The current maximum tqshape ID.
+        TQ_UINT32 spidMax;    // The current maximum shape ID.
         TQ_UINT32 cidcl;      // The number of ID clusters (FIDCLs).
-        TQ_UINT32 cspSaved;   // The total number of tqshapes saved.
-                        // (including deleted tqshapes, if undo
+        TQ_UINT32 cspSaved;   // The total number of shapes saved.
+                        // (including deleted shapes, if undo
                         // information was saved).
         TQ_UINT32 cdgSaved;   // The total number of drawings saved.
     } data;
@@ -896,7 +896,7 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
     unsigned i;
 
     operands >> data.spidMax >> data.cidcl >> data.cspSaved >> data.cdgSaved;
-    kdDebug(s_area) << data.cspSaved << " tqshapes in " <<
+    kdDebug(s_area) << data.cspSaved << " shapes in " <<
         data.cidcl - 1 << " clusters in " <<
         data.cdgSaved << " drawings" << endl;
     for (i = 0; i < data.cidcl - 1; i++)
@@ -943,31 +943,31 @@ void Msod::opSolvercontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 
 void Msod::opSp(Header &op, TQ_UINT32 bytes, TQDataStream &operands)
 {
-    // We want to defer the act of drawing a tqshape until we have seen any options
+    // We want to defer the act of drawing a shape until we have seen any options
     // that may affect it. Thus, we merely store the data away, and let opSpContainer
     // do all the ahrd work.
 
-    m_tqshape.type = op.opcode.fields.inst;
-    m_tqshape.length = bytes;
-    m_tqshape.data = new char [bytes];
-    operands.readRawBytes(m_tqshape.data, bytes);
+    m_shape.type = op.opcode.fields.inst;
+    m_shape.length = bytes;
+    m_shape.data = new char [bytes];
+    operands.readRawBytes(m_shape.data, bytes);
 }
 
 void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 {
     walk(bytes, operands);
 
-    // Having gathered all the information for this tqshape, we can now draw it.
+    // Having gathered all the information for this shape, we can now draw it.
 
     TQByteArray  a;
 
-    a.setRawData(m_tqshape.data, m_tqshape.length);
+    a.setRawData(m_shape.data, m_shape.length);
     TQDataStream s(a, IO_ReadOnly);
     s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    drawShape(m_tqshape.type, m_tqshape.length, s);
-    a.resetRawData(m_tqshape.data, m_tqshape.length);
-    delete [] m_tqshape.data;
-    m_tqshape.data = 0L;
+    drawShape(m_shape.type, m_shape.length, s);
+    a.resetRawData(m_shape.data, m_shape.length);
+    delete [] m_shape.data;
+    m_shape.data = 0L;
 }
 
 void Msod::opSpgr(Header &, TQ_UINT32, TQDataStream &operands)
@@ -1097,7 +1097,7 @@ void Msod::Options::initialise()
     m_geoTop = 0;
     m_geoRight = 21600;
     m_geoBottom = 21600;
-    m_tqshapePath = 1;
+    m_shapePath = 1;
     delete m_pVertices;
     m_pVertices = 0L;
     m_fShadowOK = true;
@@ -1233,7 +1233,7 @@ void Msod::Options::walk(TQ_UINT32 bytes, TQDataStream &operands)
             m_geoBottom = op.value;
             break;
         case 324:
-            m_tqshapePath = op.value;
+            m_shapePath = op.value;
             break;
         case 383:
             m_fShadowOK = (op.value & 0x0020) != 0;
diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h
index f53146bf..3db6fc2f 100644
--- a/filters/karbon/msod/msod.h
+++ b/filters/karbon/msod/msod.h
@@ -44,15 +44,15 @@ public:
         unsigned dpi);
     virtual ~Msod();
 
-    // Called to parse the given file. We extract a drawing by tqshapeId.
+    // Called to parse the given file. We extract a drawing by shapeId.
     // If the drawing is not found, the return value will be false.
 
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         const TQString &file,
         const char *delayStream = 0L);
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         TQDataStream &stream,
         unsigned size,
         const char *delayStream = 0L);
@@ -114,14 +114,14 @@ private:
         unsigned type;
         char *data;
         unsigned length;
-    } m_tqshape;
+    } m_shape;
 
     TQPoint normalisePoint(
         TQDataStream &operands);
     TQSize normaliseSize(
         TQDataStream &operands);
     void drawShape(
-        unsigned tqshapeType,
+        unsigned shapeType,
         TQ_UINT32 bytes,
         TQDataStream &operands);
 
@@ -244,7 +244,7 @@ private:
         TQ_UINT32 m_geoTop;
         TQ_UINT32 m_geoRight;
         TQ_UINT32 m_geoBottom;
-        TQ_UINT32 m_tqshapePath;
+        TQ_UINT32 m_shapePath;
         TQPointArray *m_pVertices;
         bool m_fShadowOK;
         bool m_f3DOK;
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index c3ee7b2a..e25889c0 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -51,13 +51,13 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     if (to != "application/x-karbon" || from != "image/x-msod")
         return KoFilter::NotImplemented;
 
-    // Get configuration data: the tqshape id, and any delay stream that we were given.
-    unsigned tqshapeId;
-    emit commSignalShapeID( tqshapeId );
+    // Get configuration data: the shape id, and any delay stream that we were given.
+    unsigned shapeId;
+    emit commSignalShapeID( shapeId );
     const char *delayStream = 0L;
     emit commSignalDelayStream( delayStream );
     kdDebug( s_area ) << "##################################################################" << endl;
-    kdDebug( s_area ) << "tqshape id: " << tqshapeId << endl;
+    kdDebug( s_area ) << "shape id: " << shapeId << endl;
     kdDebug( s_area ) << "delay stream: " << delayStream << endl;
     kdDebug( s_area ) << "##################################################################" << endl;
 /*
@@ -68,9 +68,9 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     kdDebug(s_area) << "MSODImport::filter: config: " << config << endl;
     for (i = 0; i < args.count(); i++)
     {
-        if (args[i].startsWith("tqshape-id="))
+        if (args[i].startsWith("shape-id="))
         {
-            tqshapeId = args[i].mid(9).toUInt();
+            shapeId = args[i].mid(9).toUInt();
         }
         else
         if (args[i].startsWith("delay-stream="))
@@ -91,7 +91,7 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     m_text += "<DOC mime=\"application/x-karbon\" syntaxVersion=\"0.1\" editor=\"WMF import filter\">\n";
     m_text += "  <LAYER name=\"Layer\" visible=\"1\">\n";
 
-    if (!parse(tqshapeId, m_chain->inputFile(), delayStream))
+    if (!parse(shapeId, m_chain->inputFile(), delayStream))
         return KoFilter::WrongFormat;
 
     // close doc
diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h
index 9c721882..9264b7d5 100644
--- a/filters/karbon/msod/msodimport.h
+++ b/filters/karbon/msod/msodimport.h
@@ -68,7 +68,7 @@ protected:
 signals:
     // Communication signals to the parent filters
     void commSignalDelayStream( const char* delay );
-    void commSignalShapeID( unsigned int& tqshapeID );
+    void commSignalShapeID( unsigned int& shapeID );
 
 private:
     virtual void savePartContents( TQIODevice* file );
diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index 07381db8..a5ed9b40 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -171,7 +171,7 @@ TQString
 SvgExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " id=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " id=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
@@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text )
 		*m_body << " font-weight=\"bold\"";
 	if( text.font().italic() )
 		*m_body << " font-style=\"italic\"";
-	if( text.tqalignment() == VText::Center )
+	if( text.alignment() == VText::Center )
 		*m_body << " text-anchor=\"middle\"";
-	else if( text.tqalignment() == VText::Right )
+	else if( text.alignment() == VText::Right )
 		*m_body << " text-anchor=\"end\"";
 
 	*m_body << ">" << endl;
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index 580512dc..9d323d3d 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -138,7 +138,7 @@ void SvgImport::convert()
 	m_outerRect = m_document.boundingBox();
 
 	// undo y-mirroring
-	//m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed()));
+	//m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed()));
 	if( !docElem.attribute( "viewBox" ).isEmpty() )
 	{
 		// allow for viewbox def with ',' or whitespace
@@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
 					//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
 					//kdDebug() << gc->fill.gradient().vector().x() << endl;
-					double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-					double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+					double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+					double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 					gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					if(gc->fill.gradient().type() == VGradient::radial)
 					{
-						offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-						offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+						offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+						offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 						gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					}
-					offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-					offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+					offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+					offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 					gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					//kdDebug() << offsety << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc
index 636268b7..e1599a8c 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cc
@@ -161,7 +161,7 @@ TQString
 XAMLExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " Name=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " Name=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc
index cbe8ddbb..002001e2 100644
--- a/filters/karbon/xaml/xamlimport.cc
+++ b/filters/karbon/xaml/xamlimport.cc
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <KoUnit.h>
 #include <KoGlobal.h>
-#include <tqshapes/vellipse.h>
-#include <tqshapes/vrectangle.h>
-#include <tqshapes/vpolygon.h>
+#include <shapes/vellipse.h>
+#include <shapes/vrectangle.h>
+#include <shapes/vpolygon.h>
 #include <commands/vtransformcmd.h>
 #include <core/vsegment.h>
 #include <core/vtext.h>
@@ -466,14 +466,14 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
 				//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
 				//kdDebug() << gc->fill.gradient().vector().x() << endl;
-				double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-				double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+				double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+				double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 				gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 				gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 				gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 				//kdDebug() << offsety << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index 8de11197..215c4f01 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for layer and channel offsets.
-	m_stream->tqdevice()->at(
+	m_stream->device()->at(
 		// current position + (number layers + number channels + 2) * 4.
 		current + ( document.layers().count() + 3 + 2 ) * 4 );
 
@@ -142,7 +142,7 @@ XcfExport::visitVDocument( VDocument& document )
 	for( ; itr.current(); ++itr )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// Write layer.
@@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save layer offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of layer offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
 
 	// Return to end offset.
-	m_stream->tqdevice()->at( end );
+	m_stream->device()->at( end );
 
 	// Append a zero offset to indicate end of channel offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -279,13 +279,13 @@ XcfExport::visitVLayer( VLayer& layer )
 	TQIODevice::Offset end = 0;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for hierarchy offsets.
-	m_stream->tqdevice()->at( current + 8 );
+	m_stream->device()->at( current + 8 );
 
 	// Save start offset.
-	start = m_stream->tqdevice()->at();
+	start = m_stream->device()->at();
 
 
 	// Write hierarchy.
@@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer )
 
 
 	// Save end offset.
-	end = m_stream->tqdevice()->at();
+	end = m_stream->device()->at();
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Save hierarchy offset.
 	*m_stream << start;
@@ -333,15 +333,15 @@ XcfExport::writeHierarchy()
 	int height = m_height;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for level offsets.
-	m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 );
+	m_stream->device()->at( current + ( levels + 1 ) * 4 );
 
 	for( int i = 0; i < levels; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 		if( i == 0 )
 		{
@@ -360,23 +360,23 @@ XcfExport::writeHierarchy()
 		}
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save level offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of level offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -398,15 +398,15 @@ XcfExport::writeLevel()
 	int tiles = rows * cols;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for tile offsets.
-	m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 );
+	m_stream->device()->at( current + ( tiles + 1 ) * 4 );
 
 	for( int i = 0; i < tiles; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// TODO: Save tile.
@@ -425,19 +425,19 @@ XcfExport::writeLevel()
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save tile offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 }
 
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 6e1eeebb..eb882e0b 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -68,7 +68,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T
     const TQString filename( m_chain->inputFile() );
     TQFile f( filename );
     if ( !f.open( IO_ReadOnly ) ) {
-        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( filename ), i18n( "MathML Import Error" ) );
+        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).arg( filename ), i18n( "MathML Import Error" ) );
         delete wrapper;
         return KoFilter::FileNotFound;
     }
@@ -84,7 +84,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T
             << " In line: " << errorLine << ", column: " << errorColumn << endl
             << " Error message: " << errorMsg << endl;
         KMessageBox::error( 0, i18n( "Parsing error in MathML file %4 at line %1, column %2\nError message: %3" )
-                              .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) );
+                              .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) );
         return KoFilter::WrongFormat;
     }
     f.close();
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index e2e5b50a..c0609de6 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -56,7 +56,7 @@ class MgpImporter:
     self.__reset()           #init properties
 
   def __reset(self):
-    self.tqalignment="1"       #text tqalignment, left
+    self.alignment="1"       #text alignment, left
     self.vgap=1              #line spacing
 
     #font properties
@@ -167,14 +167,14 @@ class MgpImporter:
   def __setAlign(self,command):
     tokens=string.split(command,' ')
     if (tokens[0]=='leftfill'): #justify
-      self.tqalignment="8"
+      self.alignment="8"
     elif (tokens[0]=='right'):
-      self.tqalignment="2"
+      self.alignment="2"
     elif (tokens[0]=='center'):
-      self.tqalignment="4"
+      self.alignment="4"
     else:
-      self.tqalignment="1" #left
-    #print self.tqalignment
+      self.alignment="1" #left
+    #print self.alignment
 
   def __setBackground(self,parent):
     pageElem=self.document.createElement("PAGE")
@@ -233,7 +233,7 @@ class MgpImporter:
     indent=-1
     
     pElem=self.document.createElement("P")          #paragraph
-    pElem.setAttribute("align", self.tqalignment) 
+    pElem.setAttribute("align", self.alignment) 
 
     elem=self.document.createElement("NAME")        #style name
     elem.setAttribute("value", "Standard")          ###is this needed at all?
@@ -377,7 +377,7 @@ class MgpImporter:
             self.__setFontSize(command)
           elif (command.startswith('left') or
                 command.startswith('center') or
-                command.startswith('right')):             #text tqalignment
+                command.startswith('right')):             #text alignment
             self.__setAlign(command)
           elif (command.startswith('charset')):           #charset
             self.__setCharset(command)
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index be986d92..55a3e265 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -558,7 +558,7 @@ void OoImpressExport::createHelpLine( TQDomNode &helpline )
                 TQString str( "P%1,%2" );
                 int tmpX = ( int ) ( KoUnit::toMM( helplines.attribute("posX").toDouble()  )*100 );
                 int tmpY = ( int ) ( KoUnit::toMM( helplines.attribute("posY").toDouble() )*100 );
-                m_helpLine+=str.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) );
+                m_helpLine+=str.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) );
             }
         }
     }
@@ -780,7 +780,7 @@ void OoImpressExport::appendTextbox( TQDomDocument & doc, TQDomElement & source,
     TQString gs = m_styleFactory.createGraphicStyle( source );
     textbox.setAttribute( "draw:style-name", gs );
 
-    // set the tqgeometry
+    // set the geometry
     set2DGeometry( source, textbox );
 
     // parse every paragraph
@@ -876,7 +876,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source,
     image.setAttribute( "draw:style-name", gs );
     TQDomElement key = source.namedItem( "KEY" ).toElement();
 
-    TQString pictureName = TQString( "Picture/Picture%1" ).tqarg( m_pictureIndex );
+    TQString pictureName = TQString( "Picture/Picture%1" ).arg( m_pictureIndex );
 
     image.setAttribute( "xlink:type", "simple" );
     image.setAttribute( "xlink:show", "embed" );
@@ -909,7 +909,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source,
     }
     image.setAttribute( "xlink:href", "#" + pictureName );
 
-// set the tqgeometry
+// set the geometry
     set2DGeometry( source, image );
     target.appendChild( image );
 
@@ -927,7 +927,7 @@ void OoImpressExport::appendLine( TQDomDocument & doc, TQDomElement & source, TQ
     TQString gs = m_styleFactory.createGraphicStyle( source );
     line.setAttribute( "draw:style-name", gs );
 
-    // set the tqgeometry
+    // set the geometry
     setLineGeometry( source, line );
 
     target.appendChild( line );
@@ -941,7 +941,7 @@ void OoImpressExport::appendRectangle( TQDomDocument & doc, TQDomElement & sourc
     TQString gs = m_styleFactory.createGraphicStyle( source );
     rectangle.setAttribute( "draw:style-name", gs );
 
-    // set the tqgeometry
+    // set the geometry
     set2DGeometry( source, rectangle );
 
     target.appendChild( rectangle );
@@ -955,7 +955,7 @@ void OoImpressExport::appendPolyline( TQDomDocument & doc, TQDomElement & source
     TQString gs = m_styleFactory.createGraphicStyle( source );
     polyline.setAttribute( "draw:style-name", gs );
 
-    // set the tqgeometry
+    // set the geometry
     set2DGeometry( source, polyline, false, true /*multipoint*/ );
 
     target.appendChild( polyline );
@@ -974,7 +974,7 @@ void OoImpressExport::appendEllipse( TQDomDocument & doc, TQDomElement & source,
     TQString gs = m_styleFactory.createGraphicStyle( source );
     ellipse.setAttribute( "draw:style-name", gs );
 
-    // set the tqgeometry
+    // set the geometry
     set2DGeometry( source, ellipse, pieObject );
 
     target.appendChild( ellipse );
@@ -998,7 +998,7 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe
 
     target.setAttribute( "draw:id",  TQString::number( m_objectIndex ) );
     target.setAttribute( "svg:x", StyleFactory::toCM( orig.attribute( "x" ) ) );
-    target.setAttribute( "svg:y", TQString( "%1cm" ).tqarg( KoUnit::toCM( y ) ) );
+    target.setAttribute( "svg:y", TQString( "%1cm" ).arg( KoUnit::toCM( y ) ) );
     target.setAttribute( "svg:width", StyleFactory::toCM( size.attribute( "width" ) ) );
     target.setAttribute( "svg:height", StyleFactory::toCM( size.attribute( "height" ) ) );
     TQString nameStr = name.attribute("objectName");
@@ -1073,16 +1073,16 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe
                     if( elemPoint.hasAttribute( "point_y" ) )
                         tmpY = ( int ) ( KoUnit::toMM(elemPoint.attribute( "point_y" ).toDouble() )*100 );
                     if ( !listOfPoint.isEmpty() )
-                        listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
+                        listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY );
                     else
-                        listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY );
+                        listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
                     maxX = TQMAX( maxX, tmpX );
                     maxY = TQMAX( maxY, tmpY );
                 }
                 elemPoint = elemPoint.nextSibling().toElement();
             }
             target.setAttribute( "draw:points", listOfPoint );
-            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
+            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) );
         }
     }
 }
@@ -1093,7 +1093,7 @@ TQString OoImpressExport::rotateValue( double val )
     if ( val!=0.0 )
     {
         double value = -1 * ( ( double )val* M_PI )/180.0;
-        str=TQString( "rotate (%1)" ).tqarg( value );
+        str=TQString( "rotate (%1)" ).arg( value );
     }
     return str;
 }
@@ -1125,29 +1125,29 @@ void OoImpressExport::setLineGeometry( TQDomElement & source, TQDomElement & tar
 
     target.setAttribute( "draw:id",  TQString::number( m_objectIndex ) );
     TQString xpos1 = StyleFactory::toCM( orig.attribute( "x" ) );
-    TQString xpos2 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x2 ) );
+    TQString xpos2 = TQString( "%1cm" ).arg( KoUnit::toCM( x2 ) );
 
     if ( type == 0 )
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) );
     }
     else if ( type == 1 )
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
-        xpos1 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x1/2.0 ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
+        xpos1 = TQString( "%1cm" ).arg( KoUnit::toCM( x1/2.0 ) );
         xpos2 = xpos1;
     }
     else if ( type == 3 ) // from left bottom to right top
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
     }
     else // from left top to right bottom
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
     }
     target.setAttribute( "svg:x1", xpos1 );
     target.setAttribute( "svg:x2", xpos2 );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index f7322342..77e1f38c 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme
     TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" );
     appendTextObjectMargin( doc, textObjectElement );
 
-    // vertical tqalignment
+    // vertical alignment
     if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) )
     {
-        TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
-        if ( tqalignment == "top" )
+        TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
+        if ( alignment == "top" )
             textObjectElement.setAttribute( "verticalAlign", "top" );
-        else if ( tqalignment == "middle" )
+        else if ( alignment == "middle" )
             textObjectElement.setAttribute( "verticalAlign", "center" );
-        else if ( tqalignment == "bottom" )
+        else if ( alignment == "bottom" )
             textObjectElement.setAttribute( "verticalAlign", "bottom" );
 
         textObjectElement.setAttribute("verticalValue", 0.0);
@@ -1663,7 +1663,7 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle
         p.appendChild(nameElem);
     }
 
-    // Paragraph tqalignment
+    // Paragraph alignment
     if ( m_styleStack.hasAttributeNS( ooNS::fo, "text-align" ) )
     {
         TQString align = m_styleStack.attributeNS( ooNS::fo, "text-align" );
@@ -2046,7 +2046,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object )
     KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url );
 
     TQString extension = url.mid( url.find( '.' ) );
-    TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension;
+    TQString fileName = TQString( "picture%1" ).arg( m_numPicture++ ) + extension;
     KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write );
 
     if ( file && out )
@@ -2072,7 +2072,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement &
         return TQString();
 
     TQString extension = url.mid( url.find( '.' ) );
-    TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension;
+    TQString fileName = TQString( "sound%1" ).arg( m_numSound++ ) + extension;
     fileName = "sounds/" + fileName;
     KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write );
 
@@ -2314,9 +2314,9 @@ void OoImpressImport::createPresentationAnimation(const TQDomElement& element)
     {
         const TQString localName = e.localName();
         const TQString ns = e.namespaceURI();
-        if ( ns == ooNS::presentation && localName == "show-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) )
+        if ( ns == ooNS::presentation && localName == "show-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) )
         {
-            TQString name = e.attributeNS( ooNS::draw, "tqshape-id", TQString() );
+            TQString name = e.attributeNS( ooNS::draw, "shape-id", TQString() );
             //kdDebug(30518)<<" insert animation style : name :"<<name<<endl;
             animationList *lst = new animationList;
             TQDomElement* ep = new TQDomElement( e );
@@ -2342,8 +2342,8 @@ TQDomElement OoImpressImport::findAnimationByObjectID(const TQString & id,  int
     {
         TQDomElement e = node.toElement();
         order = animation->order;
-        kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:tqshape-id) :"<<e.attributeNS( ooNS::draw, "tqshape-id", TQString())<<endl;
-        if (e.tagName()=="presentation:show-tqshape" && e.attributeNS( ooNS::draw, "tqshape-id", TQString())==id)
+        kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:shape-id) :"<<e.attributeNS( ooNS::draw, "shape-id", TQString())<<endl;
+        if (e.tagName()=="presentation:show-shape" && e.attributeNS( ooNS::draw, "shape-id", TQString())==id)
                 return e;
     }
 
diff --git a/filters/kpresenter/ooimpress/status.html b/filters/kpresenter/ooimpress/status.html
index f64a38b0..8c34c4d1 100644
--- a/filters/kpresenter/ooimpress/status.html
+++ b/filters/kpresenter/ooimpress/status.html
@@ -61,7 +61,7 @@
       - Rounding (for rectangles)<br>
       - Shadow<br>
       - Text margins<br>
-      -Qt::Vertical tqalignment for text<br>
+      -Qt::Vertical alignment for text<br>
       - Text style (underline, sub/super script, bold, italic, strikeout, background color)<br>
       - Paragraph style (line spacing, offset before/after paragraph, indent first/right/left, borders)<br>
       - Presentation settings<br>
@@ -168,7 +168,7 @@
       - Settings element (snap line drawing)<br>
 	  - Export Transparency<br>
 	  - Export Group Object<br>
-	  -Qt::Vertical tqalignment for text<br>
+	  -Qt::Vertical alignment for text<br>
 	  - Text margins<br>
 	  - Export title/keyword/subject<br>
       - Custom Slide Show<br>
diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc
index a25ba52a..e50b652e 100644
--- a/filters/kpresenter/ooimpress/stylefactory.cc
+++ b/filters/kpresenter/ooimpress/stylefactory.cc
@@ -362,7 +362,7 @@ void StrokeDashStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const
 
 GradientStyle::GradientStyle( TQDomElement & gradient, int index )
 {
-    m_name = TQString( "Gradient %1" ).tqarg( index );
+    m_name = TQString( "Gradient %1" ).arg( index );
     m_start_intensity = "100%";
     m_end_intensity = "100%";
     m_border = "0%";
@@ -393,8 +393,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index )
             {
                 int cx = bGradient.attribute( "xfactor" ).toInt();
                 int cy = bGradient.attribute( "yfactor" ).toInt();
-                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
             }
         }
 
@@ -419,8 +419,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index )
             {
                 int cx = gradient.attribute( "xfactor" ).toInt();
                 int cy = gradient.attribute( "yfactor" ).toInt();
-                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).arg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
             }
         }
 
@@ -615,8 +615,8 @@ PageMasterStyle::PageMasterStyle( TQDomElement & e, const uint index )
     TQDomNode borders = e.namedItem( "PAPERBORDERS" );
     TQDomElement b = borders.toElement();
 
-    m_name = TQString( "PM%1" ).tqarg( index );
-    m_style = TQString( "Default%1" ).tqarg( index );
+    m_name = TQString( "PM%1" ).arg( index );
+    m_style = TQString( "Default%1" ).arg( index );
     m_margin_top = StyleFactory::toCM( b.attribute( "ptTop" ) );
     m_margin_bottom = StyleFactory::toCM( b.attribute( "ptBottom" ) );
     m_margin_left = StyleFactory::toCM( b.attribute( "ptLeft" ) );
@@ -675,7 +675,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint
     	m_bg_objects_visible = "true";
     }
     
-    m_name = TQString( "dp%1" ).tqarg( index );
+    m_name = TQString( "dp%1" ).arg( index );
 
     // check if this is an empty page tag
     if ( !e.hasChildNodes() )
@@ -718,7 +718,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint
 
         //ISO8601 chapter 5.5.3.2
         //TQDate doesn't encode it as this format.
-        m_page_duration = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
+        m_page_duration = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec );
     }
 
     TQDomElement pageEffect = e.namedItem( "PGEFFECT" ).toElement();
@@ -899,11 +899,11 @@ bool PageStyle::operator==( const PageStyle & pageStyle ) const
 
 TextStyle::TextStyle( TQDomElement & e, const uint index )
 {
-    m_name = TQString( "T%1" ).tqarg( index );
+    m_name = TQString( "T%1" ).arg( index );
     if ( e.hasAttribute( "family" ) )
         m_font_family = e.attribute( "family" );
     if ( e.hasAttribute( "pointSize" ) )
-        m_font_size = TQString( "%1pt" ).tqarg( e.attribute( "pointSize" ) );
+        m_font_size = TQString( "%1pt" ).arg( e.attribute( "pointSize" ) );
     if ( e.hasAttribute( "color" ) )
         m_color = e.attribute( "color" );
     if ( e.hasAttribute( "bold" ) && e.attribute( "bold" ) == "1" )
@@ -1017,25 +1017,25 @@ GraphicStyle::GraphicStyle( StyleFactory * styleFactory, TQDomElement & e, const
         }
         if ( textObjectElement.hasAttribute( "bleftpt" ) )
         {
-            m_textMarginLeft = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bleftpt" ) );
+            m_textMarginLeft = TQString( "%1pt" ).arg( textObjectElement.attribute( "bleftpt" ) );
         }
         if ( textObjectElement.hasAttribute( "bbottompt" ) )
         {
-            m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) );
+            m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) );
         }
         if ( textObjectElement.hasAttribute( "btoppt" ) )
         {
-            m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) );
+            m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) );
         }
         if ( textObjectElement.hasAttribute( "brightpt" ) )
         {
-            m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) );
+            m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) );
         }
 
     }
-    kdDebug(30518)<<" tqalignment :"<<m_textAlignment<<endl;
+    kdDebug(30518)<<" alignment :"<<m_textAlignment<<endl;
 
-    m_name = TQString( "gr%1" ).tqarg( index );
+    m_name = TQString( "gr%1" ).arg( index );
     if ( !pen.isNull() )
     {
         TQDomElement p = pen.toElement();
@@ -1352,7 +1352,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
     TQDomNode lineSpacing = e.namedItem( "LINESPACING" );
     TQDomNode counter = e.namedItem( "COUNTER" );
 
-    m_name = TQString( "P%1" ).tqarg( index );
+    m_name = TQString( "P%1" ).arg( index );
     if ( e.hasAttribute( "align" ) )
     {
         int align = e.attribute( "align" ).toInt();
@@ -1376,7 +1376,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
     if ( !shadow.isNull() )
     {
         TQDomElement s = shadow.toElement();
-        TQString distance = TQString( "%1pt" ).tqarg( s.attribute( "distance" ) );
+        TQString distance = TQString( "%1pt" ).arg( s.attribute( "distance" ) );
         m_text_shadow = distance + " " + distance;
     }
 
@@ -1416,7 +1416,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index )
         else if ( type == "double" )
             m_line_height = "200%";
         else if ( type == "multiple" )
-            m_line_height = TQString( "%1%" ).tqarg( l.attribute( "spacingvalue" ).toInt() * 100 );
+            m_line_height = TQString( "%1%" ).arg( l.attribute( "spacingvalue" ).toInt() * 100 );
         else if ( type == "custom" )
             m_line_spacing = StyleFactory::toCM( l.attribute( "spacingvalue" ) );
         else if ( type == "atleast" )
@@ -1503,7 +1503,7 @@ TQString ParagraphStyle::parseBorder( TQDomElement e )
                   e.attribute( "green" ).toInt(),
                   e.attribute( "blue" ).toInt() );
 
-    return TQString( "%1 %2 %3" ).tqarg( width ).tqarg( style ).tqarg( color.name() );
+    return TQString( "%1 %2 %3" ).arg( width ).arg( style ).arg( color.name() );
 }
 
 ListStyle::ListStyle( TQDomElement & e, const uint index )
@@ -1513,7 +1513,7 @@ ListStyle::ListStyle( TQDomElement & e, const uint index )
     m_color = "#000000";
     m_font_size = "100%";
 
-    m_name = TQString( "L%1" ).tqarg( index );
+    m_name = TQString( "L%1" ).arg( index );
 
     if ( e.hasAttribute( "type" ) )
     {
@@ -1598,9 +1598,9 @@ void ListStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const
         if ( level > 1 )
         {
             properties.setAttribute( "text:min-label-width",
-                                     TQString( "%1cm" ).tqarg( m_min_label_width ) );
+                                     TQString( "%1cm" ).arg( m_min_label_width ) );
             properties.setAttribute( "text:space-before",
-                                     TQString( "%1cm" ).tqarg( m_min_label_width * ( level - 1 ) ) );
+                                     TQString( "%1cm" ).arg( m_min_label_width * ( level - 1 ) ) );
         }
 
         if ( !m_color.isNull() )
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 0b89e187..8b9d1e77 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles()
   TQByteArray stylesData;
   TQBuffer stylesBuffer( stylesData );
 
-  TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() );
-  TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() );
+  TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
+  TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() );
   
   stylesBuffer.open( IO_WriteOnly );
   stylesWriter = new KoXmlWriter( &stylesBuffer );
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:ellipse" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
   if( !drawObject ) return;
   if( !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "draw:rect" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -393,7 +393,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
 
      double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
      double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
      xmlWriter->addAttribute( "draw:transform", rot );        
   }
   else 
@@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   
      
@@ -435,7 +435,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid+yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );        
      }  
      else
@@ -448,7 +448,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 
         double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle);
         double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); 
-        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );                
      } 
      
@@ -464,7 +464,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:y", yStr );
   
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
       xmlWriter->startElement( "draw:equation" );
       xmlWriter->addAttribute( "draw:formula", "$0 /3" );
@@ -486,21 +486,21 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
       xmlWriter->addAttribute( "draw:formula", "top+?f0 " );
       xmlWriter->addAttribute( "draw:name", "f4" ); 
       xmlWriter->endElement(); // draw:equation 
-    xmlWriter->endElement(); // draw:enhanced-tqgeometry
-  xmlWriter->endElement(); // draw:custom-tqshape
+    xmlWriter->endElement(); // draw:enhanced-geometry
+  xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -522,7 +522,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:x", 10 );
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
@@ -533,14 +533,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   /* draw IsocelesTriangle or RightTriangle */
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
 
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
        
     if  (drawObject->hasProperty("draw:mirror-vertical"))
     { 
@@ -588,14 +588,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
      double rotAngle = drawObject->getDoubleProperty("libppt:rotation" );
      double xMid = ( drawObject->left() + 0.5*drawObject->width() ); 
      double yMid = ( drawObject->top() + 0.5*drawObject->height() ); 
-     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); 
+     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); 
      xmlWriter->addAttribute( "draw:transform", rot );   
     }
-    if (drawObject->tqshape() == DrawObject::RightTriangle)
+    if (drawObject->shape() == DrawObject::RightTriangle)
     {
     xmlWriter->addAttribute( "draw:type", "right-triangle");
     }
-    else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle)
+    else if (drawObject->shape() == DrawObject::IsoscelesTriangle)
     {    
     xmlWriter->addAttribute( "draw:type", "isosceles-triangle");
           xmlWriter->startElement( "draw:equation" );
@@ -637,21 +637,21 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
           xmlWriter->endElement();    
     }
    
-    xmlWriter->endElement();    // enhanced-tqgeometry  
-  xmlWriter->endElement(); // custom-tqshape
+    xmlWriter->endElement();    // enhanced-geometry  
+  xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -675,7 +675,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 10 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if ( drawObject->hasProperty("draw:mirror-vertical") ) 
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -718,21 +718,21 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 bottom");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );  
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -763,7 +763,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
   xmlWriter->addAttribute( "svg:x", 1.25 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
         if  (drawObject->hasProperty("draw:mirror-vertical"))
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -834,21 +834,21 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -871,7 +871,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "hexagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0 " );
@@ -898,21 +898,21 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -935,7 +935,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:x", 10 );
   xmlWriter->addAttribute( "svg:y", 4.782 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "octagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "left+$0 " );
@@ -978,36 +978,36 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape  
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape  
 }
 
 void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-  xmlWriter->startElement( "draw:custom-tqshape" );
+  xmlWriter->startElement( "draw:custom-shape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
   xmlWriter->addAttribute( "draw:layer", "tqlayout" );
-    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+    xmlWriter->startElement( "draw:enhanced-geometry" );
     
-                if (drawObject->tqshape() == DrawObject::RightArrow)
+                if (drawObject->shape() == DrawObject::RightArrow)
                 xmlWriter->addAttribute( "draw:type", "right-arrow" );
-      else if (drawObject->tqshape() == DrawObject::LeftArrow)
+      else if (drawObject->shape() == DrawObject::LeftArrow)
       xmlWriter->addAttribute( "draw:type", "left-arrow" );
-    else if (drawObject->tqshape() == DrawObject::UpArrow)
+    else if (drawObject->shape() == DrawObject::UpArrow)
       xmlWriter->addAttribute( "draw:type", "up-arrow" );
-    else if (drawObject->tqshape() == DrawObject::DownArrow)
+    else if (drawObject->shape() == DrawObject::DownArrow)
       xmlWriter->addAttribute( "draw:type", "down-arrow" );   
     xmlWriter->startElement( "draw:equation" ); 
                 xmlWriter->addAttribute( "draw:formula","$1");  
@@ -1042,7 +1042,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
     xmlWriter->addAttribute( "draw:name","f7");  
                 xmlWriter->endElement(); // draw:equation
     xmlWriter->startElement( "draw:handle" );
-                if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == DrawObject::LeftArrow ) 
+                if ( drawObject->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) 
                 {
       xmlWriter->addAttribute( "draw:handle-range-x-maximum", 21600);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1050,7 +1050,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-maximum",10800);
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);
     }
-    else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow )
+    else if ( drawObject->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow )
                 {
                   xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800);  
       xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0);
@@ -1059,19 +1059,19 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
       xmlWriter->addAttribute("draw:handle-range-y-minimum",0);            
     }
                 xmlWriter->endElement(); // draw:handle
-      xmlWriter->endElement(); // draw:enhanced-tqgeometry  
-    xmlWriter->endElement(); // draw:custom-tqshape
+      xmlWriter->endElement(); // draw:enhanced-geometry  
+    xmlWriter->endElement(); // draw:custom-shape
 }
 
 void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter) return;
 
-  TQString x1Str = TQString("%1mm").tqarg( drawObject->left() );
-  TQString y1Str = TQString("%1mm").tqarg( drawObject->top() );
-  TQString x2Str = TQString("%1mm").tqarg( drawObject->left() + drawObject->width() );
-  TQString y2Str = TQString("%1mm").tqarg( drawObject->top() + drawObject->height() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString x1Str = TQString("%1mm").arg( drawObject->left() );
+  TQString y1Str = TQString("%1mm").arg( drawObject->top() );
+  TQString x2Str = TQString("%1mm").arg( drawObject->left() + drawObject->width() );
+  TQString y2Str = TQString("%1mm").arg( drawObject->top() + drawObject->height() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   if ( drawObject->hasProperty("draw:mirror-vertical") )
     { TQString temp = y1Str; 
@@ -1099,13 +1099,13 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1136,7 +1136,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "svg:x", 8.536 );
   xmlWriter->addAttribute( "svg:y", 1.461 );
   xmlWriter->endElement();
-        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+        xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "smiley" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0-15510 " );
@@ -1156,21 +1156,21 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
     xmlWriter->addAttribute( "draw:handle-range-y-minimum", 15510);
       xmlWriter->addAttribute("draw:handle-position","$0 top");         
           xmlWriter->endElement();    
-  xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+  xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
-    xmlWriter->startElement( "draw:custom-tqshape" );
+    xmlWriter->startElement( "draw:custom-shape" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
     xmlWriter->addAttribute( "svg:width", widthStr );
     xmlWriter->addAttribute( "svg:height", heightStr );
@@ -1193,22 +1193,22 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
   xmlWriter->addAttribute( "svg:x", 8.553 );
   xmlWriter->addAttribute( "svg:y", 5 );
   xmlWriter->endElement();
-  xmlWriter->startElement( "draw:enhanced-tqgeometry" );
+  xmlWriter->startElement( "draw:enhanced-geometry" );
   xmlWriter->addAttribute( "draw:type", "heart" );
         
-        xmlWriter->endElement(); // enhanced-tqgeometry
-    xmlWriter->endElement(); // custom-tqshape
+        xmlWriter->endElement(); // enhanced-geometry
+    xmlWriter->endElement(); // custom-shape
 }
 
 void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter)
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  TQString widthStr = TQString("%1mm").tqarg( drawObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( drawObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( drawObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( drawObject->top() );
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString widthStr = TQString("%1mm").arg( drawObject->width() );
+  TQString heightStr = TQString("%1mm").arg( drawObject->height() );
+  TQString xStr = TQString("%1mm").arg( drawObject->left() );
+  TQString yStr = TQString("%1mm").arg( drawObject->top() );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
     xmlWriter->startElement( "draw:path" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm
   drawingObjectCounter++;
   
    
-  if (drawObject->tqshape() == DrawObject::Ellipse)
+  if (drawObject->shape() == DrawObject::Ellipse)
   { 
     processEllipse (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Rectangle)
+  else if (drawObject->shape() == DrawObject::Rectangle)
   { 
     processRectangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::RoundRectangle)
+  else if (drawObject->shape() == DrawObject::RoundRectangle)
   { 
     processRoundRectangle (drawObject, xmlWriter );
   }
-  else  if (drawObject->tqshape() == DrawObject::Diamond)
+  else  if (drawObject->shape() == DrawObject::Diamond)
   {  
     processDiamond (drawObject, xmlWriter ); 
   } 
-  else  if (drawObject->tqshape() == DrawObject::IsoscelesTriangle |                
-            drawObject->tqshape() == DrawObject::RightTriangle)
+  else  if (drawObject->shape() == DrawObject::IsoscelesTriangle |                
+            drawObject->shape() == DrawObject::RightTriangle)
   {  
     processTriangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Trapezoid)
+  else if (drawObject->shape() == DrawObject::Trapezoid)
   {  
     processTrapezoid (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Parallelogram)
+  else if (drawObject->shape() == DrawObject::Parallelogram)
   {  
     processParallelogram( drawObject, xmlWriter); 
   }
-  else if (drawObject->tqshape() == DrawObject::Hexagon)
+  else if (drawObject->shape() == DrawObject::Hexagon)
   {  
     processHexagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Octagon)
+  else if (drawObject->shape() == DrawObject::Octagon)
   {  
     processOctagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::RightArrow | 
-     drawObject->tqshape() == DrawObject::LeftArrow | 
-     drawObject->tqshape() == DrawObject::UpArrow | 
-     drawObject->tqshape() == DrawObject::DownArrow )
+  else if (drawObject->shape() == DrawObject::RightArrow | 
+     drawObject->shape() == DrawObject::LeftArrow | 
+     drawObject->shape() == DrawObject::UpArrow | 
+     drawObject->shape() == DrawObject::DownArrow )
   { 
     processArrow ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Line)
+  else if (drawObject->shape() == DrawObject::Line)
   {  
     processLine ( drawObject, xmlWriter );
   }
-  else if (drawObject->tqshape() == DrawObject::Smiley)
+  else if (drawObject->shape() == DrawObject::Smiley)
   { 
     processSmiley (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::Heart)
+  else if (drawObject->shape() == DrawObject::Heart)
   { 
     processHeart (drawObject, xmlWriter ); 
   }
-  else if (drawObject->tqshape() == DrawObject::FreeLine)
+  else if (drawObject->shape() == DrawObject::FreeLine)
   { 
     processFreeLine (drawObject, xmlWriter ); 
   }
@@ -1317,10 +1317,10 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 //  TQString pStr = string( textObject->text() ).string();
   TQString pStr;
  
-  TQString widthStr = TQString("%1mm").tqarg( textObject->width() );
-  TQString heightStr = TQString("%1mm").tqarg( textObject->height() );
-  TQString xStr = TQString("%1mm").tqarg( textObject->left() );
-  TQString yStr = TQString("%1mm").tqarg( textObject->top() );
+  TQString widthStr = TQString("%1mm").arg( textObject->width() );
+  TQString heightStr = TQString("%1mm").arg( textObject->height() );
+  TQString xStr = TQString("%1mm").arg( textObject->left() );
+  TQString yStr = TQString("%1mm").arg( textObject->top() );
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
@@ -1381,9 +1381,9 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 
   TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = TQString("page%1").tqarg(slideNo+1);
+    nameStr = TQString("page%1").arg(slideNo+1);
 
-  TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1);
+  TQString styleNameStr = TQString("dp%1").arg(slideNo+1);
 
   xmlWriter->startElement( "draw:page" );
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
@@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
 
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:name", styleName );
@@ -1490,7 +1490,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "svg:stroke-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
-      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").arg( strokeWidth ) );
     }
 
     if( drawObject->hasProperty( "svg:stroke-color" ) )
@@ -1528,14 +1528,14 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     {      
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-start-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     if( drawObject->hasProperty( "draw:marker-end-width" ) )
     {
       double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" );
       double arrowWidth = (drawObject->getDoubleProperty("draw:marker-end-width") * strokeWidth);
-      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").arg( arrowWidth ) );
     }
 
     
@@ -1569,19 +1569,19 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
     if( drawObject->hasProperty( "draw:shadow-opacity" ) )
     {      
       double opacity = drawObject->getDoubleProperty("draw:shadow-opacity") ;
-      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) );
+      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").arg( opacity ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-x" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ;
-      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-y" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); 
-      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) );
     }
     
    
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index d0343b43..29870cbd 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.cpp
+++ b/filters/kpresenter/powerpoint/libppt/objects.cpp
@@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object )
 class DrawObject::Private
 {
 public:
-  unsigned tqshape;
+  unsigned shape;
   bool isVerFlip; 
   bool isHorFlip;
 };
@@ -387,7 +387,7 @@ public:
 DrawObject::DrawObject()
 {
   d = new Private;
-  d->tqshape = None;
+  d->shape = None;
 }
 
 DrawObject::~DrawObject()
@@ -395,14 +395,14 @@ DrawObject::~DrawObject()
   delete d;
 }
 
-unsigned DrawObject::tqshape() const
+unsigned DrawObject::shape() const
 {
-  return d->tqshape;
+  return d->shape;
 }
 
 void DrawObject::setShape( unsigned s )
 {
-  d->tqshape = s;
+  d->shape = s;
 }
 
 bool DrawObject::isVerFlip() const
diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h
index a9160897..823e2a75 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.h
+++ b/filters/kpresenter/powerpoint/libppt/objects.h
@@ -103,7 +103,7 @@ public:
     Body        = 1, 
     Notes       = 2, 
     NotUsed     = 3,
-    Other       = 4,  // text in a tqshape
+    Other       = 4,  // text in a shape
     CenterBody  = 5,  // subtitle in title slide
     CenterTitle = 6,  // title in title slide
     HalfBody    = 7,  // body in two-column slide
@@ -184,7 +184,7 @@ public:
   virtual ~DrawObject();
   virtual bool isDrawing() const { return true; }
    
-  unsigned tqshape() const;
+  unsigned shape() const;
   void setShape( unsigned s );
 
   bool isVerFlip() const;
diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp
index b905539d..abfa9385 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -115,7 +115,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -573,8 +573,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -589,7 +589,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
   
   return result;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index bf3fc51f..af035c69 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */
 class msofbtSpAtom::Private
 {
 public:
-  unsigned long tqshapeId;
+  unsigned long shapeId;
   unsigned long persistentFlag;
   bool background;
   bool hFlip; 
@@ -4115,7 +4115,7 @@ public:
 msofbtSpAtom ::msofbtSpAtom ()
 {
   d = new Private;
-  d->tqshapeId = 0;
+  d->shapeId = 0;
   d->persistentFlag = 0;
   d->background = false;
   d->hFlip = false; 
@@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom ()
   delete d;
 }
 
-unsigned long msofbtSpAtom::tqshapeId() const
+unsigned long msofbtSpAtom::shapeId() const
 {
-  return d->tqshapeId;
+  return d->shapeId;
 }
 
 void msofbtSpAtom::setShapeId( unsigned long id )
 {
-  d->tqshapeId = id;
+  d->shapeId = id;
 }
 
-const char* msofbtSpAtom::tqshapeTypeAsString() const
+const char* msofbtSpAtom::shapeTypeAsString() const
 {
   switch( instance() )
   {
@@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom )
 
   // set rect bound of current group
 
-  // this is tqshape for the group, no need to 
+  // this is shape for the group, no need to 
   d->isShapeGroup = true;
 }
 
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h
index 6eec1564..b2a0f649 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -1901,9 +1901,9 @@ public:
   msofbtSpAtom ();
   ~msofbtSpAtom ();
 
-  unsigned long tqshapeId() const;
+  unsigned long shapeId() const;
   void setShapeId( unsigned long id );
-  const char* tqshapeTypeAsString() const;
+  const char* shapeTypeAsString() const;
   unsigned long persistentFlag() const;
   void setPersistentFlag( unsigned long persistentFlag );
 
@@ -1957,10 +1957,10 @@ public:
    FillSolid,             // Fill with a solid color
    FillPattern,           // Fill with a pattern (bitmap)
    FillTexture,           // A texture (pattern with its own color map)
-   FillPicture,           // Center a picture in the tqshape
+   FillPicture,           // Center a picture in the shape
    FillShade,             // Shade from start to end points
    FillShadeCenter,       // Shade from bounding rectangle to end point
-   FillShadeShape,        // Shade from tqshape outline to end point
+   FillShadeShape,        // Shade from shape outline to end point
    FillShadeScale,        // Similar to msofillShade, but the fillAngle
    FillShadeTitle,        // special type - shade to title ---  for PP 
    FillBackground         // Use the background fill color/pattern
@@ -2385,9 +2385,9 @@ public:
   int ruid() const; // rule ID
   void setRuid( int ruid );
   int align() const;
-  void setAlign( int align );// tqalignment
+  void setAlign( int align );// alignment
   int cProxies() const;
-  void setCProxies( int cProxies );// number of tqshapes governed by rule
+  void setCProxies( int cProxies );// number of shapes governed by rule
     
   void setData( unsigned size, const unsigned char* data );
   const char* name(){ return "msofbtAlignRuleAtom "; }
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index 2f15eeed..5b88d11c 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -390,7 +390,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               //kdDebug()<< "   Type (%2d)   >%s< ",
               //    nn, (*it).latin1() );
             nn++;
-            // Grep horizontal tqalignment
+            // Grep horizontal alignment
             if      ( (*it) == "1")
             {
                 kdDebug()<< " = left align\n";
@@ -407,7 +407,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               align = 2; // center
 	    }
 
-            // Grep verticale tqalignment
+            // Grep verticale alignment
             else if ( (*it) == "VT")
             {
                 kdDebug()<<" = top valign\n";
@@ -1268,7 +1268,7 @@ APPLIXSPREADImport::readHeader (TQTextStream &stream)
       TQMessageBox::critical (0L, "Applix spreadsheet header problem",
               TQString ("The Applix Spreadsheet header is not correct. "
                        "May be it is not an applix spreadsheet file! <BR>"
-                       "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                       "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 			"Okay");
 
 
diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html
index 968bf333..c944ef5c 100644
--- a/filters/kspread/applixspread/status.html
+++ b/filters/kspread/applixspread/status.html
@@ -53,7 +53,7 @@
        - tests the headline of the document<br>
        - converts &lt;, &gt;, &amp;, to &amp;lt; &amp;gt; &amp;amp;<br>
        - converts all applix special characters<br>
-       - converts fontsize, fontcolor, horizontal and vertical tqalignment, bold, italic, underline<br>
+       - converts fontsize, fontcolor, horizontal and vertical alignment, bold, italic, underline<br>
        - eats long text strings (more than one row in inputfile)<br>
        - converts different tables inside of one document<br>
        - cellformat: background color, brushstyles, brushcolor<br>
@@ -352,43 +352,43 @@
 
 
          <spacer size="20"><U>6.1.1. Part 1 - Alignment format</U><BR>
-         <spacer size="30">This is the tqalignment format for vertical, horizontal tqalignment<BR>
+         <spacer size="30">This is the alignment format for vertical, horizontal alignment<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
            <TD>6.1.1.1&nbsp;&nbsp;</TD>
            <TD><B>1</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>left</TD>
           </TR>
           <TR>
            <TD>6.1.1.2&nbsp;&nbsp;</TD>
            <TD><B>2</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>right</TD>
           </TR>
           <TR>
            <TD>6.1.1.3&nbsp;&nbsp;</TD>
            <TD><B>3</B></TD>
-           <TD>horizontal tqalignment</TD>
+           <TD>horizontal alignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.4&nbsp;&nbsp;</TD>
            <TD><B>VT</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>top</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VC</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VB</B></TD>
-           <TD>vertical tqalignment</TD>
+           <TD>vertical alignment</TD>
            <TD>bottom</TD>
           </TR>
           <TR>
@@ -402,7 +402,7 @@
 
 
          <spacer size="20"><U>6.1.2. Part 2 - Text format</U><BR>
-         <spacer size="30">This is the tqalignment format for the text<BR>
+         <spacer size="30">This is the alignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
@@ -441,7 +441,7 @@
         
 
          <spacer size="20"><U>6.1.3. Part 3 - Cell format</U><BR>
-         <spacer size="30">This is the tqalignment format for the text<BR>
+         <spacer size="30">This is the alignment format for the text<BR>
          <spacer size="30">
          <TABLE CELLPADDING="0" BORDER="0">
           <TR>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 95f4727c..0464b782 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
     kapp->restoreOverrideCursor();
     
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -613,7 +613,7 @@ TQTextCodec* CSVDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index a4ef1347..285565e7 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
   kapp->restoreOverrideCursor();
 
   TQStringList encodings;
-  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
   encodings += KGlobal::charsets()->descriptiveEncodingNames();
   // Add a few non-standard encodings, which might be useful for text files
   const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-  encodings << description.tqarg("Apple Roman"); // Apple
-  encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-  encodings << description.tqarg("CP 1258"); // Windows
+  encodings << description.arg("Apple Roman"); // Apple
+  encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+  encodings << description.arg("CP 1258"); // Windows
 
   m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -306,7 +306,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index 5e709007..6f7633ec 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -379,7 +379,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -428,7 +428,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index a60c3d65..d02f6712 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -254,7 +254,7 @@
                                 <property name="text">
                                     <string>&lt;SHEETNAME&gt; gets replaced by the name of the next sheet.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp
index acc1e27d..2c8ba3b8 100644
--- a/filters/kspread/dbase/dbase.cpp
+++ b/filters/kspread/dbase/dbase.cpp
@@ -165,7 +165,7 @@ bool DBase::load( const TQString& filename )
   }
 
   // set the index to the first record
-  m_stream.tqdevice()->at( m_headerLength );
+  m_stream.device()->at( m_headerLength );
 
   return true;
 }
@@ -184,7 +184,7 @@ TQStringList DBase::readRecord( unsigned recno )
 
   // seek to where the record is
   unsigned filepos = m_headerLength + recno * m_recordLength;
-  m_stream.tqdevice()->at( filepos );
+  m_stream.device()->at( filepos );
 
   // first char == '*' means the record is deleted
   // so we just skip it
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index e705a933..19f5888b 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() );
   xmlWriter->addAttribute( "table:print", "false" );
   xmlWriter->addAttribute( "table:protected", "false" );
-  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex));
+  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").arg(sheetFormatIndex));
   sheetFormatIndex++;
   
   unsigned ci = 0;
@@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table" );  
   xmlWriter->addAttribute( "style:master-page-name", "Default" );  
-  xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ta%1").arg(sheetFormatIndex) );  
   sheetFormatIndex++;
   
   xmlWriter->startElement( "style:table-properties" );
@@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX
   xmlWriter->addAttribute( "table:default-style-name", "Default" );  
   xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat );  
-  xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("co%1").arg(columnFormatIndex) );  
   columnFormatIndex++;
 
   xmlWriter->endElement();  // table:table-column
@@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/
   
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-column" );  
-  xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("co%1").arg(columnFormatIndex) );  
   columnFormatIndex++;
   
   xmlWriter->startElement( "style:table-column-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) );
+  xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) );
   xmlWriter->endElement();  // style:table-column-properties
   
   xmlWriter->endElement();  // style:style
@@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri
   
   xmlWriter->startElement( "table:table-row" );
   xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" );  
-  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").arg(rowFormatIndex) );  
   rowFormatIndex++;
   
   for( int i = 0; i <= lastCol; i++ )
@@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-row" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat );  
-  xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ro%1").arg(rowFormatIndex) );  
   rowFormatIndex++;
   
   xmlWriter->startElement( "style:table-row-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) );
+  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) );
   xmlWriter->endElement();  // style:table-row-properties
   
   xmlWriter->endElement();  // style:style
@@ -703,7 +703,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     const UString& valueFormat = format.valueFormat();
     if( !valueFormat.isEmpty() )
     {
-      refName = TQString("N%1").tqarg(cell->formatIndex());
+      refName = TQString("N%1").arg(cell->formatIndex());
       TQString numformat = string( valueFormat ).string();
       processValueFormat( numformat, refName, xmlWriter );
     }
@@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     // now the real table-cell  
     xmlWriter->startElement( "style:style" );
     xmlWriter->addAttribute( "style:family", "table-cell" );  
-    xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) );  
+    xmlWriter->addAttribute( "style:name", TQString("ce%1").arg( cell->formatIndex() ) );  
     if( !refName.isEmpty() )
       xmlWriter->addAttribute( "style:data-style-name", refName );  
     
@@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
   if( !xmlWriter ) return;
   
   const FormatFont& font = format->font();
-  const FormatAlignment& align = format->tqalignment();
+  const FormatAlignment& align = format->alignment();
   const FormatBackground& back = format->background();
   const FormatBorders& borders = format->borders();
   
@@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
     if( !font.fontFamily().isEmpty() )
       xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() );
       
-    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) );  
+    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").arg(font.fontSize()) );  
     
     xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) );
     
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 651b7f2c..6985a434 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       
     format.setFont( convertFont( xf.fontIndex() ) );
     
-    FormatAlignment tqalignment;
+    FormatAlignment alignment;
     switch( xf.horizontalAlignment() )
     {
       case XFRecord::Left:     
-        tqalignment.setAlignX( Format::Left ); break;
+        alignment.setAlignX( Format::Left ); break;
       case XFRecord::Right:    
-        tqalignment.setAlignX( Format::Right ); break;
+        alignment.setAlignX( Format::Right ); break;
       case XFRecord::Centered: 
-        tqalignment.setAlignX( Format::Center ); break;
+        alignment.setAlignX( Format::Center ); break;
       default: break;
       // FIXME still unsupported: Repeat, Justified, Filled, Distributed
     };
     switch( xf.verticalAlignment() )
     {
       case XFRecord::Top:
-        tqalignment.setAlignY( Format::Top ); break;
+        alignment.setAlignY( Format::Top ); break;
       case XFRecord::VCentered:
-        tqalignment.setAlignY( Format::Middle ); break;
+        alignment.setAlignY( Format::Middle ); break;
       case XFRecord::Bottom:
-        tqalignment.setAlignY( Format::Bottom ); break;
+        alignment.setAlignY( Format::Bottom ); break;
       default: break;
       // FIXME still unsupported: Justified, Distributed
     }
-    tqalignment.setWrap( xf.textWrap() );
-    format.setAlignment( tqalignment );
+    alignment.setWrap( xf.textWrap() );
+    format.setAlignment( alignment );
   
     FormatBorders borders;
       
@@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     
   format.setFont( convertFont( xf.fontIndex() ) );
   
-  FormatAlignment tqalignment;
+  FormatAlignment alignment;
   switch( xf.horizontalAlignment() )
   {
     case XFRecord::Left:     
-      tqalignment.setAlignX( Format::Left ); break;
+      alignment.setAlignX( Format::Left ); break;
     case XFRecord::Right:    
-      tqalignment.setAlignX( Format::Right ); break;
+      alignment.setAlignX( Format::Right ); break;
     case XFRecord::Centered: 
-      tqalignment.setAlignX( Format::Center ); break;
+      alignment.setAlignX( Format::Center ); break;
     default: break;
     // FIXME still unsupported: Repeat, Justified, Filled, Distributed
   };
   switch( xf.verticalAlignment() )
   {
     case XFRecord::Top:
-      tqalignment.setAlignY( Format::Top ); break;
+      alignment.setAlignY( Format::Top ); break;
     case XFRecord::VCentered:
-      tqalignment.setAlignY( Format::Middle ); break;
+      alignment.setAlignY( Format::Middle ); break;
     case XFRecord::Bottom:
-      tqalignment.setAlignY( Format::Bottom ); break;
+      alignment.setAlignY( Format::Bottom ); break;
     default: break;
     // FIXME still unsupported: Justified, Distributed
   }
-  tqalignment.setWrap( xf.textWrap() );
-  format.setAlignment( tqalignment );
+  alignment.setWrap( xf.textWrap() );
+  format.setAlignment( alignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 8cbdfd53..c05d223b 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -2805,17 +2805,17 @@ public:
     Distributed };
   
   /**
-   * Gets the horizontal tqalignment, e.g Left.
+   * Gets the horizontal alignment, e.g Left.
    */
   unsigned horizontalAlignment() const;
   
   /**
-   * Sets the horizontal tqalignment, e.g Left.
+   * Sets the horizontal alignment, e.g Left.
    */
   void setHorizontalAlignment( unsigned ha );
   
   /**
-   * Returns human-readable string representation of the horizontal tqalignment.
+   * Returns human-readable string representation of the horizontal alignment.
      For example, XFRecord::Left will return "Left".
    */
   const char* horizontalAlignmentAsString() const; 
@@ -2828,21 +2828,21 @@ public:
     VDistributed = 4 };
   
   /**
-   * Gets the vertical tqalignment, e.g Bottom.
+   * Gets the vertical alignment, e.g Bottom.
    *
    * \sa setVerticalAlignment
    */
   unsigned verticalAlignment() const;
   
   /**
-   * Sets the vertical tqalignment, e.g Top.
+   * Sets the vertical alignment, e.g Top.
    *
    * \sa verticalAlignment
    */
   void setVerticalAlignment( unsigned va );
   
   /**
-   * Returns human-readable string representation of the vertical tqalignment.
+   * Returns human-readable string representation of the vertical alignment.
      For example, XFRecord::Top will return "Top".
    */
   const char* verticalAlignmentAsString() const; 
diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp
index b54f2a4c..8ce69f24 100644
--- a/filters/kspread/excel/sidewinder/format.cpp
+++ b/filters/kspread/excel/sidewinder/format.cpp
@@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align )
   return assign( align );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatAlignment& FormatAlignment::assign( const FormatAlignment& align )
 {
   d->null          = align.isNull();
@@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun
   return assign( background );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatBackground& FormatBackground::assign( const FormatBackground& background )
 {
   d->null         = background.isNull();
@@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border )
   return assign( border );
 }
 
-// assign from another tqalignment
+// assign from another alignment
 FormatBorders& FormatBorders::assign( const FormatBorders& border )
 {
   d->null         = border.isNull();
@@ -581,7 +581,7 @@ class Format::Private
 {
 public:
   FormatFont font;
-  FormatAlignment tqalignment;
+  FormatAlignment alignment;
   FormatBorders borders;
   FormatBackground background;
   UString valueFormat;
@@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f )
 Format& Format::assign( const Format& f )
 {
   d->font = f.font();
-  d->tqalignment = f.tqalignment();
+  d->alignment = f.alignment();
   d->borders = f.borders();
   d->valueFormat = f.valueFormat();
   d->background = f.background();
@@ -626,7 +626,7 @@ Format& Format::assign( const Format& f )
 
 bool Format::isNull() const
 {
-  return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull();
+  return d->font.isNull() && d->alignment.isNull() && d->borders.isNull();
 }
 
 FormatFont& Format::font() const
@@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font )
   d->font = font;
 }
 
-FormatAlignment& Format::tqalignment() const
+FormatAlignment& Format::alignment() const
 {
-  return d->tqalignment;
+  return d->alignment;
 }
 
-void Format::setAlignment( const FormatAlignment& tqalignment )
+void Format::setAlignment( const FormatAlignment& alignment )
 {
-  d->tqalignment = tqalignment;
+  d->alignment = alignment;
 }
 
 FormatBorders& Format::borders() const
@@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat )
 // merge f into current format
 Format& Format::apply( const Format& f )
 {
-  if( !f.tqalignment().isNull() )
-    tqalignment() = f.tqalignment();
+  if( !f.alignment().isNull() )
+    alignment() = f.alignment();
   if( !f.font().isNull() )
     font() = f.font();
   if( !f.borders().isNull() )
@@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const
 {
 	return 
     d->font == format.d->font &&
-    d->tqalignment == format.d->tqalignment &&
+    d->alignment == format.d->alignment &&
     d->borders == format.d->borders &&
     d->background == format.d->background &&
     d->valueFormat == format.d->valueFormat;
@@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const
 {
 	return 
     d->font != format.d->font ||
-    d->tqalignment != format.d->tqalignment ||
+    d->alignment != format.d->alignment ||
     d->borders != format.d->borders ||
     d->background != format.d->background ||
     d->valueFormat != format.d->valueFormat;
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index 1177b1bb..acb566a5 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -266,9 +266,9 @@ private:
 
 
 /**
- * Defines tqalignment information for cell format.
+ * Defines alignment information for cell format.
  *
- * Class FormatAlignment defines the horizontal and vertical tqalignment
+ * Class FormatAlignment defines the horizontal and vertical alignment
  * for the text inside a cell.
  * 
  */
@@ -278,37 +278,37 @@ class FormatAlignment
 public:
 
   /**
-   * Creates a default tqalignment information.
+   * Creates a default alignment information.
    */
   FormatAlignment();
   
   /**
-   * Destroys the tqalignment information
+   * Destroys the alignment information
    */
   ~FormatAlignment();
   
   /**
-   * Creates a copy of tqalignment information.
+   * Creates a copy of alignment information.
    */
   FormatAlignment( const FormatAlignment& );
   
   /**
-   * Assigns from another tqalignment information.
+   * Assigns from another alignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
   
   /**
-   * Assigns from another tqalignment information.
+   * Assigns from another alignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
   
   /**
-   * Returns true if it is a default tqalignment information.
+   * Returns true if it is a default alignment information.
    */
   bool isNull() const;
   
   /**
-   * Returns horizontal tqalignment. Possible values are
+   * Returns horizontal alignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
    *
    * \sa setAlignX
@@ -316,14 +316,14 @@ public:
   unsigned alignX() const;
   
   /**
-   * Sets the horizontal tqalignment.
+   * Sets the horizontal alignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
   
   /**
-   * Returns horizontal tqalignment. Possible values are
+   * Returns horizontal alignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
@@ -331,7 +331,7 @@ public:
   unsigned alignY() const;
   
   /**
-   * Sets the horizontal tqalignment.
+   * Sets the horizontal alignment.
    *
    * \sa alignY
    */
@@ -380,12 +380,12 @@ public:
    void setRotationAngle( unsigned r );
        
   /**
-   * Returns true if this tqalignment is equal to f; otherwise returns false.
+   * Returns true if this alignment is equal to f; otherwise returns false.
    */
   bool operator==(const FormatAlignment& f) const;
 
   /**
-   * Returns true if this tqalignment is not equal to f; otherwise returns false.
+   * Returns true if this alignment is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatAlignment& f) const;
 
@@ -683,14 +683,14 @@ public:
   void setFont( const FormatFont& font );
   
   /** 
-   * Returns a constant reference to the tqalignment information of this format.
+   * Returns a constant reference to the alignment information of this format.
    */
-  FormatAlignment& tqalignment() const;
+  FormatAlignment& alignment() const;
   
   /** 
-   * Sets new tqalignment information for this format.
+   * Sets new alignment information for this format.
    */
-  void setAlignment( const FormatAlignment& tqalignment );
+  void setAlignment( const FormatAlignment& alignment );
   
   /** 
    * Returns a reference to the borders information of this format.
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index 38fe8cb5..6f12ae13 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -116,7 +116,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -509,11 +509,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -577,8 +577,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
 
        // create a new entry
@@ -650,7 +650,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
 
@@ -1286,9 +1286,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
 
   return result;
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index 04949083..7150f7e4 100644
--- a/filters/kspread/gnumeric/gnumeric.xsd
+++ b/filters/kspread/gnumeric/gnumeric.xsd
@@ -427,8 +427,8 @@
                 </xsd:complexType>
             </xsd:element>
         </xsd:sequence>
-        <xsd:attribute name="HAlign"       type="gmr:horizontal_tqalignment"/>
-        <xsd:attribute name="VAlign"       type="gmr:vertical_tqalignment"  />
+        <xsd:attribute name="HAlign"       type="gmr:horizontal_alignment"/>
+        <xsd:attribute name="VAlign"       type="gmr:vertical_alignment"  />
         <xsd:attribute name="WrapText"     type="xsd:boolean"          	  />
         <xsd:attribute name="ShrinkToFit"  type="xsd:integer"          	  />	<!-- should be bool, but some files have odd truth values -->
         <xsd:attribute name="Rotation"	   type="xsd:integer"		  use="optional"/>
@@ -492,7 +492,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="horizontal_tqalignment">
+    <xsd:simpleType name="horizontal_alignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                   1 = GENERAL
@@ -508,7 +508,7 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:simpleType name="vertical_tqalignment">
+    <xsd:simpleType name="vertical_alignment">
         <xsd:restriction base="xsd:integer">
             <!-- this is a bit map as follows:
                  1 = TOP
@@ -644,7 +644,7 @@
                     <xsd:attribute name="FillColor"        type="gmr:color"               use="required"/>
                     <xsd:attribute name="Type"             type="gmr:objectfilled"        use="required"/>
                     <xsd:attribute name="Width"            type="xsd:positiveInteger" use="required"/>
-                    <!-- the arrow tqshape attributes are only used if the type is
+                    <!-- the arrow shape attributes are only used if the type is
                          arrow (type="gmr:2")
                     -->
                     <xsd:attribute name="ArrowShapeA"      type="xsd:double"          use="optional"/>
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index b5666916..b0709ede 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -1443,7 +1443,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const
                         //<gmr:CellComment Author="" Text="cvbcvbxcvb&#10;cb&#10;xc&#10;vbxcv&#10;" ObjectBound="A1" ObjectOffset="0 0 0 0" ObjectAnchorType="17 16 17 16" Direction="17"/>
                         cellComment = gnumeric_doc.createElement("gmr:CellComment");
                         cellComment.setAttribute( "Text", cell->format()->comment( currentcolumn, currentrow ) );
-                        TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow );
+                        TQString sCell=TQString( "%1%2" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow );
 
                         cellComment.setAttribute("ObjectBound", sCell );
                         objects.appendChild(cellComment);
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index 72dd6875..8a0df7d0 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name )
            m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) );
 
   m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) );
-  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) );
+  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) );
 
   m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly );
 
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index b81d8e22..f680207e 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -186,7 +186,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
   str += "<html>\n";
   str += "<head>\n";
   str += "<meta http-equiv=\"Content-Type\" ";
-  str += TQString("content=\"text/html; charset=%1\">\n").tqarg( m_dialog->encoding()->mimeName() );
+  str += TQString("content=\"text/html; charset=%1\">\n").arg( m_dialog->encoding()->mimeName() );
   str += "<meta name=\"Generator\" ";
   str += "content=\"KSpread HTML Export Filter Version = ";
   str += KOFFICE_VERSION_STRING;
@@ -202,7 +202,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str )
 
   str += "<title>" + title + "</title>\n";
   str += "</head>\n";
-  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").tqarg(
+  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").arg(
       sheet->isRightToLeft()?"rtl":"ltr");
 
   str += "<a name=\"__top\">\n";
@@ -234,8 +234,8 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
     int step=iMaxRow > 50 ? iMaxRow/50 : 1;
     int i=1;
 
-    str += "<" + html_table_tag + html_table_options.tqarg( m_dialog->useBorders() ? "1" : "0" ).tqarg( m_dialog->pixelsBetweenCells() ) +
-           TQString("dir=\"%1\">\n").tqarg(sheet->isRightToLeft()?"rtl":"ltr");
+    str += "<" + html_table_tag + html_table_options.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) +
+           TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr");
 
     unsigned int nonempty_cells_prev=0;
 
@@ -297,7 +297,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
 #endif
             line += "  <" + html_cell_tag + html_cell_options;
 	    if (text.isRightToLeft() != sheet->isRightToLeft())
-                line += TQString(" dir=\"%1\" ").tqarg(text.isRightToLeft()?"rtl":"ltr");
+                line += TQString(" dir=\"%1\" ").arg(text.isRightToLeft()?"rtl":"ltr");
             if (bgcolor.isValid() && bgcolor.name()!="#ffffff") // change color only for non-white cells
                 line += " bgcolor=\"" + bgcolor.name() + "\"";
 
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc
index 8ee9eee0..07b1fbe4 100644
--- a/filters/kspread/latex/export/fileheader.cc
+++ b/filters/kspread/latex/export/fileheader.cc
@@ -79,7 +79,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse tqchildren markups --> PAPERBORDERS
+	// Analyse children markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -282,7 +282,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
+		out << "\\usepackage[a4paper]{geometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index a7f03f60..7713a9dc 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc
index a2256d5e..886f6c11 100644
--- a/filters/kspread/latex/export/map.cc
+++ b/filters/kspread/latex/export/map.cc
@@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise)
 	/* Analyse of the parameters */
 	kdDebug(30522) << "ANALYSE A MAP" << endl;
 
-	/* Analyse of the tqchildren markups */
+	/* Analyse of the children markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		// Only tables
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc
index 6b85f243..fb2c8e1f 100644
--- a/filters/kspread/latex/export/xmlparser.cc
+++ b/filters/kspread/latex/export/xmlparser.cc
@@ -89,18 +89,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
-		if ( tqchildren.count() )
-			return tqchildren.item(index);
+		TQDomNodeList children = balise.toElement().elementsByTagName(name);
+		if ( children.count() )
+			return children.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList tqchildren = balise.childNodes();
-	if ( tqchildren.count() )
-		return tqchildren.item(index);
+	TQDomNodeList children = balise.childNodes();
+	if ( children.count() )
+		return children.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 828d817a..ce1a55ad 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement &
 
   TQDomElement style = doc.createElement( "style:properties" );
   style.setAttribute( "style:font-name", font.family() );
-  style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) );
+  style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) );
   style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) );
   style.setAttribute( "fo:language", language );
   style.setAttribute( "fo:country", country );
@@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a
     height = sheet->print()->paperHeight() / 10;
   }
 
-  TQString sWidth  = TQString( "%1cm" ).tqarg( width  );
-  TQString sHeight = TQString( "%1cm" ).tqarg( height );
+  TQString sWidth  = TQString( "%1cm" ).arg( width  );
+  TQString sHeight = TQString( "%1cm" ).arg( height );
 
   TQDomElement pageMaster = doc.createElement( "style:page-master" );
   pageMaster.setAttribute( "style:name", "pm1" );
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 0fbe52e0..8e0327c9 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
             kdDebug(30518)<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
+    format = TQString( "%1x%2" ).arg( width ).arg( height );
     kdDebug(30518)<<" format : "<<format<<endl;
     table->print()->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -2289,7 +2289,7 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       if ( d > 1.0 )
       {
         TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") );
-        message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) );
+        message.arg( content.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index f075713a..9585ae13 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cc
@@ -111,7 +111,7 @@ TQString OpenCalcStyles::cellStyle( CellStyle const & cs )
 
   m_cellStyles.append( t );
 
-  t->name = TQString( "ce%1" ).tqarg( m_cellStyles.count() );
+  t->name = TQString( "ce%1" ).arg( m_cellStyles.count() );
 
   return t->name;
 }
@@ -132,7 +132,7 @@ TQString OpenCalcStyles::columnStyle( ColumnStyle const & cs )
 
   m_columnStyles.append( t );
 
-  t->name = TQString( "co%1" ).tqarg( m_columnStyles.count() );
+  t->name = TQString( "co%1" ).arg( m_columnStyles.count() );
 
   return t->name;
 }
@@ -158,7 +158,7 @@ TQString OpenCalcStyles::rowStyle( RowStyle const & rs )
 
   m_rowStyles.append( t );
 
-  t->name = TQString( "ro%1" ).tqarg( m_rowStyles.count() );
+  t->name = TQString( "ro%1" ).arg( m_rowStyles.count() );
 
   return t->name;
 }
@@ -179,14 +179,14 @@ TQString OpenCalcStyles::sheetStyle( SheetStyle const & ts )
 
   m_sheetStyles.append( t );
 
-  t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() );
+  t->name = TQString( "ta%1" ).arg( m_sheetStyles.count() );
 
   return t->name;
 }
 
 TQString convertPenToString( TQPen const & pen )
 {
-  TQString s( TQString( "%1cm solid " ).tqarg( pen.width() * 0.035 ) );
+  TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) );
   s += pen.color().name();
 
   return s;
@@ -212,7 +212,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
         if ( t->font.bold() != m_defaultFont.bold() )
             prop.setAttribute( "fo:font-weight", ( t->font.bold() ? "bold" : "light" ) );
 
-        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( t->font.pointSize() ) );
+        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( t->font.pointSize() ) );
 
         if ( t->font.underline() != m_defaultFont.underline() )
         {
@@ -250,7 +250,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
 
         if ( t->indent > 0.0 )
         {
-            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( t->indent ) );
+            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).arg( t->indent ) );
             if ( t->alignX == Format::Undefined )
                 prop.setAttribute( "fo:text-align", "start" );
         }
@@ -323,7 +323,7 @@ void OpenCalcStyles::addColumnStyles( TQDomDocument & doc, TQDomElement & autoSt
     TQDomElement prop = doc.createElement( "style:properties" );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
-    prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( t->size ) );
+    prop.setAttribute( "style:column-width", TQString( "%1cm" ).arg( t->size ) );
 
     ts.appendChild( prop );
     autoStyles.appendChild( ts );
@@ -346,7 +346,7 @@ void OpenCalcStyles::addRowStyles( TQDomDocument & doc, TQDomElement & autoStyle
     ts.setAttribute( "style:family", "table-row" );
 
     TQDomElement prop = doc.createElement( "style:properties" );
-    prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( t->size ) );
+    prop.setAttribute( "style:row-height", TQString( "%1cm" ).arg( t->size ) );
     if ( t->breakB != ::Style::none )
       prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) );
 
diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html
index dfaed8a4..2bd1fc05 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -139,7 +139,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Page sizes, header and footer (including variable converting)<br>    
     Font (sizes, attributes, color)<br>    
     Background color<br>
-    Text tqalignment, angle, vertical text, text wrap and indents<br>
+    Text alignment, angle, vertical text, text wrap and indents<br>
     Merged Cells<br>
     DontPrint flag<br>
     Comments<br>
@@ -172,7 +172,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
  Jan 18, 2003 - page tqlayout, header, footer<br>
  Jan 19, 2003 - Added support for fonts, text color, background color, formula 
 conversion<br>
- Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells<br>
+ Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br>
  Jan 19, 2003 - angle, vertical text, text wrap<br>
  Jan 19, 2003 - named area, hidden columns and rows<br>
  Jan 20, 2003 - cell borders<br>
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index dfba826d..5e875ecd 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cc
@@ -26,7 +26,7 @@
 
 TQString getFootnoteFramesetName(const TQString& id)
 {
-    return i18n("Frameset name","Footnote %1").tqarg(id);
+    return i18n("Frameset name","Footnote %1").arg(id);
 }
 
 static void InsertTimeVariable(TQDomDocument& mainDocument,
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 4f84a8e4..5a08cf0d 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -121,7 +121,7 @@ void StyleDataMap::defineDefaultStyles(void)
     defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt");
     TQFontInfo fixedInfo(KGlobalSettings::fixedFont());
     TQString strPlainText=TQString("font-family: %1")
-        .tqarg(fixedInfo.family()); // TODO: should be "Courier New"
+        .arg(fixedInfo.family()); // TODO: should be "Courier New"
     kdDebug(30506) << "Plain Text: " << strPlainText << endl;
     defineNewStyle("Plain Text",-1,strPlainText);
     // TODO: all list and numbered types
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index cac51013..d4a9819f 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -723,24 +723,24 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
 {
     TQString props;
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        // Check if the current tqalignment is a valid one for AbiWord.
-        if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right")
-            || (tqlayout.tqalignment == "center")  || (tqlayout.tqalignment == "justify"))
+        // Check if the current alignment is a valid one for AbiWord.
+        if ((tqlayout.alignment == "left") || (tqlayout.alignment == "right")
+            || (tqlayout.alignment == "center")  || (tqlayout.alignment == "justify"))
         {
             props += "text-align:";
-            props += tqlayout.tqalignment;
+            props += tqlayout.alignment;
             props += "; ";
         }
-        else if (tqlayout.tqalignment == "auto")
+        else if (tqlayout.alignment == "auto")
         {
-            // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.)
+            // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
             props += "text-align:left; ";
         }
         else
         {
-            kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30506) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -792,13 +792,13 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
+        props += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
+        props += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
     }
 
     if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
@@ -811,13 +811,13 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
+       props += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
+       props += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
     }
 
     if (force
@@ -1041,7 +1041,7 @@ bool AbiWordWorker::doFullPaperFormat(const int format,
             }
             else
             {   // We prefer to use inches, as to limit rounding errors (page size is in points!)
-                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0);
+                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").arg(width/72.0).arg(height/72.0);
             }
             break;
         }
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2de6d457..b21c6609 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu
         kdDebug(30506) << "Image: " << strDataId << endl;
     }
 
-    TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber));
+    TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber));
 
     // Create the frame set of the image
 
@@ -1127,7 +1127,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     // ### TODO: in case of automatic column widths, we have not any width given by AbiWord
 
     const uint tableNumber(++m_tableGroupNumber);
-    const TQString tableName(i18n("Table %1").tqarg(tableNumber));
+    const TQString tableName(i18n("Table %1").arg(tableNumber));
 
     TQDomElement elementText=stackCurrent->stackElementText;
     TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH");
@@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur
     }
 
     const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-        .tqarg(row).tqarg(col).tqarg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
+        .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
 
     // We need to create a frameset for the cell
     TQDomElement framesetElement(mainDocument.createElement("FRAMESET"));
@@ -1638,8 +1638,8 @@ bool StructureParser::fatalError (const TQXmlParseException& exception)
         << " col " << exception.columnNumber() << " message: " << exception.message() << endl;
     m_fatalerror=true;
     KMessageBox::error(NULL, i18n("An error has occurred while parsing the AbiWord file.\nAt line: %1, column %2\nError message: %3")
-        .tqarg(exception.lineNumber()).tqarg(exception.columnNumber())
-        .tqarg( i18n( "TQXml", exception.message().utf8() ) ),
+        .arg(exception.lineNumber()).arg(exception.columnNumber())
+        .arg( i18n( "TQXml", exception.message().utf8() ) ),
         i18n("AbiWord Import Filter"),0);
     return false; // Stop parsing now, we do not need further errors.
 }
@@ -1825,7 +1825,7 @@ KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const
         if (!handler.wasFatalError())
         {
             // As the parsing was stopped for something else than a fatal error, we have not yet get an error message. (Can it really happen?)
-            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()),
+            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").arg(from.data()),
                 i18n("AbiWord Import Filter"),0);
         }
         return KoFilter::ParsingError;
diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt
index f795b56c..f628f595 100644
--- a/filters/kword/amipro/FileFormat.txt
+++ b/filters/kword/amipro/FileFormat.txt
@@ -43,9 +43,9 @@ Note: Word underline is just like underline, except that
 spaces between words are not underlined.
 
 Paragraph align is also encoded using tag, here it the list:
-  <+@> left tqalignment
-  <+A> right tqalignment
-  <+B> center tqalignment
+  <+@> left alignment
+  <+A> right alignment
+  <+B> center alignment
   <+C> justified
 
 Linespacing is encoded using tag:
@@ -81,7 +81,7 @@ example below:
          0          font color (see below)
          16385      formatting flag (see below)
      [algn]
-         4          tqalignment flag (see below)
+         4          alignment flag (see below)
          1
          216        indent, 216/20 = 10.8 pt 
          144        first line indent, 144/20 = 7.2 pt
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index fdae97e6..8d2bed03 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines )
   style.word_underline = flag & 8;
   style.double_underline = flag & 64;
 
-  // tqalignment
+  // alignment
   if( lines[7].stripWhiteSpace() != "[algn]" ) return true;
   unsigned align_flag = lines[8].stripWhiteSpace().toUInt();
   if( align_flag & 1 ) style.align = TQt::AlignLeft;
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index 8c805111..89bf5541 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -780,10 +780,10 @@ APPLIXWORDImport::readHeader (TQTextStream &stream, TQFile &in)
       TQMessageBox::critical (0L, "Applixword header problem",
                                   TQString ("The Applixword header is not correct. "
                                            "May be it is not an applixword file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 				    "Okay");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
       return false;
     }
     else return true;
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index 138618b2..d5e581e3 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple 
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple 
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -85,7 +85,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index adb345b1..318dae0b 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple 
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple 
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
@@ -84,7 +84,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index 7040e9f1..450c938f 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen
             }
 
             const int length = strLine.length();
-            if (strLine.tqat(length-1) == '-')
+            if (strLine.at(length-1) == '-')
                 // replace the hard hyphen - at line end by a soft hyphen
-                strLine.tqat(length-1)=TQChar(173);
+                strLine.at(length-1)=TQChar(173);
             else
                 strLine += ' '; // add space to end of line
 
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index f712f0e1..261ef526 100644
--- a/filters/kword/hancomword/pole.cpp
+++ b/filters/kword/hancomword/pole.cpp
@@ -117,7 +117,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> tqchildren( unsigned index );
+    std::vector<unsigned> children( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -507,11 +507,11 @@ int DirTree::indexOf( DirEntry* e )
 
 int DirTree::parent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its tqchildren
-  // and check if one of the tqchildren is 'index'
+  // brute-force, basically we iterate for each entries, find its children
+  // and check if one of the children is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = tqchildren( j );
+    std::vector<unsigned> chi = children( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -575,8 +575,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the tqchildren of index
-     std::vector<unsigned> chi = tqchildren( index );
+     // find among the children of index
+     std::vector<unsigned> chi = children( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -591,7 +591,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among tqchildren
+       // not found among children
        if( !create ) return (DirEntry*)0;
        
        // create a new entry
@@ -648,7 +648,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::tqchildren( unsigned index )
+std::vector<unsigned> DirTree::children( unsigned index )
 {
   std::vector<unsigned> result;
   
@@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path )
   if( e  && e->dir )
   {
     unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
-    for( unsigned i = 0; i < tqchildren.size(); i++ )
-      result.push_back( dt->entry( tqchildren[i] )->name );
+    std::vector<unsigned> children = dt->children( parent );
+    for( unsigned i = 0; i < children.size(); i++ )
+      result.push_back( dt->entry( children[i] )->name );
   }
   
   return result;
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 13864d7a..b0290371 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -312,20 +312,20 @@ void HtmlBasicWorker::openParagraph(const TQString& strTag,
 {
     *m_streamOut << '<' << strTag;
 
-    if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
-        || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
+    if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
+        || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
     {
-        *m_streamOut << " align=\"" << tqlayout.tqalignment << "\"";
+        *m_streamOut << " align=\"" << tqlayout.alignment << "\"";
         if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
           *m_streamOut << " dir=\"rtl\"";
     }
-    else if ( tqlayout.tqalignment=="auto")
+    else if ( tqlayout.alignment=="auto")
     {
         // Do nothing, the user-agent should be more intelligent than us.
     }
     else
     {
-        kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+        kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
     }
 
     *m_streamOut << ">";
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 49abcf79..52d56fbf 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -313,50 +313,50 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 {
     TQString strLayout;
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
-            || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
+        if ( (tqlayout.alignment=="left") || (tqlayout.alignment== "right")
+            || (tqlayout.alignment=="center") || (tqlayout.alignment=="justify"))
         {
-            strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment);
+            strLayout += TQString("text-align:%1; ").arg(tqlayout.alignment);
         }
-        else if ( tqlayout.tqalignment=="auto")
+        else if ( tqlayout.alignment=="auto")
         {
             // Do nothing, the user-agent should be more intelligent than us.
         }
         else
         {
-            kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30503) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-            strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
+            strLayout += TQString("margin-left:%1pt; ").arg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
+        strLayout += TQString("margin-right:%1pt; ").arg(tqlayout.indentRight);
     }
 
     if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
-        strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
+        strLayout += TQString("text-indent:%1pt; ").arg(tqlayout.indentFirst);
     }
 
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
+       strLayout += TQString("margin-bottom:%1pt; ").arg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
+       strLayout += TQString("margin-top:%1pt; ").arg(tqlayout.marginTop);
     }
 
     if (force
@@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         else
         {
             strLayout += "text-shadow:";
-            strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name())
-                .tqarg(xDistance,0,'f',0).tqarg(yDistance,0,'f',0);
+            strLayout+=TQString("%1 %2pt %3pt; ").arg(tqlayout.shadowColor.name())
+                .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
                 // We do not want any scientific notation or any decimal
         }
     }
@@ -557,7 +557,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag,
     {
         *m_streamOut << "<sup>"; //Superscript
     }
-    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "<center>";
+    if ( tqlayout.alignment == "center" ) *m_streamOut << "<center>";
 }
 
 void HtmlCssWorker::closeParagraph(const TQString& strTag,
@@ -572,7 +572,7 @@ void HtmlCssWorker::closeParagraph(const TQString& strTag,
         *m_streamOut << "</sub>"; //Subscript
     }
 
-    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "</center>";
+    if ( tqlayout.alignment == "center" ) *m_streamOut << "</center>";
     *m_streamOut << "</" << strTag << ">\n";
 }
 
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 20c7069b..ff81c956 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
 
     TQStringList encodingList;
 
-    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
 
     m_dialog->comboBoxEncoding->insertStringList( encodingList );
@@ -106,7 +106,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30503) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index aa1b1817..441048b4 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -456,7 +456,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
             && (tqlayout.counter.depth<6) )
         {
-            strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6
+            strTag=TQString("h%1").arg(tqlayout.counter.depth + 1); // H1 ... H6
         }
         else
         {
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 6e134e38..482c90a5 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -178,7 +178,7 @@ void KHTMLReader::parseNode(DOM::Node node)
 	if (!t.isNull()) 
         {
 	   _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode);
-	   return; // no tqchildren anymore...
+	   return; // no children anymore...
 	}
 
 	// is this really needed ? it can't do harm anyway.
@@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
 		_writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
 		int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
-		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(currdepth+1));
 	}
 }
 
@@ -520,11 +520,11 @@ void KHTMLReader::parseStyle(DOM::Element e)
      // debugging code.
      kdDebug(30503) << "e.style()" << endl;
      for (unsigned int i=0;i<s1.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").tqarg(s1.item(i).string()).tqarg(s1.getPropertyValue(s1.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").arg(s1.item(i).string()).arg(s1.getPropertyValue(s1.item(i)).string()) << endl;
      }
      kdDebug(30503) << "override style" << endl;
      for (unsigned int i=0;i<s2.length();i++) {
-        kdDebug(30503) << TQString("%1: %2").tqarg(s2.item(i).string()).tqarg(s2.getPropertyValue(s2.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").arg(s2.item(i).string()).arg(s2.getPropertyValue(s2.item(i)).string()) << endl;
      }
 */
 }
@@ -628,7 +628,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 		_writer->addText(state()->paragraph,htmlelement.innerHTML().string(),1);
 	startNewParagraph();
 	//popState();
-	return false; // tqchildren are already handled.
+	return false; // children are already handled.
 #else
 	pushNewState();
 	state()->in_pre_mode=true;
@@ -640,7 +640,7 @@ bool KHTMLReader::parse_pre(DOM::Element e)
 	}
 	popState();
         _writer->formatAttribute(state()->paragraph,"FONT","name",face);
-	return false; // tqchildren are already handled.
+	return false; // children are already handled.
 #endif
 }
 
@@ -668,11 +668,11 @@ bool KHTMLReader::parse_font(DOM::Element e)
 
   _writer->formatAttribute(state()->paragraph,"FONT","name",face);
   if ((isize>=0) && (isize != 12))
-    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize));
+    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").arg(isize));
 
-  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").tqarg(color.red()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").tqarg(color.green()));
-  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").tqarg(color.blue()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").arg(color.red()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").arg(color.green()));
+  _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").arg(color.blue()));
   return true;
 }
 
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
   _list_depth++;
   if (e.firstChild().nodeName().string().lower() == "#text")  // e.g. <ul>this is indented<li>first listitem</li></ul>
   {
-    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
     startNewLayout();
   }
   for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) 
@@ -706,7 +706,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
 	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
         _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
       }
-      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent
     }
     parseNode(items);
   }
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index 56568be9..3223ef42 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -173,9 +173,9 @@ TQDomElement KWDWriter::createTableCell(int tableno, int nrow,
 	TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement();
 
 	TQDomElement fs=addFrameSet(parent,1,0,
-			TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol),
+			TQString("Table %1 - %2,%3").arg(tableno).arg(nrow).arg(ncol),
 			1);
-	fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno));
+	fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno));
 	fs.setAttribute("row",nrow);
 	fs.setAttribute("col",ncol);
 	fs.setAttribute("cols",colspan); // FIXME do colspan in finishTable
@@ -189,9 +189,9 @@ TQDomElement KWDWriter::fetchTableCell(int tableno, int rowno, int colno) {
 	TQDomNodeList e=docroot().elementsByTagName("FRAMESET");
 	for (unsigned int i=0;i<e.count();i++) {
 	     TQDomElement k=e.item(i).toElement();
-	     if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno))
-		     if (k.attribute("row") == TQString("%1").tqarg(rowno))
-		     	if (k.attribute("col") == TQString("%1").tqarg(colno))
+	     if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno))
+		     if (k.attribute("row") == TQString("%1").arg(rowno))
+		     	if (k.attribute("col") == TQString("%1").arg(colno))
 		     		return k;
 	}
 	TQDomElement dummy;
@@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) {
 
 
 void KWDWriter::createHR(TQDomElement paragraph, int width) {
-	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
+	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").arg(width));
 }
 
 void KWDWriter::finishTable(int tableno,TQRect rect) {
@@ -227,7 +227,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	// first, see how big the table is (cols & rows)
 	for (unsigned i=0;i<nl.count();i++) {
 	    TQDomElement k=nl.item(i).toElement();
-	    	if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno)) {
+	    	if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno)) {
 	    	  ncols=MAX(ncols,k.attribute("col").toInt()+1);
 	    	  nrows=MAX(nrows,k.attribute("row").toInt()+1);	    	
 	    	}
@@ -251,7 +251,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) {
 	      TQDomElement e=fetchTableCell(tableno,currow,curcol);
 	      if (e.isNull()) {
 	              // a missing cell !
-	              kdDebug(30503) << TQString("creating %1 %2").tqarg(currow).tqarg(curcol).latin1() << endl;
+	              kdDebug(30503) << TQString("creating %1 %2").arg(currow).arg(curcol).latin1() << endl;
 	              createTableCell(tableno,currow,curcol,1,
 		      			TQRect(x+step_x*curcol,y+step_y*currow,step_x,step_y)
 				);
@@ -460,8 +460,8 @@ void KWDWriter::addText(TQDomElement paragraph, TQString text, int format_id, bo
 	TQDomElement lastformat=currentFormat(paragraph,true);
 	if (lastformat.attribute("id").isEmpty()) // keep old id value, e.g. for LINK URL
 		lastformat.setAttribute("id",format_id);
-	lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength));
-	lastformat.setAttribute("len",TQString("%1").tqarg(newLength));
+	lastformat.setAttribute("pos",TQString("%1").arg(oldLength));
+	lastformat.setAttribute("len",TQString("%1").arg(newLength));
 }
 
 TQString KWDWriter::getText(TQDomElement paragraph) {
diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h
index e4cc7f38..682ef887 100644
--- a/filters/kword/kword1.3/import/kword13formatone.h
+++ b/filters/kword/kword1.3/import/kword13formatone.h
@@ -29,8 +29,8 @@ class TQTextStream;
 #include "kword13format.h"
 
 /**
- * Contains the data of the \<FORMAT id="1"\> tqchildren
- * also the grand-tqchildren of \<STYLE\> and \<LAYOUT\>
+ * Contains the data of the \<FORMAT id="1"\> children
+ * also the grand-children of \<STYLE\> and \<LAYOUT\>
  */
 class KWord13FormatOneData
 {
@@ -75,7 +75,7 @@ public:
     virtual KWord13FormatOneData* getFormatOneData(void);
 public:
     int m_length; ///< Length of format
-    KWord13FormatOneData m_formatOne; ///< Data of tqchildren of \<FORMAT id="1"\>
+    KWord13FormatOneData m_formatOne; ///< Data of children of \<FORMAT id="1"\>
 };
 
 #endif // KWORD_1_3_FORMAT_ONE
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 82812412..47eed1e7 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -59,7 +59,7 @@ bool KWord13Import::parseInfo( TQIODevice* io, KWord13Document& kwordDocument )
         return false;
     }
     TQDomElement docElement( doc.documentElement() );
-    // In documentinfo.xml, the text data is in the grand-tqchildren of the document element
+    // In documentinfo.xml, the text data is in the grand-children of the document element
     for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         kdDebug(30520) << "Child " << node.nodeName() << endl;
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 00b899f9..6c7ec01f 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou
         case T_RIGHT:
             tabsWriter.addAttribute( "style:type", "right" );
             break;
-        case T_DEC_PNT:  // "tqalignment on decimal point"
+        case T_DEC_PNT:  // "alignment on decimal point"
             tabsWriter.addAttribute( "style:type", "char" );
             tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) );
             break;
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index e3958b45..cbe650dc 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri
     }
     else if ( name == "FRAMESTYLE" )
     {
-        // ### TODO, but some of the <STYLE> tqchildren are also tqchildren of <FRAMESTYLE>, so we have to set it to "ignore"
+        // ### TODO, but some of the <STYLE> children are also children of <FRAMESTYLE>, so we have to set it to "ignore"
         stackItem->elementType = KWord13TypeIgnore;
         success = true;
     }
     else if ( name == "PICTURES" || name == "PIXMAPS" || name == "CLIPARTS" )
     {
-        // We just need a separate "type" for the <KEY> tqchildren
+        // We just need a separate "type" for the <KEY> children
         stackItem->elementType = KWord13TypePicturesPlural;
         success = true;
     }
@@ -795,7 +795,7 @@ bool KWord13Parser :: characters ( const TQString & ch )
             const uint length = ch.length();
             for ( uint i = 0; i < length; ++i )
             {
-                const ushort uni = ch.tqat(i).tqunicode();
+                const ushort uni = ch.at(i).tqunicode();
                 if ( uni >= 32 )
                     continue; // Normal character
                 else if ( uni == 9 || uni == 10 || uni == 13)
diff --git a/filters/kword/kword1.3/import/kword13parser.h b/filters/kword/kword1.3/import/kword13parser.h
index 7dc81d42..21b25f20 100644
--- a/filters/kword/kword1.3/import/kword13parser.h
+++ b/filters/kword/kword1.3/import/kword13parser.h
@@ -92,9 +92,9 @@ protected: //TQXml
     virtual bool error(const TQXmlParseException& exception);
     virtual bool fatalError(const TQXmlParseException& exception);
 protected:
-    /// Process tqchildren of \<FORMAT id="1"\>
+    /// Process children of \<FORMAT id="1"\>
     bool startElementFormatOneProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
-    /// Process tqchildren of \<LAYOUT\> (with exceptions)
+    /// Process children of \<LAYOUT\> (with exceptions)
     bool startElementLayoutProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
     /// Process \<NAME\>
     bool startElementName( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
@@ -108,7 +108,7 @@ protected:
     bool startElementFrame( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
     /// Process \<FRAMESET\>
     bool startElementFrameset( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem );
-    /// Process opening tag of some elements that are tqchildren of \<DOC\> and which only define document properties
+    /// Process opening tag of some elements that are children of \<DOC\> and which only define document properties
     bool startElementDocumentAttributes( const TQString& name, const TQXmlAttributes& attributes,
         KWord13StackItem *stackItem, const KWord13StackItemType& allowedParentType, const KWord13StackItemType& newType );
     /// Process \<KEY\>
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cc
index 96b4be4e..8da25a16 100644
--- a/filters/kword/latex/export/fileheader.cc
+++ b/filters/kword/latex/export/fileheader.cc
@@ -78,7 +78,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse tqchildren markups --> PAPERBORDERS
+	// Analyse children markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -287,7 +287,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
+		out << "\\usepackage[a4paper]{geometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 079b38d3..28bb48bf 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -71,7 +71,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cc
index f75ac651..74cee48b 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cc
@@ -59,7 +59,7 @@ void Layout::analyseLayout(const TQDomNode balise)
 	/* No parameters for this markup */
 	kdDebug(30522) << "ANALYSE OF THE BEGINING OF A LAYOUT" << endl;
 	
-	/* Analyse tqchildren markups */
+	/* Analyse children markups */
 	for(int index= 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("NAME")== 0)
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 6003a075..4264d9c6 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cc
@@ -23,7 +23,7 @@
 #include <kdebug.h>		/* for kdDebug() stream */
 #include "para.h"
 #include "textFrame.h"		/* father class.        */
-#include "format.h"		/* tqchildren classes.    */
+#include "format.h"		/* children classes.    */
 //#include "picturezone.h"
 #include "fileheader.h"
 #include "textzone.h"
@@ -132,7 +132,7 @@ void Para::analyse(const TQDomNode balise)
 
 	kdDebug(30522) << "**** PARAGRAPH ****" << endl;
 
-	/* Analyse of the tqchildren markups */
+	/* Analyse of the children markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("TEXT")== 0)
diff --git a/filters/kword/latex/export/para.h b/filters/kword/latex/export/para.h
index 75c41b3a..7d1c0af1 100644
--- a/filters/kword/latex/export/para.h
+++ b/filters/kword/latex/export/para.h
@@ -26,7 +26,7 @@
 #include <tqptrstack.h>		/* historic list */
 #include <tqptrlist.h>		/* for list of format */
 
-/*#include "listeformat.h"*/	/* tqchildren class contents the zone (italic, footnote,
+/*#include "listeformat.h"*/	/* children class contents the zone (italic, footnote,
 				   variable. */
 #include "layout.h"		/* set of informations about the paragraph style. */
 #include "element.h"		/* to use the father class. */
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cc
index 9c4c07e4..9d83bedb 100644
--- a/filters/kword/latex/export/xmlparser.cc
+++ b/filters/kword/latex/export/xmlparser.cc
@@ -104,18 +104,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
-		if ( tqchildren.count() )
-			return tqchildren.item(index);
+		TQDomNodeList children = balise.toElement().elementsByTagName(name);
+		if ( children.count() )
+			return children.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList tqchildren = balise.childNodes();
-	if ( tqchildren.count() )
-		return tqchildren.item(index);
+	TQDomNodeList children = balise.childNodes();
+	if ( children.count() )
+		return children.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc
index e25e95ab..14abad37 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cc
@@ -47,10 +47,10 @@ Env::~Env()
 {
 }
 
-void Env::setChildren(TQPtrList<Element>* tqchildren)
+void Env::setChildren(TQPtrList<Element>* children)
 {
-	if(tqchildren != NULL)
-		_tqchildren = *tqchildren;
+	if(children != NULL)
+		_children = *children;
 }
 
 void Env::print(int tab)
@@ -58,7 +58,7 @@ void Env::print(int tab)
 	cout << "ENV " << getName().latin1() << "{" << endl;
 	
 	Element* elt;
-	for ( elt = _tqchildren.first(); elt; elt = _tqchildren.next() )
+	for ( elt = _children.first(); elt; elt = _children.next() )
 	{
 		elt->print(tab);
 	}
diff --git a/filters/kword/latex/import/parser/env.h b/filters/kword/latex/import/parser/env.h
index cef56b29..191c0dd6 100644
--- a/filters/kword/latex/import/parser/env.h
+++ b/filters/kword/latex/import/parser/env.h
@@ -27,7 +27,7 @@
 
 class Env: public Element
 {
-	TQPtrList<Element> _tqchildren;
+	TQPtrList<Element> _children;
 	TQString _name;
 
 	public:
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index b627ebd2..149e9b9d 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -1280,7 +1280,7 @@ static bool ParseFile ( TQIODevice* subFile, TQDomDocument& doc)
             << "  Message: " << errorMsg << endl;
         // ### TODO: the error is in which sub-file?
         KMessageBox::error( 0L, i18n("An error has occurred while parsing the KWord file.\nAt line: %1, column %2\nError message: %3")
-            .tqarg( errorLine ).tqarg( errorColumn ).tqarg(i18n( "TQXml", errorMsg.utf8() ) ),
+            .arg( errorLine ).arg( errorColumn ).arg(i18n( "TQXml", errorMsg.utf8() ) ),
             i18n("KWord Export Filter Library"), 0 );
         return false;
     }
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index dbee22d0..fe302965 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -428,7 +428,7 @@ public:
 
     TQString     styleName;
     TQString     styleFollowing;
-    TQString     tqalignment;      ///< left, right, center, justify
+    TQString     alignment;      ///< left, right, center, justify
     CounterData counter;
     FormatData  formatData;
     double      indentFirst;    ///< indentation correction of first line (can be negative!)
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc
index 56e2b669..65a99977 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cc
@@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
                 {
                     if (!codec->canEncode(ch))
                     {
-                        strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                        strReturn+=TQString("&#%1;").arg(ch.tqunicode());
                         break;
                     }
                 }
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc
index ed5a7bfc..c6c0cb41 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cc
@@ -438,7 +438,7 @@ static void ProcessNoteTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *le
     variable->setGenericData( "note", note );
 }
 
-// ### TODO: some files have not a <VARIABLE> tag but its supposed tqchildren are directly tqchildren of <FORMAT id="4">
+// ### TODO: some files have not a <VARIABLE> tag but its supposed children are directly children of <FORMAT id="4">
 static void ProcessVariableTag (TQDomNode myNode, void* tagData, KWEFKWordLeader* leader)
 {
     VariableData *variable = (VariableData *) tagData;
@@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
     {
         if ( oldAlign.isEmpty() )
         {
-            tqlayout->tqalignment = "left"; // KWord 0.8 did not support right-to-left
+            tqlayout->alignment = "left"; // KWord 0.8 did not support right-to-left
         }
         else
         {
@@ -956,19 +956,19 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
             if ( ( align < 0 ) || ( align > 3) )
             {
                 kdWarning(30508) << "KWord 0.8 flow unknown: " << oldAlign << endl;
-                tqlayout->tqalignment = "left"; // Unknown, so assume left
+                tqlayout->alignment = "left"; // Unknown, so assume left
             }
             else
             {
                 const char* flows[]={"left", "right", "center", "justify" };
-                tqlayout->tqalignment = flows[ align ];
+                tqlayout->alignment = flows[ align ];
             }
         }
-        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->tqalignment << endl;
+        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->alignment << endl;
     }
     else
     {
-        tqlayout->tqalignment = normalAlign;
+        tqlayout->alignment = normalAlign;
     }
 
 }
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 6bd895b9..595c026c 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -246,7 +246,7 @@ int Conversion::ditheringToGray( int ipat, bool* ok )
     }
 }
 
-TQString Conversion::tqalignment( int jc ) {
+TQString Conversion::alignment( int jc ) {
     TQString value( "left" );
     if ( jc == 1 )
         value = "center";
diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h
index fd30c69f..f8610415 100644
--- a/filters/kword/msword/conversion.h
+++ b/filters/kword/msword/conversion.h
@@ -57,8 +57,8 @@ namespace Conversion
     // Hackery for gray levels
     int ditheringToGray( int ipat, bool* ok );
 
-    // Convert tqalignment code to string
-    TQString tqalignment( int jc );
+    // Convert alignment code to string
+    TQString alignment( int jc );
 
     // Convert linespacing struct to string
     TQString lineSpacing( const wvWare::Word97::LSPD& lspd );
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index 5044f023..ab70c79a 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -328,10 +328,10 @@ void Document::footnoteStart()
     framesetElement.setAttribute( "frameInfo", 7 /* footnote/endnote */ );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
     m_framesetsElement.appendChild(framesetElement);
 
     createInitialFrame( framesetElement, 29, 798, 567, 567+41, true, NoFollowup );
@@ -352,7 +352,7 @@ void Document::slotTableCellStart( int row, int column, int rowSpan, int columnS
     framesetElement.setAttribute( "frameType", 1 /* text */ );
     framesetElement.setAttribute( "frameInfo", 0 /* normal text */ );
     framesetElement.setAttribute( "grpMgr", tableName );
-    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
+    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
     framesetElement.setAttribute( "name", name );
     framesetElement.setAttribute( "row", row );
     framesetElement.setAttribute( "col", column );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 10c3abb9..ba359cd2 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -123,10 +123,10 @@ void KWordTextHandler::footnoteFound( wvWare::FootnoteData::Type type,
     footnoteElem.setAttribute( "numberingtype", autoNumbered ? "auto" : "manual" );
     if ( type == wvWare::FootnoteData::Endnote )
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").arg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
     varElem.appendChild( footnoteElem );
 
     // Remember to parse the footnote text later
@@ -160,7 +160,7 @@ void KWordTextHandler::tableRowFound( const wvWare::TableRowFunctor& functor, wv
         paragraphStart( 0L );
         static int s_tableNumber = 0;
         m_currentTable = new KWord::Table();
-        m_currentTable->name = i18n("Table %1").tqarg( ++s_tableNumber );
+        m_currentTable->name = i18n("Table %1").arg( ++s_tableNumber );
         insertAnchor( m_currentTable->name );
     }
 
@@ -181,7 +181,7 @@ void KWordTextHandler::pictureFound( const wvWare::PictureFunctor& pictureFuncto
     TQString pictureName = "pictures/picture";
     pictureName += TQString::number( s_pictureNumber ); // filenames start at 0
     // looks better to the user if frame names start at 1
-    TQString frameName = i18n("Picture %1").tqarg( ++s_pictureNumber );
+    TQString frameName = i18n("Picture %1").arg( ++s_pictureNumber );
     insertAnchor( frameName );
 
     switch ( picf->mfp.mm ) {
@@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W
             int dist = fontSize > 20 ? 2 : 1;
             if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow
                 dist = -dist;
-            css = TQString::fromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
+            css = TQString::fromLatin1("#bebebe %1pt %1pt").arg(dist).arg(dist);
         }
         shadowElem.setAttribute( "text-shadow", css );
         format.appendChild( shadowElem );
@@ -574,10 +574,10 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
 void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::Word97::PAP& pap = paragraphProperties.pap();
-    // Always write out the tqalignment, it's required
+    // Always write out the alignment, it's required
     TQDomElement flowElement = mainDocument().createElement("FLOW");
-    TQString tqalignment = Conversion::tqalignment( pap.jc );
-    flowElement.setAttribute( "align", tqalignment );
+    TQString alignment = Conversion::alignment( pap.jc );
+    flowElement.setAttribute( "align", alignment );
     parentElement.appendChild( flowElement );
 
     //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl;
@@ -810,7 +810,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::
              ( numberingType == 0 &&m_previousEnumLSID != 0 && m_previousEnumLSID != listInfo->lsid() ) )
             counterElement.setAttribute( "restart", "true" );
 
-        // listInfo->tqalignment() is not supported in KWord
+        // listInfo->alignment() is not supported in KWord
         // listInfo->isLegal() hmm
         // listInfo->notRestarted() [by higher level of lists] not supported
         // listInfo->followingchar() ignored, it's always a space in KWord currently
diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h
index ebea5202..c75cfd4e 100644
--- a/filters/kword/msword/texthandler.h
+++ b/filters/kword/msword/texthandler.h
@@ -88,7 +88,7 @@ public:
     // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended)
     void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement );
 
-    // Write the _contents_ (tqchildren) of a <LAYOUT> or <STYLE> tag, from the given parag props
+    // Write the _contents_ (children) of a <LAYOUT> or <STYLE> tag, from the given parag props
     void writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
 
     // Communication with Document, without having to know about Document
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index e6d211b9..088a669e 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -1446,19 +1446,19 @@ public:
 		paraProp.setIsText (true);
 
 		// Alignment
-		if (!tqlayout.tqalignment.isEmpty ())
+		if (!tqlayout.alignment.isEmpty ())
 		{
-			if (tqlayout.tqalignment == "left")
+			if (tqlayout.alignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
 				paraProp.setAlignment (MSWrite::Alignment::Left);
-			else if (tqlayout.tqalignment == "right")
+			else if (tqlayout.alignment == "right")
 				paraProp.setAlignment (MSWrite::Alignment::Right);
-			else if (tqlayout.tqalignment == "center")
+			else if (tqlayout.alignment == "center")
 				paraProp.setAlignment (MSWrite::Alignment::Center);
-			else if (tqlayout.tqalignment == "justify")
+			else if (tqlayout.alignment == "justify")
 				paraProp.setAlignment (MSWrite::Alignment::Justify);
 			else
-				kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl;
+				kdWarning (30509) << "Unknown Alignment: " << tqlayout.alignment << endl;
 		}
 
 		// Indentation
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 6ede1caf..5a8bddd1 100644
--- a/filters/kword/mswrite/status.html
+++ b/filters/kword/mswrite/status.html
@@ -51,7 +51,7 @@
 		<td><b>Imports almost everything except OLE from MS WinWrite (3.0 &amp; 3.1) documents</b> <br>
 			- Character formatting (fonts, bold, italic, underline, superscript, subscript, &quot;(page)&quot; numbering) <br>
 			- Optional/Soft Hyphenation <br>
-			- Paragraph formatting (tqalignment, linespacing, indentation, tabulation) <br>
+			- Paragraph formatting (alignment, linespacing, indentation, tabulation) <br>
 			- Paragraphs with multiple newlines <br>
 			- Pagebreaking (at the start or end of the line and on the next line) <br>
 			- Images (Standard WMFs, monochrome BMPs, position from left margin) <br>
@@ -126,7 +126,7 @@
 		<br>
 
 		<b> Version 0.1 (7 Oct 2001): Initial release </b> <br>
-		- the underlying code to read in the format is there but the filter can only do plain text with tqalignment
+		- the underlying code to read in the format is there but the filter can only do plain text with alignment
 		<br>
 	</td>
     </tr>
diff --git a/filters/kword/mswrite/structures_generated.cpp b/filters/kword/mswrite/structures_generated.cpp
index 6b6e5575..c443f252 100644
--- a/filters/kword/mswrite/structures_generated.cpp
+++ b/filters/kword/mswrite/structures_generated.cpp
@@ -1166,7 +1166,7 @@ namespace MSWrite
 		
 		// --- set defaults in raw array (needed because it's a useThisMuch structure) ---
 		WriteByte ((Byte) (60), m_data + 1);// magic0_60_or_61
-		m_data [2] = 0;						// tqalignment
+		m_data [2] = 0;						// alignment
 		WriteWord ((Word) (30), m_data + 3);// magic30
 		memset (m_data + 5, 0, 6);			// rightIndent, leftIndent, leftIndentFirstLine
 		WriteWord ((Word) (240), m_data + 11);// lineSpacing
@@ -1176,7 +1176,7 @@ namespace MSWrite
 		// --- set defaults for variables --
 		m_numDataBytes = (Byte) (0);
 		m_magic0_60_or_61 = (Byte) (60);
-		m_tqalignment = (Byte) (0);
+		m_alignment = (Byte) (0);
 		m_magic30 = (Word) (30);
 		m_rightIndent = (Word) (0);
 		m_leftIndent = (Word) (0);
@@ -1210,7 +1210,7 @@ namespace MSWrite
 		
 		m_numDataBytes = rhs.m_numDataBytes;
 		m_magic0_60_or_61 = rhs.m_magic0_60_or_61;
-		m_tqalignment = rhs.m_tqalignment;
+		m_alignment = rhs.m_alignment;
 		m_magic30 = rhs.m_magic30;
 		m_rightIndent = rhs.m_rightIndent;
 		m_leftIndent = rhs.m_leftIndent;
@@ -1235,7 +1235,7 @@ namespace MSWrite
 	
 		if (!Verify (Error::InvalidFormat, m_numDataBytes >= 1 && m_numDataBytes <= s_size - sizeof (Byte), DWord (m_numDataBytes))) return false;
 		if (!Verify (Error::Warn, m_magic0_60_or_61 == 0 || m_magic0_60_or_61 == 60 || m_magic0_60_or_61 == 61, DWord (m_magic0_60_or_61))) return false;
-		// m_tqalignment will not be checked
+		// m_alignment will not be checked
 		if (!Verify (Error::Warn, m_magic30 == 30, DWord (m_magic30))) return false;
 		// m_rightIndent will not be checked
 		// m_leftIndent will not be checked
@@ -1275,8 +1275,8 @@ namespace MSWrite
 		
 		ReadByte (m_magic0_60_or_61, m_data + 1);
 		signalHaveSetData (m_magic0_60_or_61 == Byte (60), 0/*offset*/ + 8/*size*/);
-		ReadByte (m_tqalignment, m_data + 2);
-		signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);
+		ReadByte (m_alignment, m_data + 2);
+		signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);
 		ReadWord (m_magic30, m_data + 3);
 		signalHaveSetData (m_magic30 == Word (30), 16/*offset*/ + 16/*size*/);
 		ReadWord (m_rightIndent, m_data + 5);
@@ -1323,7 +1323,7 @@ namespace MSWrite
 		
 		WriteByte (m_numDataBytes, m_data + 0);
 		WriteByte (m_magic0_60_or_61, m_data + 1);
-		WriteByte (m_tqalignment, m_data + 2);
+		WriteByte (m_alignment, m_data + 2);
 		WriteWord (m_magic30, m_data + 3);
 		WriteWord (m_rightIndent, m_data + 5);
 		WriteWord (m_leftIndent, m_data + 7);
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index bc068758..28f7cc4e 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -701,7 +701,7 @@ namespace MSWrite
 		
 		Byte m_numDataBytes;					// number of bytes that follow
 		Byte m_magic0_60_or_61;				// =0? =60? =61? 60 is the most common
-		Byte m_tqalignment;
+		Byte m_alignment;
 		Word m_magic30;						// =30?
 		Word m_rightIndent;					// indent from right margin + right margin (if in header/footer)
 		Word m_leftIndent;					// indent from left margin + left margin (if in header/footer)
@@ -758,8 +758,8 @@ namespace MSWrite
 		// get and set functions
 		//
 		
-		Byte getAlignment (void) const	{	return m_tqalignment;	}
-		void setAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
+		Byte getAlignment (void) const	{	return m_alignment;	}
+		void setAlignment (const Byte val)	{	m_alignment = val;	signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
 		
 		Word getRightIndent (void) const	{	return m_rightIndent;	}
 		void setRightIndent (const Word val)	{	m_rightIndent = val;	signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/);	}
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 9287169f..5e2d3e42 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -1206,9 +1206,9 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch
     // Be careful that while being similar the following 5 strings have different purposes
     const TQString automaticTableStyle ( makeAutomaticStyleName( "Table", m_tableNumber ) ); // It also increases m_tableNumber
     const TQString tableName( TQString( "Table" ) + TQString::number( m_tableNumber ) ); // m_tableNumber was already increased
-    const TQString translatedName( i18n( "Object name", "Table %1").tqarg( m_tableNumber ) );
+    const TQString translatedName( i18n( "Object name", "Table %1").arg( m_tableNumber ) );
     const TQString automaticFrameStyle ( makeAutomaticStyleName( "TableFrame", m_textBoxNumber ) ); // It also increases m_textBoxNumber
-    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").tqarg( m_textBoxNumber ) );
+    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").arg( m_textBoxNumber ) );
 
     kdDebug(30518) << "Processing table " << anchor.key.toString() << " => " << tableName << endl;
 
@@ -1736,31 +1736,31 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     styleKey += tqlayout.styleName;
     styleKey += ',';
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
         // NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4)
         // Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end.
-        if (tqlayout.tqalignment == "left")
+        if (tqlayout.alignment == "left")
         {
             props += "fo:text-align=\"start\" ";
             styleKey += 'L';
         }
-        else if (tqlayout.tqalignment == "right")
+        else if (tqlayout.alignment == "right")
         {
             props += "fo:text-align=\"end\" ";
             styleKey += 'R';
         }
-        else if (tqlayout.tqalignment == "center")
+        else if (tqlayout.alignment == "center")
         {
             props += "fo:text-align=\"center\" ";
             styleKey += 'C';
         }
-        else if (tqlayout.tqalignment == "justify")
+        else if (tqlayout.alignment == "justify")
         {
             props += "fo:text-align=\"justify\" ";
             styleKey += 'J';
         }
-        else if (tqlayout.tqalignment == "auto")
+        else if (tqlayout.alignment == "auto")
         {
             props += "fo:text-align=\"start\" ";
 #ifndef STRICT_OOWRITER_VERSION_1
@@ -1770,7 +1770,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         }
         else
         {
-            kdWarning(30518) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30518) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -1779,7 +1779,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.indentLeft>=0.0)
         && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft);
+        props += TQString("fo:margin-left=\"%1pt\" ").arg(tqlayout.indentLeft);
         styleKey += TQString::number(tqlayout.indentLeft);
     }
 
@@ -1788,7 +1788,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.indentRight>=0.0)
         && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight);
+        props += TQString("fo:margin-right=\"%1pt\" ").arg(tqlayout.indentRight);
         styleKey += TQString::number(tqlayout.indentRight);
     }
 
@@ -1807,7 +1807,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.marginBottom>=0.0)
         && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom);
+       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(tqlayout.marginBottom);
        styleKey += TQString::number(tqlayout.marginBottom);
     }
 
@@ -1816,7 +1816,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     if ((tqlayout.marginTop>=0.0)
         && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop);
+       props += TQString("fo:margin-top=\"%1pt\" ").arg(tqlayout.marginTop);
        styleKey += TQString::number(tqlayout.marginTop);
     }
 
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 2401508c..22d9fed5 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -10,7 +10,7 @@ TQString Conversion::importAlignment( const TQString& align )
         return "left";
     if ( align == "end" )
         return "right";
-    kdWarning(30518) << "Conversion::importAlignment unknown tqalignment " << align << endl;
+    kdWarning(30518) << "Conversion::importAlignment unknown alignment " << align << endl;
     return "auto";
 }
 
@@ -22,7 +22,7 @@ TQString Conversion::exportAlignment( const TQString& align )
         return "start";
     if ( align == "right" )
         return "end";
-    kdWarning(30518) << "Conversion::exportAlignment unknown tqalignment " << align << endl;
+    kdWarning(30518) << "Conversion::exportAlignment unknown alignment " << align << endl;
     return "auto";
 }
 
diff --git a/filters/kword/oowriter/conversion.h b/filters/kword/oowriter/conversion.h
index d9388268..ee6b41f6 100644
--- a/filters/kword/oowriter/conversion.h
+++ b/filters/kword/oowriter/conversion.h
@@ -32,7 +32,7 @@
 
 namespace Conversion
 {
-    // Convert paragraph tqalignment value
+    // Convert paragraph alignment value
     TQString importAlignment( const TQString& );
     TQString exportAlignment( const TQString& );
 
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 87e41f49..3f267beb 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -596,7 +596,7 @@ bool OoWriterImport::createStyleMap( const TQDomDocument & styles, TQDomDocument
       if ( d > 1.0 )
       {
         TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") );
-        message = message.tqarg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
+        message = message.arg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -992,11 +992,11 @@ void OoWriterImport::parseList( TQDomDocument& doc, const TQDomElement& list, TQ
 
 static int numberOfParagraphs( const TQDomElement& frameset )
 {
-    const TQDomNodeList tqchildren = frameset.childNodes();
+    const TQDomNodeList children = frameset.childNodes();
     const TQString paragStr = "PARAGRAPH";
     int paragCount = 0;
-    for ( unsigned int i = 0 ; i < tqchildren.length() ; ++i ) {
-        if ( tqchildren.item( i ).toElement().tagName() == paragStr )
+    for ( unsigned int i = 0 ; i < children.length() ; ++i ) {
+        if ( children.item( i ).toElement().tagName() == paragStr )
             ++paragCount;
     }
     return paragCount;
@@ -1458,7 +1458,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
 {
     Q_ASSERT( layoutElement.ownerDocument() == doc );
 
-    // Always write out the tqalignment, it's required
+    // Always write out the alignment, it's required
     TQDomElement flowElement = doc.createElement("FLOW");
 
     /* This was only an intermediate OASIS decision. The final decision is:
@@ -1563,7 +1563,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
     style:background-image
     line numbering
     punctuation wrap, 3.10.36
-    vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
+    vertical alignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
   Michael said those are in fact parag properties:
     style:text-autospace, 3.10.32 - not implemented in kotext
     style:line-break, 3.10.37 - apparently that's for some Asian languages
@@ -2303,7 +2303,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement&
         if ( localName == "table-cell" ) // OOo SPEC 4.8.1 p267
         {
             const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-                .tqarg(row).tqarg(column).tqarg(tableName)); // The table name could have a % sequence, so use the table name as last!
+                .arg(row).arg(column).arg(tableName)); // The table name could have a % sequence, so use the table name as last!
             kdDebug(30518) << "Trying to create " << frameName << endl;
 
             // We need to create a frameset for the cell
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index 89af187c..7c2ea412 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -184,9 +184,9 @@ bool PalmDB::load( const char* filename )
       if( recsize[r] >= 0 )
         {
           data->resize( recsize[r] );
-          stream.tqdevice()->at( recpos[r] );
+          stream.device()->at( recpos[r] );
           for( int q = 0; q < recsize[r]; q++ )
-            { TQ_UINT8 c; stream >> c; data->tqat(q) = c; }
+            { TQ_UINT8 c; stream >> c; data->at(q) = c; }
         }
     records.append( data );
   }
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index 5182f188..8a08c95c 100644
--- a/filters/kword/pdf/FilterDevice.cpp
+++ b/filters/kword/pdf/FilterDevice.cpp
@@ -196,7 +196,7 @@ void Device::addImage()
     }
 
     // add image
-    TQString name = TQString("pictures/picture%1.png").tqarg(_data.imageIndex());
+    TQString name = TQString("pictures/picture%1.png").arg(_data.imageIndex());
     TQDomElement frameset = _data.pictureFrameset(_currentImage.rect);
     current()->pictures.append(frameset);
     TQDomElement picture = _data.createElement("PICTURE");
@@ -253,7 +253,7 @@ void Device::computeGeometry(GfxState *state, Image &image)
 uint Device::initImage(GfxState *state, int width, int height,
                        bool withMask)
 {
-    // get image tqgeometry
+    // get image geometry
     Image image;
     image.mask = withMask;
     computeGeometry(state, image);
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 5391cb24..1ba81776 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -245,9 +245,9 @@ void Page::initParagraph(Paragraph &par) const
             if ( res==-1 ) {
                 tab.pos = dx;
                 if (tabRightAligned) {
-                    tab.tqalignment = Tabulator::Right;
+                    tab.alignment = Tabulator::Right;
                     kdDebug(30516) << "tabulated text right aligned.." << endl;
-                } else tab.tqalignment = Tabulator::Left;
+                } else tab.alignment = Tabulator::Left;
                 par.tabs.push_back(tab);
             }
         }
@@ -262,7 +262,7 @@ void Page::initParagraph(Paragraph &par) const
         else par.leftIndent = kMin(par.leftIndent, left);
     }
 
-    // compute tqalignment
+    // compute alignment
     for (it = par.lines().begin(); it!=par.lines().end(); ++it) {
         double left = (*it)->blocks->xMin;
         double right = block(*it, -1)->xMax;
@@ -287,7 +287,7 @@ void Page::initParagraph(Paragraph &par) const
         }
     }
 
-    // finalize tqalignment
+    // finalize alignment
     if (rightAligned) par.align = (leftAligned ? AlignBlock : AlignRight);
     else if (centered) par.align = AlignCenter;
 }
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index a6abf929..3c7caae4 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -117,7 +117,7 @@ TQDomElement Data::createFrameset(FramesetType type, const TQString &n)
     TQString name = n;
     if ( name.isNull() )
         name = (text ? i18n("Text Frameset %1")
-                : i18n("Picture %1")).tqarg(index);
+                : i18n("Picture %1")).arg(index);
     frameset.setAttribute("name", name);
     frameset.setAttribute("frameInfo", 0);
 
@@ -154,7 +154,7 @@ void Data::initPage(const TQValueVector<DRect> &rects,
 //        kdDebug(30516) << "page #" << pageIndex << " rect #" << i
 //                       << ": " << rects[i].toString() << endl;
         if ( !rects[i].isValid() ) continue;
-        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).tqarg(pageIndex);
+        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).arg(pageIndex);
         _textFramesets[i] = createFrameset(Text, name);
         _framesets.appendChild(_textFramesets[i]);
         TQDomElement frame = createFrame(Text, rects[i], true);
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 29e0eabc..d1a51fb4 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -128,7 +128,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     gbox->setInsideSpacing(KDialogBase::spacingHint());
     top->addWidget(gbox);
     _group = new TQButtonGroup;
-    _allButton = new TQRadioButton(i18n("All (%1 pages)").tqarg(nbPages), gbox);
+    _allButton = new TQRadioButton(i18n("All (%1 pages)").arg(nbPages), gbox);
     _allButton->setChecked(true);
     _group->insert(_allButton);
     TQHBox *hbox = new TQHBox(gbox);
@@ -147,7 +147,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget)
     _smart->setChecked(true);
     TQWhatsThis::add(_smart,
                     i18n("Removes returns and hyphens at end of line. "
-                         "Also tries to compute the paragraph tqalignment. "
+                         "Also tries to compute the paragraph alignment. "
                          "Note that the tqlayout of some pages can "
                          "get messed up."));
     top->addWidget(_smart);
@@ -181,7 +181,7 @@ Options Dialog::options() const
 {
     Options o;
     o.range = SelectionRange( (_allButton->isChecked() ?
-                             TQString("1-%1").tqarg(_nbPages) : _range->text()) );
+                             TQString("1-%1").arg(_nbPages) : _range->text()) );
     o.ownerPassword = _owner->text();
     o.userPassword = _user->text();
     o.importImages = _images->isChecked();
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index 1dd953aa..c8ecabcb 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -32,10 +32,10 @@ namespace PDFImport {
 TQDomElement Tabulator::createElement(Data &data) const
 {
     TQDomElement element = data.createElement("TABULATOR");
-    element.setAttribute("type", tqalignment);
+    element.setAttribute("type", alignment);
     element.setAttribute("ptpos", pos);
     element.setAttribute("filling", filling);
-    if ( tqalignment==Character )
+    if ( alignment==Character )
         element.setAttribute("alignchar", TQString(alignmentChar));
     return element;
 }
diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h
index 6e4d0b6a..644c9398 100644
--- a/filters/kword/pdf/fstring.h
+++ b/filters/kword/pdf/fstring.h
@@ -39,13 +39,13 @@ public:
     enum Alignment { Left = 0, Center, Right, Character };
     enum Filling { Blank = 0, Dots, Line, Dash, DashDot, DashDotDot };
 
-    Tabulator() : tqalignment(Left) {}
+    Tabulator() : alignment(Left) {}
 
     TQDomElement createElement(Data &data) const;
 
 public:
     double    pos;
-    Alignment tqalignment;
+    Alignment alignment;
     Filling   filling;
     TQChar     alignmentChar;
 };
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 0ffc9dba..3cd0e1bf 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -70,8 +70,8 @@ void DRect::unite(const DRect &r)
 TQString DRect::toString() const
 {
     if ( !isValid() ) return "invalid rect";
-    return TQString("left=%1 right=%2 top=%3 bottom=%4").tqarg(_left).tqarg(_right)
-        .tqarg(_top).tqarg(_bottom);
+    return TQString("left=%1 right=%2 top=%3 bottom=%4").arg(_left).arg(_right)
+        .arg(_top).arg(_bottom);
 }
 
 bool DPath::isRectangle() const
@@ -211,7 +211,7 @@ void Font::init(const TQString &n)
                 _data->family = FAMILY_DATA[Symbol];
             else { // with TQt
                 TQFontDatabase fdb;
-                TQStringList list = fdb.tqfamilies();
+                TQStringList list = fdb.families();
                 list = list.grep(name, false);
                 if ( !list.isEmpty() ) {
                     _data->family = list[0];
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index e2aa72e8..dfc56703 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -111,7 +111,7 @@ KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
         for (it.toFirst(); it.current()!=it.end(); it.next()) {
             TQString s = (first ? i18n("First pass: page #%1...")
                          : i18n("Second pass: page #%1..."));
-            pd.setLabel( s.tqarg(it.current()) );
+            pd.setLabel( s.arg(it.current()) );
             tqApp->processEvents();
             if (pd.wasCancelled()) return KoFilter::UserCancelled;
             kdDebug(30516) << "-- " << "pass #" << k
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
index d0bda665..e456310b 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
@@ -54,8 +54,8 @@ static XrmOptionDescRec xOpts[] = {
   {"-fg",            "*Foreground",      XrmoptionSepArg,  NULL},
   {"-background",    "*Background",      XrmoptionSepArg,  NULL},
   {"-bg",            "*Background",      XrmoptionSepArg,  NULL},
-  {"-tqgeometry",      ".tqgeometry",        XrmoptionSepArg,  NULL},
-  {"-g",             ".tqgeometry",        XrmoptionSepArg,  NULL},
+  {"-geometry",      ".geometry",        XrmoptionSepArg,  NULL},
+  {"-g",             ".geometry",        XrmoptionSepArg,  NULL},
   {"-font",          "*.fontList",       XrmoptionSepArg,  NULL},
   {"-fn",            "*.fontList",       XrmoptionSepArg,  NULL},
   {"-title",         ".title",           XrmoptionSepArg,  NULL},
@@ -69,7 +69,7 @@ static XrmOptionDescRec xOpts[] = {
 #define nXOpts (sizeof(xOpts) / sizeof(XrmOptionDescRec))
 
 struct XPDFAppResources {
-  String tqgeometry;
+  String geometry;
   String title;
   Bool installCmap;
   int rgbCubeSize;
@@ -85,7 +85,7 @@ static Bool defReverseVideo = False;
 static Bool defViKeys = False;
 
 static XtResource xResources[] = {
-  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, tqgeometry),     XtRString, (XtPointer)NULL             },
+  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, geometry),     XtRString, (XtPointer)NULL             },
   { "title",        "Title",        XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, title),        XtRString, (XtPointer)NULL             },
   { "installCmap",  "InstallCmap",  XtRBool,   sizeof(Bool),   XtOffsetOf(XPDFAppResources, installCmap),  XtRBool,   (XtPointer)&defInstallCmap  },
   { "rgbCubeSize",  "RgbCubeSize",  XtRInt,    sizeof(int),    XtOffsetOf(XPDFAppResources, rgbCubeSize),  XtRInt,    (XtPointer)&defRGBCubeSize  },
@@ -156,7 +156,7 @@ void XPDFApp::getResources() {
   
   XtGetApplicationResources(appShell, &resources, xResources, nXResources,
 			    NULL, 0);
-  tqgeometry = resources.tqgeometry ? new GString(resources.tqgeometry)
+  geometry = resources.geometry ? new GString(resources.geometry)
                                 : (GString *)NULL;
   title = resources.title ? new GString(resources.title) : (GString *)NULL;
   installCmap = (GBool)resources.installCmap;
@@ -180,8 +180,8 @@ void XPDFApp::getResources() {
 
 XPDFApp::~XPDFApp() {
   deleteGList(viewers, XPDFViewer);
-  if (tqgeometry) {
-    delete tqgeometry;
+  if (geometry) {
+    delete geometry;
   }
   if (title) {
     delete title;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
index 46aa28dc..4875456e 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
@@ -58,7 +58,7 @@ public:
   void remoteQuit();
 
   //----- resource/option values
-  GString *getGeometry() { return tqgeometry; }
+  GString *getGeometry() { return geometry; }
   GString *getTitle() { return title; }
   GBool getInstallCmap() { return installCmap; }
   int getRGBCubeSize() { return rgbCubeSize; }
@@ -90,7 +90,7 @@ private:
   Widget remoteWin;
 
   //----- resource/option values
-  GString *tqgeometry;
+  GString *geometry;
   GString *title;
   GBool installCmap;
   int rgbCubeSize;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 290861b9..69a173af 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -16,7 +16,7 @@
 
 struct _XPDFTreeEntry {
   Widget widget;
-  XPDFTreeEntry *tqchildren;
+  XPDFTreeEntry *children;
   XPDFTreeEntry *next;
 };
 
@@ -158,7 +158,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
     XtVersion,					// version
     NULL,					// callback_private
     defaultTranslations,			// tm_table
-    &queryGeometry,				// query_tqgeometry
+    &queryGeometry,				// query_geometry
     NULL,					// display_accelerator
     NULL					// extension
   },
@@ -259,8 +259,8 @@ static void destroy(Widget widget) {
 }
 
 static void destroySubtree(XPDFTreeEntry *e) {
-  if (e->tqchildren) {
-    destroySubtree(e->tqchildren);
+  if (e->children) {
+    destroySubtree(e->children);
   }
   if (e->next) {
     destroySubtree(e->next);
@@ -301,11 +301,11 @@ static void redisplaySubtree(XPDFTreeWidget w, XPDFTreeEntry *e,
   c = XPDFTreeCPart(e->widget);
   x = e->widget->core.x;
   y = e->widget->core.y + e->widget->core.height / 2;
-  if (e->tqchildren) {
+  if (e->children) {
     if (c->entryExpanded) {
       drawExpandedIcon(w, x - 8, y);
       y2 = y; // make gcc happy
-      for (child = e->tqchildren; child; child = child->next) {
+      for (child = e->children; child; child = child->next) {
 	y2 = child->widget->core.y + child->widget->core.height / 2;
 	XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), w->tree.dottedGC,
 		  x - 8, y2, x + 6, y2);
@@ -393,7 +393,7 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
 			    XtWidgetGeometry *reply) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
-  // our parent rejected a tqgeometry request, so accept the compromise
+  // our parent rejected a geometry request, so accept the compromise
   // and retqlayout
   if (!reply->request_mode) {
     if (cls->treeClass.tqlayout) {
@@ -454,7 +454,7 @@ static XtGeometryResult geometryManager(Widget widget,
     return XtGeometryNo;
   }
 
-  // save the current tqgeometry
+  // save the current geometry
   curWidth = w->core.width;
   curHeight = w->core.height;
   curBW = w->core.border_width;
@@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget,
     calcSize((Widget)w, widget, &parentReq.width, &reply->height);
   }
 
-  // send tqgeometry request to our parent
+  // send geometry request to our parent
   parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
     parentReq.request_mode |= XtCWQueryOnly;
@@ -491,7 +491,7 @@ static XtGeometryResult geometryManager(Widget widget,
   }
 
   if (result == XtGeometryNo || (request->request_mode & XtCWQueryOnly)) {
-    // restore the original tqgeometry
+    // restore the original geometry
     w->core.width = curWidth;
     w->core.height = curHeight;
     w->core.border_width = curBW;
@@ -552,10 +552,10 @@ static void initConstraint(Widget requestWidget, Widget newWidget,
   c = XPDFTreeCPart(newWidget);
   c->e = (XPDFTreeEntry *)gmalloc(sizeof(XPDFTreeEntry));
   c->e->widget = newWidget;
-  c->e->tqchildren = NULL;
+  c->e->children = NULL;
   c->e->next = NULL;
   if (c->entryParent) {
-    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
+    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
   } else {
     insertChildOnList(c->e, &w->tree.root);
   }
@@ -573,11 +573,11 @@ static void deleteSubtree(Widget widget) {
   if (!c->e) {
     return;
   }
-  while (c->e->tqchildren) {
-    deleteSubtree(c->e->tqchildren->widget);
+  while (c->e->children) {
+    deleteSubtree(c->e->children->widget);
   }
   if (c->entryParent) {
-    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
+    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
   } else {
     deleteChildFromList(c->e, &w->tree.root);
   }
@@ -603,12 +603,12 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   if (nc->entryParent != oc->entryParent ||
       nc->entryPosition != oc->entryPosition) {
     if (oc->entryParent) {
-      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->tqchildren);
+      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->children);
     } else {
       deleteChildFromList(oc->e, &w->tree.root);
     }
     if (nc->entryParent) {
-      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->tqchildren);
+      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->children);
     } else {
       insertChildOnList(nc->e, &w->tree.root);
     }
@@ -745,9 +745,9 @@ static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
     }
   }
 
-  // place this entry's tqchildren
+  // place this entry's children
   x += xpdfTreeIndent;
-  for (child = e->tqchildren; child; child = child->next) {
+  for (child = e->children; child; child = child->next) {
     y = layoutSubtree(w, instigator, child, x, y,
 		      visible && (!c || c->entryExpanded));
   }
@@ -820,9 +820,9 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
     h1 = 0;
   }
 
-  // if this entry is expanded, get size of all of its tqchildren
+  // if this entry is expanded, get size of all of its children
   if (c->entryExpanded) {
-    for (child = e->tqchildren; child; child = child->next) {
+    for (child = e->children; child; child = child->next) {
       calcSubtreeSize(w, instigator, child, &w2, &h2);
       w2 += xpdfTreeIndent;
       if (w2 > w1) {
@@ -907,13 +907,13 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y,
     return True;
   } else if (x >= child->core.x - 16 && x < child->core.x - 4 &&
 	     y >= y1 - 6 && y < y1 + 6 &&
-	     (*e)->tqchildren) {
+	     (*e)->children) {
     *onExpandIcon = True;
     return True;
   }
   c = XPDFTreeCPart(child);
   if (!c || c->entryExpanded) {
-    for (e2 = (*e)->tqchildren; e2; e2 = e2->next) {
+    for (e2 = (*e)->children; e2; e2 = e2->next) {
       *e = e2;
       if (findPositionInSubtree(w, x, y, e, onExpandIcon)) {
 	return True;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index de691914..a8c8f8f0 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -501,9 +501,9 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING); ++n;
   if (app->getFullScreen()) {
     XtSetArg(args[n], XmNmwmDecorations, 0); ++n;
-    XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n;
+    XtSetArg(args[n], XmNgeometry, "+0+0"); ++n;
   } else if (app->getGeometry()) {
-    XtSetArg(args[n], XmNtqgeometry, app->getGeometry()->getCString()); ++n;
+    XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n;
   }
   win = XtCreatePopupShell("win", topLevelShellWidgetClass,
 			   app->getAppShell(), args, n);
@@ -633,7 +633,7 @@ void XPDFViewer::initWindow() {
   XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
   s = XmStringCreateLocalized(" of 00000");
   XtSetArg(args[n], XmNlabelString, s); ++n;
-  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
   XtSetArg(args[n], XmNrecomputeSize, False); ++n;
   pageCountLabel = XmCreateLabel(toolBar, "pageCountLabel", args, n);
   XmStringFree(s);
@@ -751,7 +751,7 @@ void XPDFViewer::initWindow() {
   s = XmStringCreateLocalized("");
   XtSetArg(args[n], XmNlabelString, s); ++n;
   XtSetArg(args[n], XmNrecomputeSize, True); ++n;
-  XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
   linkLabel = XmCreateLabel(toolBar, "linkLabel", args, n);
   XmStringFree(s);
   XtManageChild(linkLabel);
diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
index d4103df2..ef47fb6e 100644
--- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc
+++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cc
@@ -44,9 +44,9 @@ static GBool printHelp = gFalse;
 
 static ArgDesc argDesc[] = {
   {"-g",          argStringDummy, NULL,           0,
-   "initial window tqgeometry"},
-  {"-tqgeometry",   argStringDummy, NULL,           0,
-   "initial window tqgeometry"},
+   "initial window geometry"},
+  {"-geometry",   argStringDummy, NULL,           0,
+   "initial window geometry"},
   {"-title",      argStringDummy, NULL,           0,
    "window title"},
   {"-cmap",       argFlagDummy,   NULL,           0,
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 6fefe85e..12719f4a 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -264,7 +264,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor)
 
             // throw away WMF metaheader (22 bytes)
             for( uint i=0; i<image.size()-22; i++)
-                image.tqat(i) = image.tqat(i+22); // As we use uint, we need at()  ( [] uses int only .)
+                image.at(i) = image.at(i+22); // As we use uint, we need at()  ( [] uses int only .)
             image.resize( image.size()-22 );
         }
     }
@@ -1464,24 +1464,24 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
     TQString strLayout;
 
 
-    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.alignment!=tqlayout.alignment))
     {
-        if (tqlayout.tqalignment=="left")
+        if (tqlayout.alignment=="left")
             strLayout += "\\ql";
-        else if (tqlayout.tqalignment== "right")
+        else if (tqlayout.alignment== "right")
             strLayout += "\\qr";
-        else if (tqlayout.tqalignment=="center")
+        else if (tqlayout.alignment=="center")
             strLayout += "\\qc";
-        else if (tqlayout.tqalignment=="justify")
+        else if (tqlayout.alignment=="justify")
             strLayout += "\\qj";
-        else if ( tqlayout.tqalignment=="auto")
+        else if ( tqlayout.alignment=="auto")
         {
             // ### TODO: what for BIDI?
             //strLayout += "\\ql";
         }
         else
         {
-            kdWarning(30515) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
+            kdWarning(30515) << "Unknown alignment: " << tqlayout.alignment << endl;
         }
     }
 
@@ -1556,14 +1556,14 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
            strLayout += "\\sl480\\slmult1"; // double linespace
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST  )
-           strLayout += TQString("\\sl%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
+           strLayout += TQString("\\sl%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE  )
-           strLayout += TQString("\\sl%1\\slmult1").tqarg( int(tqlayout.lineSpacing)*240 );
+           strLayout += TQString("\\sl%1\\slmult1").arg( int(tqlayout.lineSpacing)*240 );
 
         else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM )
            // "Custom" in KWord is like "Exactly" in MS Word
-           strLayout += TQString("\\sl-%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
+           strLayout += TQString("\\sl-%1\\slmult0").arg(int(tqlayout.lineSpacing)*20);
 
         else
             kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 5bfadbcb..465a7478 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -202,11 +202,11 @@ static RTFProperty propertyTable[] =
 	PROP(	0L,		"plain",	setPlainFormatting,	0L, 0 ),
 	PROP(	"@pict",	"pmmetafile",	setPictureType,	        0L, RTFPicture::WMF ),
 	PROP(	"@pict",	"pngblip",	setPictureType,	        0L, RTFPicture::PNG ),
-	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Left ),
+	MEMBER(	0L,		"qc",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"qj",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Justified ),
+	MEMBER(	0L,		"ql",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Left ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.alignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
 	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.rightIndent, 0 ),
@@ -237,9 +237,9 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"tqr",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::FlushRight ),
 	MEMBER(	0L,		"trleft",	setNumericProperty,	state.tableRow.left, 0 ),
 	MEMBER(	0L,		"trowd",	setTableRowDefaults,	state.tableRow, 0 ),
-	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Left ),
-	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.tqalignment, RTFLayout::Right ),
+	MEMBER(	0L,		"trqc",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Centered ),
+	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Left ),
+	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Right ),
 	MEMBER(	0L,		"trrh",		setNumericProperty,	state.tableRow.height, 0 ),
 	PROP(	0L,		"tx",		insertTabDef,		0L, 0 ),
 	MEMBER(	0L,		"u",		insertUnicodeSymbol,	state.format.uc, 0 ),
@@ -384,7 +384,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -403,7 +403,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -422,7 +422,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
             if ( !m_batch )
             {
                 force = ( KMessageBox::warningYesNo( 0L,
-                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ),
+                    i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ),
                     i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes );
             }
             if ( !force )
@@ -439,7 +439,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
         if ( !m_batch )
         {
             KMessageBox::error( 0L,
-                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ),
+                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").arg( token.text ),
                 i18n("KWord's RTF Import Filter"), 0 );
         }
         return KoFilter::WrongFormat;
@@ -793,7 +793,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 
     for (TQMap<TQString,int>::ConstIterator it=debugUnknownKeywords.begin();
         it!=debugUnknownKeywords.end();it++)
-        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 )  << " * " << it.key() << endl;
+        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).arg( it.data(), 4 )  << " * " << it.key() << endl;
 
     return KoFilter::OK;
 }
@@ -1029,7 +1029,7 @@ void RTFImport::setParagraphDefaults( RTFProperty * )
     tqlayout.spaceBetween	= 0;
     tqlayout.spaceBetweenMultiple = false;
     tqlayout.style	= 0;
-    tqlayout.tqalignment	= RTFLayout::Left;
+    tqlayout.alignment	= RTFLayout::Left;
     tqlayout.border	= 0L;
     tqlayout.inTable	= false;
     tqlayout.keep		= false;
@@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
     tableRow.height	= 0;
     tableRow.left	= 0;
-    tableRow.tqalignment	= RTFLayout::Left;
+    tableRow.alignment	= RTFLayout::Left;
     tableRow.cells.clear();
     tableCell.bgcolor	= -1;
 
@@ -1130,12 +1130,12 @@ void RTFImport::insertTableRow( RTFProperty * )
 	{
 	    char buf[64];
 	    sprintf( buf, "Table %d", textState->table );
-	    RTFLayout::Alignment align = row.tqalignment;
+	    RTFLayout::Alignment align = row.alignment;
 
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.tqlayout.tqalignment = align;	// table tqalignment
+	    state.tqlayout.alignment = align;	// table alignment
 
 	    // Add anchor for new table (default tqlayout)
 	    addAnchor( buf );
@@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     int vertAlign0 = ~vertAlign;
     int fontSize0  = ~fontSize;
 
-    // Adjust vertical tqalignment and font size if (\dn, \up) are used
+    // Adjust vertical alignment and font size if (\dn, \up) are used
     if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline)
     {
 	if (format.fmt.baseline < 0)
@@ -2263,12 +2263,12 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
 
 void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
 {
-    // Style name and tqalignment
+    // Style name and alignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[tqlayout.tqalignment] );
+      node.setAttribute( "align", alignN[tqlayout.alignment] );
     node.closeNode( "FLOW" );
 
     // Indents
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index 2003b508..bdf6f940 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -124,7 +124,7 @@ struct RTFLayout
     RTFTab tab;
     RTFBorder borders[4];
     RTFBorder *border;
-    Alignment tqalignment;
+    Alignment alignment;
     int style;
     int firstIndent, leftIndent, rightIndent;
     int spaceBefore, spaceAfter;
@@ -198,7 +198,7 @@ struct RTFTableRow
 {
     TQValueList<RTFTableCell> cells;
     TQStringList frameSets;
-    RTFLayout::Alignment tqalignment;
+    RTFLayout::Alignment alignment;
     int height;
     int left;
 };
diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html
index 27239e52..4642bf83 100644
--- a/filters/kword/rtf/status.html
+++ b/filters/kword/rtf/status.html
@@ -52,14 +52,14 @@
        - Document information (author, title, comments, company).<br>
        - Page size and margins.<br>
        - Headers and footers (with margins).<br>
-       - Tables (including non-rectangular), horizontal tqalignment.<br>
+       - Tables (including non-rectangular), horizontal alignment.<br>
        - Table cell background color and borders (style, color, width).<br>
        - Embedded pictures (JPEG/PNG/BMP) and clipart (EMF/WMF).<br>
        - Word 97-2000 picture support.<br>
        - Style sheet.<br>
        - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br>
        - Font mapping (using TQFont/TQFontInfo).<br>
-       - Paragraph tqlayout (horizontal tqalignment, indents, space before/after, frame break).<br>
+       - Paragraph tqlayout (horizontal alignment, indents, space before/after, frame break).<br>
        - Paragraph borders (style, color, width).<br>
        - Tabulators, automatic tabulator for hanging indent.<br>
        - Unicode and codepages support.<br>
@@ -76,7 +76,7 @@
        - Fix line spacing.<br>
        - Columns.<br>
        - Improve list handling.<br>
-       - Shaps, especially picture that are in tqshapes<br>
+       - Shaps, especially picture that are in shapes<br>
      </td>
     </tr>
 
@@ -85,7 +85,7 @@
      <td>
        15 July 2001: First useful version (rewritten for TQDom).<br>
        18 July 2001: Fixed function <code>finishTable()</code> (some tables crashed KWord).<br>
-       23 July 2001: Added table tqalignment, background color and cell borders.<br>
+       23 July 2001: Added table alignment, background color and cell borders.<br>
        31 August 2001: Faster version, uses read buffers and optimized XML output.<br>
        2 October 2001: Clipart import fixed (requires libwmf).<br>
        23 July 2002: Added field and hyperlink support, fixed embedded pictures.<br>
diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp
index d9751e15..9323cdbc 100644
--- a/filters/kword/starwriter/pole.cpp
+++ b/filters/kword/starwriter/pole.cpp
@@ -36,7 +36,7 @@ class Entry
     unsigned long size;
     unsigned start;
     bool dir;
-    std::vector<Entry*> tqchildren;
+    std::vector<Entry*> children;
     Entry();
     ~Entry();
   private:
@@ -257,9 +257,9 @@ Entry::Entry()
 
 Entry::~Entry()
 { 
-  for( unsigned i=0; i<tqchildren.size(); i++ )
+  for( unsigned i=0; i<children.size(); i++ )
   {
-    Entry* entry = tqchildren[ i ];
+    Entry* entry = children[ i ];
     delete entry;
   }
 }
@@ -657,7 +657,7 @@ Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dire
 
   // append as another child
   entry->parent = parent;
-  if( parent ) parent->tqchildren.push_back( entry );
+  if( parent ) parent->children.push_back( entry );
 
   // check previous
   int prev  = readU32( dirent + 0x44+p );
@@ -725,9 +725,9 @@ Entry* StorageIO::entry( const std::string& name )
      std::string entryname = *it;
      Entry *child = (Entry*) 0L;
      if( entry->dir )
-       for( unsigned j=0; j < entry->tqchildren.size(); j++ )
-         if( entry->tqchildren[j]->name == entryname )
-           child = entry->tqchildren[j];
+       for( unsigned j=0; j < entry->children.size(); j++ )
+         if( entry->children[j]->name == entryname )
+           child = entry->children[j];
      if( !child ) return (Entry*) 0L;
       entry = child;
    }
@@ -912,10 +912,10 @@ std::list<std::string> Storage::listDirectory()
   // sentinel: do nothing if not a directory
   if( !io->current_dir->dir ) return entries;
 
-  // find all tqchildren belongs to this directory
-  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
+  // find all children belongs to this directory
+  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
   {
-    Entry* e = io->current_dir->tqchildren[i];
+    Entry* e = io->current_dir->children[i];
     if( e ) entries.push_back( e->name );
   }
 
@@ -930,9 +930,9 @@ bool Storage::enterDirectory( const std::string& directory )
   if( !io->current_dir ) return false;
 
   // look for the specified sub-dir
-  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
+  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
   {
-    Entry* e = io->current_dir->tqchildren[i];
+    Entry* e = io->current_dir->children[i];
     if( e ) if( e->name == directory ) 
       if ( e->dir )
       {
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc
index 104e08f9..43dc1b62 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cc
@@ -345,7 +345,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     TQ_UINT8 row, column;
 
     // Set table name
-    tableName = TQString("Table %1").tqarg(tablesNumber);
+    tableName = TQString("Table %1").arg(tablesNumber);
     tablesNumber++;
 
     // Skip useless sections and retrieve the right point
@@ -381,8 +381,8 @@ bool StarWriterImport::parseTable(TQByteArray n)
             text = convertToKWordString(s);
 
             // FIXME: check this stuff
-            TQString frameName = TQString("%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
-            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").tqarg(frameName).tqarg(tableName).tqarg(row).tqarg(column));
+            TQString frameName = TQString("%1 Cell %2,%3").arg(tableName).arg(row).arg(column);
+            tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").arg(frameName).arg(tableName).arg(row).arg(column));
             tableText.append(" <FRAME runaround=\"1\" copy=\"0\" newFrameBehavior=\"1\" runaroundSide=\"biggest\" autoCreateNewFrame=\"0\" bleftpt=\"2.8\" brightpt=\"2.8\" btoppt=\"2.8\" bbottompt=\"2.8\" runaroundGap=\"2.8\" />\n");
             tableText.append("  <PARAGRAPH>\n");
             tableText.append("   <TEXT xml:space=\"preserve\">" + text + "</TEXT>\n");
@@ -408,7 +408,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     bodyStuff.append("   <TEXT xml:space=\"preserve\">#</TEXT>\n");
     bodyStuff.append("   <FORMATS>\n");
     bodyStuff.append("    <FORMAT id=\"6\" pos=\"0\" len=\"1\">\n");
-    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").tqarg(tableName));
+    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").arg(tableName));
     bodyStuff.append("    </FORMAT>\n");
     bodyStuff.append("   </FORMATS>\n");
     bodyStuff.append("  </PARAGRAPH>\n");
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 10837ba1..f18a3a7b 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText,
   }
 
   // sentinel check
-  TQString align = tqlayout.tqalignment.lower();
+  TQString align = tqlayout.alignment.lower();
   if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) )
     align = "left"; 
 
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc
index bffdecf1..b3bb7d17 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cc
@@ -125,7 +125,7 @@ bool WPFiveWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.tqdevice()->at();
+  document_area_ptr = output.device()->at();
 
   return true;
 }
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc
index 21c59606..9db2f1e1 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cc
@@ -125,7 +125,7 @@ bool WPSixWorker::doOpenDocument(void)
   for( int i=0; i<14; i++ ) output << index_header[i];
 
   // document area starts, mark it for the header fields
-  document_area_ptr = output.tqdevice()->at();
+  document_area_ptr = output.device()->at();
 
   return true;
 }
@@ -157,12 +157,12 @@ static TQCString WPSixEscape( const TQString& text )
 bool WPSixWorker::doFullParagraph(const TQString& paraText, 
   const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
-  // handle paragraph tqalignment/justification (default to left)
+  // handle paragraph alignment/justification (default to left)
   unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 };
-  if( tqlayout.tqalignment == "left" ) wp_align[7] = 0;
-  if( tqlayout.tqalignment == "justify" ) wp_align[7] = 1;
-  if( tqlayout.tqalignment == "center" ) wp_align[7] = 2;
-  if( tqlayout.tqalignment == "right" ) wp_align[7] = 3;
+  if( tqlayout.alignment == "left" ) wp_align[7] = 0;
+  if( tqlayout.alignment == "justify" ) wp_align[7] = 1;
+  if( tqlayout.alignment == "center" ) wp_align[7] = 2;
+  if( tqlayout.alignment == "right" ) wp_align[7] = 3;
   output.writeRawBytes( (const char*)wp_align, 12 );
 
   ValueListFormatData::ConstIterator it;
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index cac0783f..9c65ddd9 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -227,7 +227,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         else if ( type == "char" ) {
             TQString delimiterChar = tabStop.attributeNS( ooNS::style, "char", TQString() ); // single character
             elem.setAttribute( "alignchar", delimiterChar );
-            kOfficeType = 3; // "tqalignment on decimal point"
+            kOfficeType = 3; // "alignment on decimal point"
         }
 
         elem.setAttribute( "type", kOfficeType );
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index fafefdbd..0f052e13 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -118,9 +118,9 @@ void OLEFilter::commSlotDelayStream( const char* delay )
     emit internalCommDelayStream( delay );
 }
 
-void OLEFilter::commSlotShapeID( unsigned int& tqshapeID )
+void OLEFilter::commSlotShapeID( unsigned int& shapeID )
 {
-    emit internalCommShapeID( tqshapeID );
+    emit internalCommShapeID( shapeID );
 }
 
 void OLEFilter::slotSavePart(
@@ -234,7 +234,7 @@ void OLEFilter::slotSavePic(
     else
     {
         // It's not here, so let's generate one.
-        storageId = TQString( "pictures/picture%1.%2" ).tqarg( numPic++ ).tqarg( extension );
+        storageId = TQString( "pictures/picture%1.%2" ).arg( numPic++ ).arg( extension );
         imageMap.insert(nameIN, storageId);
         KoStoreDevice* pic = m_chain->storageFile( storageId, KoStore::Write );
         if(!pic)
diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h
index f8c6203d..2759ea50 100644
--- a/filters/olefilters/olefilter.h
+++ b/filters/olefilters/olefilter.h
@@ -43,7 +43,7 @@ public:
 
 public slots:
     void commSlotDelayStream( const char* delay );
-    void commSlotShapeID( unsigned int& tqshapeID );
+    void commSlotShapeID( unsigned int& shapeID );
 
 protected slots:
     // This slot saves the document informations to the KOffice tar storage.
@@ -100,7 +100,7 @@ protected slots:
 
 signals:
     // Forwarding signals for inter-filter communication
-    void internalCommShapeID( unsigned int& tqshapeID );
+    void internalCommShapeID( unsigned int& shapeID );
     void internalCommDelayStream( const char* delay );
 
 private:
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index b53acfc5..bb85f84d 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -819,7 +819,7 @@ void Powerpoint::opSlidePersistAtom(
     struct
     {
         TQ_UINT32 psrReference;   // Logical reference to the slide persist object.
-        TQ_UINT32 flags;          // If bit 3 set then slide contains tqshapes other than placeholders.
+        TQ_UINT32 flags;          // If bit 3 set then slide contains shapes other than placeholders.
         TQ_INT32 numberTexts;    // Number of placeholder texts stored with the persist object.
         TQ_INT32 slideId;        // Unique slide identifier, used for OLE link monikers for example.
         TQ_UINT32 reserved;
@@ -1056,7 +1056,7 @@ void Powerpoint::opTextHeaderAtom(
                             // 1 Body
                             // 2 Notes
                             // 3 Not Used
-                            // 4 Other (Text in a tqshape)
+                            // 4 Other (Text in a shape)
                             // 5 Center body (subtitle in title slide)
                             // 6 Center title (title in title slide)
                             // 7 Half body (body in two-column slide)
diff --git a/filters/olefilters/powerpoint97/pptSlide.h b/filters/olefilters/powerpoint97/pptSlide.h
index 026e2ef1..78e9cb0a 100644
--- a/filters/olefilters/powerpoint97/pptSlide.h
+++ b/filters/olefilters/powerpoint97/pptSlide.h
@@ -34,7 +34,7 @@ DESCRIPTION
 #define BODY_TEXT 			1	//body
 #define NOTES_TEXT 		2	//notes
 #define NOTUSED_TEXT 		3	//not used
-#define OTHER_TEXT 		4	//other(test in tqshape)
+#define OTHER_TEXT 		4	//other(test in shape)
 #define CENTER_BODY_TEXT 	5	//center body(subtitle in title slide)
 #define CENTER_TITLE_TEXT 	6	//center title(title in title slide)
 #define HALF_BODY_TEXT 	7	//half body(body in two-column slide)
diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc
index 96a03567..270cc30f 100644
--- a/filters/olefilters/powerpoint97/pptxml.cc
+++ b/filters/olefilters/powerpoint97/pptxml.cc
@@ -143,7 +143,7 @@ void PptXml::gotDrawing(
     ourKey = "vectorGraphic" + TQString::number(id) + "." + type;
     if (type == "msod")
     {
-        filterArgs = "tqshape-id=";
+        filterArgs = "shape-id=";
         filterArgs += TQString::number(id);
         filterArgs += ";delay-stream=";
         filterArgs += TQString::number(0);
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 8d36f43b..aade6891 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -64,7 +64,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
 	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -227,9 +227,9 @@ void XSLTExportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index 2e278bf2..c3fb4b97 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -59,7 +59,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa
 	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -226,9 +226,9 @@ void XSLTImportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
diff --git a/karbon/commands/vbooleancmd.h b/karbon/commands/vbooleancmd.h
index 3a3478d3..c782c838 100644
--- a/karbon/commands/vbooleancmd.h
+++ b/karbon/commands/vbooleancmd.h
@@ -37,8 +37,8 @@ public:
 	enum VBooleanType
 	{
 		intersect,
-		tqshape_union,
-		tqshape_xor,
+		shape_union,
+		shape_xor,
 		substract
 	};
 
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc
index 2275dba8..427ecdca 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cc
@@ -44,7 +44,7 @@ VReplacingCmd::execute()
 	bool successful = false;
 
 
-	// Create new tqshapes if they don't exist yet.
+	// Create new shapes if they don't exist yet.
 	if( !m_newObjects )
 	{
 		m_newObjects = new VSelection();
@@ -65,11 +65,11 @@ VReplacingCmd::execute()
 			{
 				successful = true;
 
-				// Insert new tqshape right before old tqshape.
+				// Insert new shape right before old shape.
 				itr.current()->parent()->insertInfrontOf(
 					newObject, itr.current() );
 
-				// Add new tqshape to list of new objects.
+				// Add new shape to list of new objects.
 				m_newObjects->append( newObject );
 			}
 			// No success.
diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc
index ae0ad2dc..9a59fcd9 100644
--- a/karbon/commands/vshapecmd.cc
+++ b/karbon/commands/vshapecmd.cc
@@ -25,33 +25,33 @@
 #include "vshapecmd.h"
 
 
-VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon )
-	: VCommand( doc, name, icon ), m_tqshape( tqshape )
+VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon )
+	: VCommand( doc, name, icon ), m_shape( shape )
 {
 }
 
 void
 VShapeCmd::execute()
 {
-	if( !m_tqshape )
+	if( !m_shape )
 		return;
 
-	if( m_tqshape->state() == VObject::deleted )
+	if( m_shape->state() == VObject::deleted )
 	{
 		document()->selection()->clear();
-		m_tqshape->setState( VObject::normal );
-		document()->selection()->append( m_tqshape );
+		m_shape->setState( VObject::normal );
+		document()->selection()->append( m_shape );
 	}
 	else
 	{
-		m_tqshape->setState( VObject::normal );
-		m_tqshape->setFill( *( document()->selection()->fill() ) );
-		m_tqshape->setStroke( *( document()->selection()->stroke() ) );
+		m_shape->setState( VObject::normal );
+		m_shape->setFill( *( document()->selection()->fill() ) );
+		m_shape->setStroke( *( document()->selection()->stroke() ) );
 
 		// Add path:
-		document()->append( m_tqshape );
+		document()->append( m_shape );
 		document()->selection()->clear();
-		document()->selection()->append( m_tqshape );
+		document()->selection()->append( m_shape );
 	}
 
 	setSuccess( true );
@@ -60,11 +60,11 @@ VShapeCmd::execute()
 void
 VShapeCmd::unexecute()
 {
-	if( !m_tqshape )
+	if( !m_shape )
 		return;
 
-	document()->selection()->take( *m_tqshape );
-	m_tqshape->setState( VObject::deleted );
+	document()->selection()->take( *m_shape );
+	m_shape->setState( VObject::deleted );
 
 	setSuccess( false );
 }
diff --git a/karbon/commands/vshapecmd.h b/karbon/commands/vshapecmd.h
index 30607fcd..d4742a67 100644
--- a/karbon/commands/vshapecmd.h
+++ b/karbon/commands/vshapecmd.h
@@ -28,13 +28,13 @@ class VPath;
 /*
  * Provides a common base class for creation commands since they all have
  * a similar execute / unexecute behaviour and all build a VPath. Upon
- * execution() the tqshape will be added to the document and selected, upon undoing
+ * execution() the shape will be added to the document and selected, upon undoing
  * it will be set to the deleted state.
  */
 class KARBONCOMMAND_EXPORT VShapeCmd : public VCommand
 {
 public:
-	VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon = "14_polygon" );
+	VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon = "14_polygon" );
 	virtual ~VShapeCmd() {}
 
 	virtual void execute();
@@ -43,8 +43,8 @@ public:
 	virtual bool changesSelection() const { return true; }
 
 protected:
-	/// Pointer to the created tqshape.
-	VPath *m_tqshape;
+	/// Pointer to the created shape.
+	VPath *m_shape;
 };
 
 #endif
diff --git a/karbon/commands/vtextcmd.h b/karbon/commands/vtextcmd.h
index 708250c8..2fb0a75a 100644
--- a/karbon/commands/vtextcmd.h
+++ b/karbon/commands/vtextcmd.h
@@ -23,7 +23,7 @@
 
 #include <tqfont.h>
 
-#include "vtqshapecmd.h"
+#include "vshapecmd.h"
 
 // create a text-object.
 
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index f0173920..dc1038ab 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -484,7 +484,7 @@ VTranslatePointCmd::translatePoints()
 			segment->setPoint( pnts[i], segment->point( pnts[i] ).transform( m_mat ) );
 	}
 
-	// tqinvalidate all changed subpaths
+	// invalidate all changed subpaths
 	VObjectListIterator itr( m_subpaths );
 	for( ; itr.current(); ++itr )
 		itr.current()->invalidateBoundingBox();
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc
index 570b06dc..25636211 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cc
@@ -377,7 +377,7 @@ VPath::saveOasis( KoStore *store, KoXmlWriter *docWriter, KoGenStyles &mainStyle
 		double w = boundingBox().width();
 		double h = boundingBox().height();
 
-		docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).tqarg( x ).tqarg( y ).tqarg( w ).tqarg( h ) );
+		docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).arg( x ).arg( y ).arg( w ).arg( h ) );
 		docWriter->addAttributePt( "svg:x", x );
 		docWriter->addAttributePt( "svg:y", y );
 		docWriter->addAttributePt( "svg:width", w );
@@ -456,7 +456,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context )
 
 		viewbox = element.attributeNS( KoXmlNS::svg, "viewBox", TQString() );
 	}
-	else if( element.localName() == "custom-tqshape" )
+	else if( element.localName() == "custom-shape" )
 	{
 		TQDomNodeList list = element.childNodes();
 		for( uint i = 0; i < list.count(); ++i )
@@ -467,7 +467,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context )
 				if( e.namespaceURI() != KoXmlNS::draw )
 					continue;
 				
-				if( e.localName() == "enhanced-tqgeometry" )
+				if( e.localName() == "enhanced-geometry" )
 				{
 					TQString data = e.attributeNS( KoXmlNS::draw, "enhanced-path", TQString() );
 					if( ! data.isEmpty() )
@@ -742,12 +742,12 @@ VPath::buildSvgTransform( const TQWMatrix &mat ) const
 	TQString transform;
 	if( !mat.isIdentity() )
 	{
-		transform = TQString(  "matrix(%1, %2, %3, %4, %5, %6)" ).tqarg( mat.m11() )
-																.tqarg( mat.m12() )
-																.tqarg( mat.m21() )
-																.tqarg( mat.m22() )
-																.tqarg( mat.dx() )
-																.tqarg( mat.dy() );
+		transform = TQString(  "matrix(%1, %2, %3, %4, %5, %6)" ).arg( mat.m11() )
+																.arg( mat.m12() )
+																.arg( mat.m21() )
+																.arg( mat.m22() )
+																.arg( mat.dx() )
+																.arg( mat.dy() );
 	}
 	return transform;
 }
@@ -764,12 +764,12 @@ VPath::buildOasisTransform( const TQWMatrix &mat ) const
 	TQString transform;
 	if( !mat.isIdentity() )
 	{
-		transform = TQString(  "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).tqarg( mat.m11() )
-																.tqarg( mat.m12() )
-																.tqarg( mat.m21() )
-																.tqarg( mat.m22() )
-																.tqarg( mat.dx() )
-																.tqarg( mat.dy() );
+		transform = TQString(  "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).arg( mat.m11() )
+																.arg( mat.m12() )
+																.arg( mat.m21() )
+																.arg( mat.m22() )
+																.arg( mat.dx() )
+																.arg( mat.dy() );
 	}
 	return transform;
 }
diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc
index d1cd9d13..dfa4d5df 100644
--- a/karbon/core/vfill.cc
+++ b/karbon/core/vfill.cc
@@ -83,7 +83,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const
 		style.addProperty( "draw:fill", "solid" );
 		style.addProperty( "draw:fill-color", TQColor( m_color ).name() );
 		if( m_color.opacity() < 1 )
-			style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) );
+			style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) );
 	}
 	else if( m_type == grad )
 	{
@@ -91,7 +91,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const
 		TQString grad = m_gradient.saveOasis( mainStyles );
 		style.addProperty( "draw:fill-gradient-name", grad );
 		if( m_color.opacity() < 1 )
-			style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) );
+			style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) );
 	}
 	else if( m_type == patt )
 		style.addProperty( "draw:fill", "hatch" );
diff --git a/karbon/core/vfill.h b/karbon/core/vfill.h
index 0e562949..89662198 100644
--- a/karbon/core/vfill.h
+++ b/karbon/core/vfill.h
@@ -33,10 +33,10 @@ class KoOasisLoadingContext;
 
 
 /**
- * Manages the fill of tqshapes.
+ * Manages the fill of shapes.
  *
  * The fill can be solid or gradient.
- * Also two fill rules are supported that effect how the tqshape is
+ * Also two fill rules are supported that effect how the shape is
  * filled. For explanation see the TQPainter documentation.
  *
  * Default is no fill and even-odd filling rule.
diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cc
index 60d89241..577d1373 100644
--- a/karbon/core/vgradient.cc
+++ b/karbon/core/vgradient.cc
@@ -208,10 +208,10 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const
 	for( colorstop = colorStops.first(); colorstop; colorstop = colorStops.next() )
 	{
 		elementWriter.startElement( "svg:stop" );
-		elementWriter.addAttribute( "svg:offset", TQString( "%1" ).tqarg( colorstop->rampPoint ) );
+		elementWriter.addAttribute( "svg:offset", TQString( "%1" ).arg( colorstop->rampPoint ) );
 		elementWriter.addAttribute( "svg:color", TQColor( colorstop->color ).name() );
 		if( colorstop->color.opacity() < 1 )
-			elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).tqarg( colorstop->color.opacity() ) );
+			elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).arg( colorstop->color.opacity() ) );
 		elementWriter.endElement();
 	}
 
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 51d991e1..1d18f54f 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -215,7 +215,7 @@ VGroup::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context )
 
 			context.styleStack().save();
 
-			if( e.localName() == "path" || e.localName() == "custom-tqshape" )
+			if( e.localName() == "path" || e.localName() == "custom-shape" )
 			{
 				VPath* composite = new VPath( this );
 				composite->loadOasis( e, context );
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index 899422ee..eccc6180 100644
--- a/karbon/core/vobject.h
+++ b/karbon/core/vobject.h
@@ -57,7 +57,7 @@ public:
 		hidden_locked = 3,	/**< hidden and locked (r/o) */
 		deleted       = 4,	/**< deleted, nearly dead */
 
-		// tqshape specific states:
+		// shape specific states:
 		selected      = 5,	/**< visible, active and can be manipulated by tools */
 		edit          = 6	/**< visible, active and is currently manipulated by a tool */
 	};
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index e5366966..ea05fc76 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -716,13 +716,13 @@ VSubpath::saveSvgPath( TQString &d ) const
 				if( segment->prev() )
 				{
 					d += TQString( "L%1 %2" ).
-							tqarg( segment->knot().x() ).tqarg( segment->knot().y() );
+							arg( segment->knot().x() ).arg( segment->knot().y() );
 				}
 				// Moveto.
 				else
 				{
 					d += TQString( "M%1 %2" ).
-							tqarg( segment->knot().x() ).tqarg( segment->knot().y() );
+							arg( segment->knot().x() ).arg( segment->knot().y() );
 				}
 			}
 			// Bezier ( degree >= 3 ).
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index 0ec27fb2..d0cea9c7 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cc
@@ -117,7 +117,7 @@ VStroke::saveOasis( KoGenStyle &style ) const
 		style.addProperty( "svg:stroke-color", TQColor( m_color ).name() );
 		style.addPropertyPt( "svg:stroke-width", m_lineWidth );
 		if( m_color.opacity() < 1 )
-			style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) );
+			style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) );
 	}
 	else if( m_type == none )
 		style.addProperty( "draw:stroke", "none" );
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index c45d91cb..e9888355 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -128,7 +128,7 @@ VText::VText( VObject* parent, VState state )
 	m_stroke = new VStroke( this );
 	m_fill = new VFill();
 	m_position			= (VText::Position)0;
-	m_tqalignment			= (VText::Alignment)0;
+	m_alignment			= (VText::Alignment)0;
 	m_shadow			= false;
 	m_translucentShadow	= false;
 	m_shadowAngle		= 0;
@@ -137,8 +137,8 @@ VText::VText( VObject* parent, VState state )
 }
 
 
-VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text )
-	: VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_tqalignment( tqalignment ), m_text( text )
+VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text )
+	: VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_alignment( alignment ), m_text( text )
 {
 	m_glyphs.setAutoDelete( true );
 	m_boundingBoxIsInvalid = true;
@@ -148,7 +148,7 @@ VText::VText( const TQFont &font, const VSubpath& basePath, Position position, A
 }
 
 VText::VText( const VText& text )
-	: VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_tqalignment( text.m_tqalignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset )
+	: VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_alignment( text.m_alignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset )
 {
 	m_stroke = new VStroke( *text.m_stroke );
 	m_stroke->setParent( this );
@@ -323,7 +323,7 @@ VText::save( TQDomElement& element ) const
 		me.setAttribute( "italic",				m_font.italic() );
 		me.setAttribute( "bold",				m_font.bold() );
 		me.setAttribute( "position",			m_position );
-		me.setAttribute( "tqalignment",			m_tqalignment );
+		me.setAttribute( "alignment",			m_alignment );
 		me.setAttribute( "shadow",				m_shadow );
 		me.setAttribute( "translucentshadow",	m_translucentShadow );
 		me.setAttribute( "shadowangle",			m_shadowAngle );
@@ -349,7 +349,7 @@ VText::load( const TQDomElement& element )
 	m_font.setWeight( TQFont::Normal );
 	m_font.setBold( element.attribute( "bold" ).toInt() == 1 );
 	m_position			= (Position)element.attribute( "position", "0" ).toInt();
-	m_tqalignment			= (Alignment)element.attribute( "tqalignment", "0" ).toInt();
+	m_alignment			= (Alignment)element.attribute( "alignment", "0" ).toInt();
 	m_shadow			= ( element.attribute( "shadow" ).toInt() == 1 );
 	m_translucentShadow	= ( element.attribute( "translucentshadow" ).toInt() == 1 );
 	m_shadowAngle		= element.attribute( "shadowangle" ).toInt();
@@ -575,7 +575,7 @@ VText::traceText()
 	kdDebug(38000) << "traceText(), using offset : " << m_offset << endl;
 	float x = m_offset * pathLength;
 	
-	switch( m_tqalignment )
+	switch( m_alignment )
 	{
 		case Left: x += 0; break;
 		case Center: x -=  0.5 * l; break;
diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h
index 4f47f527..234332df 100644
--- a/karbon/core/vtext.h
+++ b/karbon/core/vtext.h
@@ -57,7 +57,7 @@ public:
 	};
 
 	VText( VObject* parent, VState state = normal );
-	VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text );
+	VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text );
 	VText( const VText& text );
 	virtual ~VText();
 	virtual DCOPObject* dcopObject();
@@ -70,8 +70,8 @@ public:
 	virtual VSubpath& basePath() { return m_basePath; }
 	virtual void setPosition( Position position ) { m_position = position; }
 	virtual Position position() { return m_position; }
-	virtual void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
-	virtual Alignment tqalignment() { return m_tqalignment; }
+	virtual void setAlignment( Alignment alignment ) { m_alignment = alignment; }
+	virtual Alignment alignment() { return m_alignment; }
 	virtual void setUseShadow( bool state ) { m_shadow = state; }
 	virtual bool useShadow() { return m_shadow; }
 	virtual void setShadow( int angle, int distance, bool translucent ) 
@@ -118,8 +118,8 @@ private:
 	VSubpath       m_basePath;
 		// The text position 
 	Position    m_position;
-		// The text tqalignment
-	Alignment   m_tqalignment;
+		// The text alignment
+	Alignment   m_alignment;
 		// The text to draw
 	TQString     m_text;
 		// Shadow parameters
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index a029d242..3812c790 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -320,7 +320,7 @@ VObjectListViewItem::~VObjectListViewItem()
 TQString
 VObjectListViewItem::key( int, bool ) const
 {
-	return TQString( "%1" ).tqarg( m_key );
+	return TQString( "%1" ).arg( m_key );
 }
 
 void
@@ -329,7 +329,7 @@ VObjectListViewItem::update()
 	// text description
 	VSelectionDescription selectionDesc;
 	selectionDesc.visit( *m_object );
-	setText( 0, TQString( "%1" ).tqarg( selectionDesc.shortDescription() ) );
+	setText( 0, TQString( "%1" ).arg( selectionDesc.shortDescription() ) );
 
 	// draw thumb preview (16x16)
 	TQPixmap preview;
@@ -438,7 +438,7 @@ VLayerListViewItem::pos()
 TQString
 VLayerListViewItem::key( int, bool ) const
 {
-	return TQString( "%1" ).tqarg( m_key );
+	return TQString( "%1" ).arg( m_key );
 }
 
 int 
@@ -531,7 +531,7 @@ VLayersTab::resetSelection()
 	for(; it.current(); ++it )
 	{
 		it.current()->setSelected( false );
-		it.current()->tqrepaint();
+		it.current()->repaint();
 	}
 }
 
@@ -556,14 +556,14 @@ VLayersTab::selectActiveLayer()
 	for(; it.current(); ++it )
 	{
 		it.current()->setSelected( false );
-		it.current()->tqrepaint();
+		it.current()->repaint();
 	}
 
 	VLayerListViewItem *layerItem = m_layers[ m_document->activeLayer() ];
 	if( layerItem )
 	{
 		layerItem->setSelected( true );
-		layerItem->tqrepaint();
+		layerItem->repaint();
 		kdDebug(38000) << "selecting active layer: " << layerItem->text() << endl;
 	}
 }
@@ -620,7 +620,7 @@ VLayersTab::updateChildItems( TQListViewItem *item )
 			updateChildItems( objectItem );
 
 		objectItem->update();
-		objectItem->tqrepaint();
+		objectItem->repaint();
 	}
 }
 
@@ -676,7 +676,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 				toggleState( layerItem->layer(), col );
 
 				layerItem->update();
-				layerItem->tqrepaint();
+				layerItem->repaint();
 
 				updateChildItems( layerItem );
 
@@ -703,7 +703,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 					objectItem->setSelected( false );
 
 				objectItem->update();
-				objectItem->tqrepaint();
+				objectItem->repaint();
 
 				if( dynamic_cast<VGroup*>( objectItem->object() ) )
 					updateChildItems( objectItem );
@@ -740,7 +740,7 @@ VLayersTab::selectionChangedFromList()
 		&& (state != VObject::hidden_locked) )
 		{
 			m_document->selection()->append( objectItem->object() );
-			objectItem->tqrepaint();
+			objectItem->repaint();
 		}
 	}
 	
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 5e7ecb8b..9355c961 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -495,19 +495,19 @@ KarbonPart::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ )
 void
 KarbonPart::insertObject( VObject* object )
 {
-	// don't tqrepaint here explicitly. some commands might want to insert many
+	// don't repaint here explicitly. some commands might want to insert many
 	// objects.
 	m_doc.append( object );
 	setModified( true );
 }
 
 void
-KarbonPart::addCommand( VCommand* cmd, bool tqrepaint )
+KarbonPart::addCommand( VCommand* cmd, bool repaint )
 {
 	m_commandHistory->addCommand( cmd );
 	setModified( true );
 
-	if( tqrepaint )
+	if( repaint )
 		repaintAllViews();
 }
 
@@ -530,12 +530,12 @@ KarbonPart::clearHistory()
 }
 
 void
-KarbonPart::repaintAllViews( bool tqrepaint )
+KarbonPart::repaintAllViews( bool repaint )
 {
 	TQPtrListIterator<KoView> itr( views() );
 
 	for( ; itr.current() ; ++itr )
-		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint );
+		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( repaint );
 }
 
 void
@@ -561,7 +561,7 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect,
 	painter.eraseRect( rect );
 	VPainterFactory *painterFactory = new VPainterFactory;
 	//TQPaintDeviceMetrics metrics( painter.device() );
-	painterFactory->setPainter( painter.tqdevice(), rect.width(), rect.height() );
+	painterFactory->setPainter( painter.device(), rect.width(), rect.height() );
 	VPainter *p = painterFactory->painter();
 	//VPainter *p = new VKoPainter( painter.device() );
 	p->begin();
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 34e0e04b..328eab89 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -73,7 +73,7 @@ public:
 	void insertObject( VObject* object );
 
 	/// insert a command into the undo/redo-history:
-	void addCommand( VCommand* cmd, bool tqrepaint = false );
+	void addCommand( VCommand* cmd, bool repaint = false );
 
 	// access static document:
 	VDocument& document() { return m_doc; }
@@ -107,8 +107,8 @@ public:
 	bool mergeNativeFormat( const TQString & file );
 
 public slots:
-	/// tqrepaint all views attached to this koDocument
-	void repaintAllViews( bool tqrepaint = true );
+	/// repaint all views attached to this koDocument
+	void repaintAllViews( bool repaint = true );
 	void repaintAllViews( const KoRect& );
 	void slotDocumentRestored();
 	void slotCommandExecuted( VCommand * );
diff --git a/karbon/karbon_part_iface.cc b/karbon/karbon_part_iface.cc
index d90c506e..3c7f30ac 100644
--- a/karbon/karbon_part_iface.cc
+++ b/karbon/karbon_part_iface.cc
@@ -81,14 +81,14 @@ TQString
 KarbonPartIface::widthInUnits()
 {
 	TQString val = KoUnit::toUserStringValue( m_part->document().width(), m_part->unit() );
-	return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() );
+	return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() );
 }
 
 TQString
 KarbonPartIface::heightInUnits()
 {
 	TQString val = KoUnit::toUserStringValue( m_part->document().height(), m_part->unit() );
-	return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() );
+	return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() );
 }
 
 double
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 79192129..10df9e02 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -769,7 +769,7 @@ KarbonView::viewModeChanged()
 void
 KarbonView::setZoomAt( double zoom, const KoPoint &p )
 {
-	TQString zoomText = TQString( "%1%" ).tqarg( zoom * 100.0, 0, 'f', 2 );
+	TQString zoomText = TQString( "%1%" ).arg( zoom * 100.0, 0, 'f', 2 );
 	TQStringList stl = m_zoomAction->items();
 	if( stl.first() == "25%" )
 	{
@@ -1171,7 +1171,7 @@ KarbonView::mouseEvent( TQMouseEvent* event, const KoPoint &p )
 	xy.setX(KoUnit::toUserValue(xy.x(), part()->unit()));
 	xy.setY(KoUnit::toUserValue(xy.y(), part()->unit()));
 
-	m_cursorCoords->setText( TQString( "%1, %2" ).tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)).tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)) );
+	m_cursorCoords->setText( TQString( "%1, %2" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) );
 
 	if( toolController() )
 		return toolController()->mouseEvent( event, p );
@@ -1444,9 +1444,9 @@ KarbonView::repaintAll( const KoRect &r )
 }
 
 void
-KarbonView::repaintAll( bool tqrepaint )
+KarbonView::repaintAll( bool repaint )
 {
-	m_canvas->repaintAll( tqrepaint );
+	m_canvas->repaintAll( repaint );
 }
 void
 KarbonView::setPos( const KoPoint& p )
diff --git a/karbon/karbon_view_iface.cc b/karbon/karbon_view_iface.cc
index 5d919f8f..3fdf1778 100644
--- a/karbon/karbon_view_iface.cc
+++ b/karbon/karbon_view_iface.cc
@@ -143,7 +143,7 @@ void KarbonViewIface::pathWhirlPinch()
 	//m_view->pathWhirlPinch();
 }
 
-void KarbonViewIface::tqrepaint()
+void KarbonViewIface::repaint()
 {
 	m_view->canvasWidget()->repaintAll();
 }
diff --git a/karbon/karbon_view_iface.h b/karbon/karbon_view_iface.h
index fcd4cf55..59756746 100644
--- a/karbon/karbon_view_iface.h
+++ b/karbon/karbon_view_iface.h
@@ -61,7 +61,7 @@ k_dcop:
 	void pathRoundCorners();
 	void pathWhirlPinch();
 
-	void tqrepaint();
+	void repaint();
 
 private:
 	KarbonView* m_view;
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index dea09571..fc6da1da 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -142,7 +142,7 @@ VCreateShadowCmd::execute()
 	bool successful = false;
 
 
-	// Create new tqshapes if they don't exist yet.
+	// Create new shapes if they don't exist yet.
 	if( !m_newObjects )
 	{
 		m_newObjects = new VSelection();
@@ -169,11 +169,11 @@ VCreateShadowCmd::execute()
 
 			if(newObject)
 			{
-				// Insert new tqshape right before old tqshape.
+				// Insert new shape right before old shape.
 				itr.current()->parent()->insertInfrontOf( 
 					newObject, itr.current() );
 
-				// Add new tqshape to list of new objects.
+				// Add new shape to list of new objects.
 				m_newObjects->append( newObject );
 			}
 		}
diff --git a/karbon/render/art_rgb.c b/karbon/render/art_rgb.c
index 6dd84bde..4d30fad4 100644
--- a/karbon/render/art_rgb.c
+++ b/karbon/render/art_rgb.c
@@ -30,10 +30,10 @@
 /* This is really slow. Is there any way we might speed it up?
    Two ideas:
 
-   First, maybe we should be working at 32-bit tqalignment. Then,
+   First, maybe we should be working at 32-bit alignment. Then,
    this can be a simple loop over word stores.
 
-   Second, we can keep working at 24-bit tqalignment, but have some
+   Second, we can keep working at 24-bit alignment, but have some
    intelligence about storing. For example, we can iterate over
    4-pixel chunks (aligned at 4 pixels), with an inner loop
    something like:
@@ -100,7 +100,7 @@ art_rgb_fill_run_ (art_u8 *buf, art_u32 rgb, int n)
 	      *buf++ = b;
 	    }
 	} else {
-	  /* handle prefix up to byte tqalignment */
+	  /* handle prefix up to byte alignment */
 	  /* I'm worried about this cast on sizeof(long) != sizeof(uchar *)
 	     architectures, but it _should_ work. */
 	  for (i = 0; ((unsigned long)buf) & 3; i++)
diff --git a/karbon/render/art_rgb_svp.c b/karbon/render/art_rgb_svp.c
index 2052d2ff..617f1abe 100644
--- a/karbon/render/art_rgb_svp.c
+++ b/karbon/render/art_rgb_svp.c
@@ -120,7 +120,7 @@ art_rgb_svp_callback_ (void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the rendering.
  *
- * Renders the tqshape specified with @svp into the @buf RGB buffer.
+ * Renders the shape specified with @svp into the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
@@ -400,7 +400,7 @@ art_rgb_svp_alpha_opaque_callback_ (void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
  *
- * Renders the tqshape specified with @svp over the @buf RGB buffer.
+ * Renders the shape specified with @svp over the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
index b9cf9376..7e955610 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window parent, root, *tqchildren;
-		int ntqchildren;
+		Window parent, root, *children;
+		int nchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &parent, &tqchildren, &ntqchildren))
+				 &parent, &children, &nchildren))
 			return 0;
 
-		if (ntqchildren > 0)
-			XFree (tqchildren);
+		if (nchildren > 0)
+			XFree (children);
 
 		if (parent == root)
 			return 1;
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index 0b5fd80c..ef5bb070 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cc
@@ -254,7 +254,7 @@ VEllipse::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context
 	double startAngle = element.attributeNS( KoXmlNS::draw, "start-angle", TQString() ).toDouble();
 	double endAngle = element.attributeNS( KoXmlNS::draw, "end-angle", TQString() ).toDouble();
 	
-	// the tqshape gets mirrored in y-direction, so make the angles temporary clockwise 
+	// the shape gets mirrored in y-direction, so make the angles temporary clockwise 
 	// just for creating the path
 	m_startAngle = 360.0 - endAngle;
 	m_endAngle = 360.0 - startAngle;
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 650b4698..1735471f 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -108,8 +108,8 @@ VPolygon::save( TQDomElement& element ) const
 		me.setAttribute( "x", m_topLeft.x() );
 		me.setAttribute( "y", m_topLeft.y() );
 
-		me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) );
-		me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) );
+		me.setAttribute( "width", TQString("%1pt").arg( m_width ) );
+		me.setAttribute( "height", TQString("%1pt").arg( m_height ) );
 
 		me.setAttribute( "points", m_points );
 
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index d716c325..cef5bda2 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -157,7 +157,7 @@ VPolyline::loadOasis( const TQDomElement &element, KoOasisLoadingContext &contex
 		p2.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x2", TQString() ) ) );
 		p2.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y2", TQString() ) ) );
 		
-		m_points = TQString( "%1,%2 %3,%4" ).tqarg( p1.x() ).tqarg( p1.y() ).tqarg( p2.x() ).tqarg( p2.y() );
+		m_points = TQString( "%1,%2 %3,%4" ).arg( p1.x() ).arg( p1.y() ).arg( p2.x() ).arg( p2.y() );
 
 		moveTo( p1 );
 		lineTo( p2 );
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index bb3512fd..bbeef50f 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cc
@@ -125,8 +125,8 @@ VRectangle::save( TQDomElement& element ) const
 		me.setAttribute( "x", m_topLeft.x() );
 		me.setAttribute( "y", m_topLeft.y() );
 
-		me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) );
-		me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) );
+		me.setAttribute( "width", TQString("%1pt").arg( m_width ) );
+		me.setAttribute( "height", TQString("%1pt").arg( m_height ) );
 
 		me.setAttribute( "rx", m_rx );
 		me.setAttribute( "ry", m_ry );
diff --git a/karbon/shapes/vstar.h b/karbon/shapes/vstar.h
index d82cdf9e..e6134662 100644
--- a/karbon/shapes/vstar.h
+++ b/karbon/shapes/vstar.h
@@ -23,11 +23,11 @@
 #include "vcomposite.h"
 #include <koffice_export.h>
 /**
- * This tqshape offers star-like tqshapes with a lot of parameters :
+ * This shape offers star-like shapes with a lot of parameters :
  *
  * Types :
  *
- * Star           - fully connected star tqshape.
+ * Star           - fully connected star shape.
  * Star outline   - like star but without the cross connections.
  * Framed star    - like star outline but with an enclosing path.
  * Spoke          - basically a star outline with inner radius of zero.
@@ -42,7 +42,7 @@
  * Inner radius   - inner radius where star has to connect to. This value
  *                  doesn't apply to polygon, spoke and wheel.
  * Inner angle    - extra radius amount for inner radius.
- * Roundness      - uses curves instead of lines for the star tqshape.
+ * Roundness      - uses curves instead of lines for the star shape.
  */
 class KARBONBASE_EXPORT VStar : public VPath
 {
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index 41936226..b0f981af 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -152,7 +152,7 @@ VEllipseTool::refreshUnit()
 }
 
 VPath*
-VEllipseTool::tqshape( bool interactive ) const
+VEllipseTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -270,7 +270,7 @@ VEllipseTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Ellipse" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h
index 859cac96..5a605c53 100644
--- a/karbon/tools/vellipsetool.h
+++ b/karbon/tools/vellipsetool.h
@@ -70,7 +70,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Ellipse Tool" ); }
-	virtual VPath *tqshape( bool interactive = false ) const;
+	virtual VPath *shape( bool interactive = false ) const;
 	void refreshUnit();
 
 protected:
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index db1ffb88..fdd02299 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -119,7 +119,7 @@ VPolygonTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VPolygonTool::tqshape( bool interactive ) const
+VPolygonTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -158,7 +158,7 @@ VPolygonTool::setup( KActionCollection *collection )
 		shortcut.append(KShortcut( TQt::Key_F9 ) );
 		m_action = new KRadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Polygon" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h
index 052d7e50..cb1dabab 100644
--- a/karbon/tools/vpolygontool.h
+++ b/karbon/tools/vpolygontool.h
@@ -38,7 +38,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Polygon Tool" ); }
 
-	virtual VPath *tqshape( bool interactive = false ) const;
+	virtual VPath *shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 7d949ac7..1b9d9c0f 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -101,7 +101,7 @@ VRectangleTool::refreshUnit()
 }
 
 VPath *
-VRectangleTool::tqshape( bool interactive ) const
+VRectangleTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -136,7 +136,7 @@ VRectangleTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Rectangle" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index b902b1ab..ce39a119 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -39,7 +39,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Rectangle Tool" ); }
-	virtual VPath* tqshape( bool interactive = false ) const;
+	virtual VPath* shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc
index b7f354cf..c88bacd8 100644
--- a/karbon/tools/vroundrecttool.cc
+++ b/karbon/tools/vroundrecttool.cc
@@ -40,7 +40,7 @@ VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *pa
 	KoUnit::Unit unit = KoUnit::U_CM;
 	m_width = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit );
 
-	new TQLabel( i18n( "Height (%1):" ).tqarg(KoUnit::unitName( m_part->unit() )), group );
+	new TQLabel( i18n( "Height (%1):" ).arg(KoUnit::unitName( m_part->unit() )), group );
 	m_height = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit );
 
 	new TQLabel( i18n( "Edge radius X:" ), group );
@@ -132,7 +132,7 @@ void VRoundRectTool::refreshUnit()
 }
 
 VPath*
-VRoundRectTool::tqshape( bool interactive ) const
+VRoundRectTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -172,7 +172,7 @@ VRoundRectTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Round Rectangle" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 59a2fab0..5149ff2f 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -43,7 +43,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual TQString uiname() { return i18n( "Round Rectangle Tool" ); }
 
-	virtual VPath* tqshape( bool interactive = false ) const;
+	virtual VPath* shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc
index e29e1afb..e6b87f62 100644
--- a/karbon/tools/vselecttool.cc
+++ b/karbon/tools/vselecttool.cc
@@ -424,11 +424,11 @@ VSelectTool::updateStatusBar() const
 		double b = KoUnit::toUserValue( rect.bottom(), view()->part()->unit() );
 
 		// print bottom-left (%1,%2), top-right (%3,%4) corner of selection bounding box and document unit (%5)
-		TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").tqarg( x, 0, 'f', 1 ).tqarg( y, 0, 'f', 1 ).tqarg( r, 0, 'f', 1 ).tqarg( b, 0, 'f', 1 ).tqarg( view()->part()->unitName() );
+		TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").arg( x, 0, 'f', 1 ).arg( y, 0, 'f', 1 ).arg( r, 0, 'f', 1 ).arg( b, 0, 'f', 1 ).arg( view()->part()->unitName() );
 
 		VSelectionDescription selectionDesc;
 		selectionDesc.visit( *view()->part()->document().selection() );
-		selectMessage += TQString( "(%1)" ).tqarg( selectionDesc.description() );
+		selectMessage += TQString( "(%1)" ).arg( selectionDesc.description() );
 
 		view()->statusMessage()->setText( selectMessage );
 	}
diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc
index 49197773..9b59104d 100644
--- a/karbon/tools/vshapetool.cc
+++ b/karbon/tools/vshapetool.cc
@@ -52,8 +52,8 @@ TQString
 VShapeTool::contextHelp()
 {
 	TQString s = i18n( "<qt><b>Shape tool</b><br>" );
-	s += i18n( "<i>Click and drag</i> to place your own tqshape.<br>" );
-	s += i18n( "<i>Click</i> to place a tqshape using the tool properties values.</qt>" );
+	s += i18n( "<i>Click and drag</i> to place your own shape.<br>" );
+	s += i18n( "<i>Click</i> to place a shape using the tool properties values.</qt>" );
 	return s;
 } 
 
@@ -77,7 +77,7 @@ VShapeTool::draw()
 	VPainter* painter = view()->painterFactory()->editpainter();
 	painter->setRasterOp( TQt::NotROP );
 
-	VPath* composite = tqshape();
+	VPath* composite = shape();
 	composite->setState( VPath::edit );
 	composite->draw( painter, &composite->boundingBox() );
 	delete( composite );
@@ -101,7 +101,7 @@ VShapeTool::mouseButtonRelease()
 
 	if( showDialog() )
 	{
-		VPath* composite = tqshape( true );
+		VPath* composite = shape( true );
 
 		if( composite )
 		{
@@ -136,7 +136,7 @@ VShapeTool::mouseDragRelease()
 
 	VShapeCmd* cmd = new VShapeCmd(
 		&view()->part()->document(),
-		uiname(), tqshape(), icon() );
+		uiname(), shape(), icon() );
 
 	view()->part()->addCommand( cmd, true );
 
diff --git a/karbon/tools/vshapetool.h b/karbon/tools/vshapetool.h
index 2a774e94..f66b5719 100644
--- a/karbon/tools/vshapetool.h
+++ b/karbon/tools/vshapetool.h
@@ -58,7 +58,7 @@ protected:
 	// Make it "abstract":
 	virtual ~VShapeTool();
 
-	virtual VPath* tqshape( bool interactive = false ) const = 0;
+	virtual VPath* shape( bool interactive = false ) const = 0;
 
 	/**
 	 * Output coordinates.
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index f95bc2c5..d38ca972 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -120,7 +120,7 @@ VSinusTool::refreshUnit()
 }
 
 VPath*
-VSinusTool::tqshape( bool interactive ) const
+VSinusTool::shape( bool interactive ) const
 {
 	if( interactive )
 		return
@@ -155,7 +155,7 @@ VSinusTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Sinus" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h
index 71669ebd..4aa1c464 100644
--- a/karbon/tools/vsinustool.h
+++ b/karbon/tools/vsinustool.h
@@ -38,7 +38,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Sinus Tool" ); }
 
-	virtual VPath *tqshape( bool interactive = false ) const;
+	virtual VPath *shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index 304c8637..e0c78e1d 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -165,7 +165,7 @@ VSpiralTool::refreshUnit()
 }
 
 VPath*
-VSpiralTool::tqshape( bool interactive ) const
+VSpiralTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -206,7 +206,7 @@ VSpiralTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Spiral" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 5787063d..072e3bea 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -41,7 +41,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Spiral Tool" ); }
 
-	virtual VPath* tqshape( bool interactive = false ) const;
+	virtual VPath* shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index 42c74f4e..114bab75 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -198,7 +198,7 @@ VStarTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VStarTool::tqshape( bool interactive ) const
+VStarTool::shape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -241,7 +241,7 @@ VStarTool::setup( KActionCollection *collection )
 		shortcut.append(KShortcut( TQt::Key_F9 ) );
 		m_action = new KRadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Draw a star" ) );
-		m_action->setExclusiveGroup( "tqshapes" );
+		m_action->setExclusiveGroup( "shapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 07d744c0..ce073d0c 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -74,7 +74,7 @@ public:
 	virtual bool showDialog() const;
 	virtual void setup(KActionCollection *collection);
 	virtual TQString uiname() { return i18n( "Star Tool" ); }
-	virtual VPath* tqshape( bool interactive = false ) const;
+	virtual VPath* shape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 9a7790ba..ad74048f 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -255,7 +255,7 @@ void
 ShadowWidget::setShadowAngle( int angle )
 {
 	m_angle->setValue( angle );
-	m_preview->tqrepaint();
+	m_preview->repaint();
 }
 
 int
@@ -268,7 +268,7 @@ void
 ShadowWidget::setShadowDistance( int distance )
 {
 	m_distance->setValue( distance );
-	m_preview->tqrepaint();
+	m_preview->repaint();
 }
 
 int
@@ -281,7 +281,7 @@ void
 ShadowWidget::setTranslucent( bool translucent )
 {
 	m_translucent->setChecked( translucent );
-	m_preview->tqrepaint();
+	m_preview->repaint();
 }
 
 bool ShadowWidget::isTranslucent()
@@ -301,13 +301,13 @@ ShadowWidget::setShadowValues( int angle, int distance, bool translucent )
 void
 ShadowWidget::updatePreview( int )
 {
-	m_preview->tqrepaint();
+	m_preview->repaint();
 }
 
 void
 ShadowWidget::updatePreview()
 {
-	m_preview->tqrepaint();
+	m_preview->repaint();
 	bool ok = m_useShadow->isChecked();
 	m_angle->setEnabled( ok );
 	m_distance->setEnabled( ok );
@@ -387,13 +387,13 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 
 	m_convertToShapes->setEnabled( true );
 
-	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Left") );
-	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Center") );
-	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Right") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") );
 
-	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Above") );
-	m_textPosition->insertItem( i18n( "Vertical tqalignment", "On") );
-	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Under") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "Above") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "On") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "Under") );
 
 	m_textOffset->setRange( 0.0, 100.0, 1.0, true );
 
@@ -518,12 +518,12 @@ VText::Position VTextOptionsWidget::position()
 }
 
 void
-VTextOptionsWidget::setAlignment( VText::Alignment tqalignment )
+VTextOptionsWidget::setAlignment( VText::Alignment alignment )
 {
-	m_textAlignment->setCurrentItem( tqalignment );
+	m_textAlignment->setCurrentItem( alignment );
 }
 
-VText::Alignment VTextOptionsWidget::tqalignment()
+VText::Alignment VTextOptionsWidget::alignment()
 {
 	return ( VText::Alignment ) m_textAlignment->currentItem();
 }
@@ -768,7 +768,7 @@ VTextTool::createText( VSubpath &path )
 	m_text = 0L;
 	delete m_editedText;
 
-	m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->tqalignment(), m_optionsWidget->text() );
+	m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->alignment(), m_optionsWidget->text() );
 	
 	if( ! m_editedText ) 
 		return false;
@@ -803,7 +803,7 @@ VTextTool::textChanged()
 	m_editedText->setText( m_optionsWidget->text() );
 	m_editedText->setFont( m_optionsWidget->font() );
 	m_editedText->setPosition( m_optionsWidget->position() );
-	m_editedText->setAlignment( m_optionsWidget->tqalignment() );
+	m_editedText->setAlignment( m_optionsWidget->alignment() );
 	m_editedText->setOffset( 0.01 * m_optionsWidget->offset()  );
 #ifdef HAVE_KARBONTEXT
 	m_editedText->traceText();
@@ -829,7 +829,7 @@ VTextTool::accept()
 				  m_editedText->font(),
 				  m_editedText->basePath(),
 				  m_editedText->position(),
-				  m_editedText->tqalignment(),
+				  m_editedText->alignment(),
 				  m_editedText->offset(),
 				  m_editedText->text(),
 				  m_optionsWidget->useShadow(),
@@ -932,7 +932,7 @@ VTextTool::visitVText( VText& text )
 	m_optionsWidget->setFont( text.font() );
 	m_optionsWidget->setText( text.text() );
 	m_optionsWidget->setPosition( text.position() );
-	m_optionsWidget->setAlignment( text.tqalignment() );
+	m_optionsWidget->setAlignment( text.alignment() );
 	m_optionsWidget->setOffset( text.offset() * 100.0 );
 	m_optionsWidget->setUseShadow( text.useShadow() );
 	m_optionsWidget->setShadow( text.shadowAngle(), text.shadowDistance(), text.translucentShadow() );
@@ -962,7 +962,7 @@ VTextTool::VTextCmd::VTextCmd( VDocument* doc, const TQString& name, VText* text
 	m_textModifications->newPosition = newPosition;
 	m_textModifications->oldPosition = text->position();
 	m_textModifications->newAlignment = newAlignment;
-	m_textModifications->oldAlignment = text->tqalignment();
+	m_textModifications->oldAlignment = text->alignment();
 	m_textModifications->newOffset = newOffset;
 	m_textModifications->oldOffset = text->offset();
 	m_textModifications->newText = newText;
diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index 112894d6..48357dbf 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -113,8 +113,8 @@ public:
 	TQString text();
 	void setPosition( VText::Position position );
 	VText::Position position();
-	void setAlignment( VText::Alignment tqalignment );
-	VText::Alignment tqalignment();
+	void setAlignment( VText::Alignment alignment );
+	VText::Alignment alignment();
 	void setOffset( double offset );
 	double offset();
 	void setUseShadow( bool state );
diff --git a/karbon/usablity-review.txt b/karbon/usablity-review.txt
index 237dc828..5d2eb8b4 100644
--- a/karbon/usablity-review.txt
+++ b/karbon/usablity-review.txt
@@ -79,7 +79,7 @@ unselects is not one of the outside objects.
 It is impossible to select an object that is completely inside another.
 
 A perfect solution would:
-* make the 'hit area' based more on the outside of the tqshape.
+* make the 'hit area' based more on the outside of the shape.
 A line should not be selected when clicked more then pixels next to it.
 Text should be selected when clicked in the white area of a 'D'
 
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 877dc41b..2b8bc72e 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -37,7 +37,7 @@ enum enumToolType
 {
 	TOOL_SELECT = 0,       // 
 	TOOL_FREEHAND = 1,     //
-	TOOL_SHAPE = 2,        // Geometric tqshapes like ellipses and lines
+	TOOL_SHAPE = 2,        // Geometric shapes like ellipses and lines
 	TOOL_MANIPULATION = 3, //
 	TOOL_MISC = 4          //
 };
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index d0a1b6b7..9fa5dcd6 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -152,7 +152,7 @@ VCanvas::eventFilter( TQObject* object, TQEvent* event )
 }
 
 
-// This causes a tqrepaint normally, so just overwriting it omits the repainting
+// This causes a repaint normally, so just overwriting it omits the repainting
 void
 VCanvas::focusInEvent( TQFocusEvent * )
 {
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc
index 0fd21cc1..28b7db9f 100644
--- a/karbon/widgets/vruler.cc
+++ b/karbon/widgets/vruler.cc
@@ -114,7 +114,7 @@ void VRuler::setUnit(KoUnit::Unit u)
     m_unit = u;
     drawRuler();
     updatePointer(m_currentPosition, m_currentPosition);
-    tqrepaint();
+    repaint();
 }
 
 void VRuler::setZoom(double zoom)
@@ -123,7 +123,7 @@ void VRuler::setZoom(double zoom)
     recalculateSize();
     drawRuler();
     updatePointer(m_currentPosition, m_currentPosition);
-    tqrepaint();
+    repaint();
 }
 
 void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
@@ -131,7 +131,7 @@ void VRuler::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 VRuler::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);
@@ -158,7 +158,7 @@ void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos)
 
 	//kdDebug() << "--###-- VRuler::updateVisibleArea(" << xpos << ", " << ypos << ")" << endl;
     drawRuler();
-    tqrepaint();
+    repaint();
     updatePointer(m_currentPosition, m_currentPosition);
 	//kdDebug() << "--###-- VRuler::updatePointer(" << m_currentPosition << ", " << m_currentPosition << ")" << endl;
 }
diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc
index 473ce4db..f69d5d85 100644
--- a/karbon/widgets/vstrokefillpreview.cc
+++ b/karbon/widgets/vstrokefillpreview.cc
@@ -195,7 +195,7 @@ VStrokeFillPreview::update( const VStroke &s, const VFill &f )
 
 	m_painter->end();
 
-	tqrepaint();
+	repaint();
 }
 
 void
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 618f7b5a..2aa779ea 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -60,14 +60,14 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -611,7 +611,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index 3ba48c10..8938631e 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -430,7 +430,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -479,7 +479,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index cae1689b..a0db1ce7 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -191,7 +191,7 @@ void KChartColorConfigPage::initDataColorList()
         extColor.resize( m_params->maxDataColor() );
         if(i<m_params->maxDataColor())
         {
-            _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").tqarg(i+1) :m_params->legendText( i ) );
+            _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").arg(i+1) :m_params->legendText( i ) );
             extColor[i] =m_params->dataColor(i);
         }
     }
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index e264fbd0..d9ce6551 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -429,7 +429,7 @@ void kchartDataEditor::setData( KChartParams *params, KDChartTableData *dat )
             if (t.isValid()) {
                 if ( t.type() == TQVariant::Double ) {
 		    m_table->setText(row, col, 
-				     TQString("%1").tqarg(t.toDouble()));
+				     TQString("%1").arg(t.toDouble()));
 		}
                 else if ( t.type() == TQVariant::String )
                     kdDebug(35001) << "I cannot handle strings in the table yet"
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index 846774c1..c535c5ba 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -55,7 +55,7 @@ public:
 
     void setFont( const TQFont& font )  {
         _font = font;
-        listBox()->tqrepaint();
+        listBox()->repaint();
     }
     TQFont font() const {
         return _font;
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc
index ddf3d1b4..55a158d7 100644
--- a/kchart/kchart_params.cc
+++ b/kchart/kchart_params.cc
@@ -252,7 +252,7 @@ bool KChartParams::loadOasis( const TQDomElement     &chartElem,
 
     // If we can't find out what charttype it is, we might as well end here.
     if ( !knownType ) {
-        errorMessage = i18n( "Unknown chart type %1" ).tqarg( chartClass );
+        errorMessage = i18n( "Unknown chart type %1" ).arg( chartClass );
         kdDebug(35001) << errorMessage << endl;
         return false;
     }
@@ -701,7 +701,7 @@ bool KChartParams::loadOasisAxis( const TQDomElement      &axisElem,
 
     // chart:visible                - true if labels + ticks should be shown.
 
-    // tqchildren:
+    // children:
     // chart:
     // chart:
     // chart:
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index f0fda2f0..fa34dc20 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -225,12 +225,12 @@ void KChartPart::generateBarChartTemplate()
 
 		// Fill column label, but only on the first iteration.
 		if (row == 0) {
-		    m_colLabels << i18n("Column %1").tqarg(col + 1);
+		    m_colLabels << i18n("Column %1").arg(col + 1);
 		}
             }
 
 	    // Fill row label.
-	    m_rowLabels << i18n("Row %1").tqarg(row + 1);
+	    m_rowLabels << i18n("Row %1").arg(row + 1);
 	}
     }
 
@@ -994,7 +994,7 @@ bool KChartPart::loadOasis( const TQDomDocument& doc,
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
 
         return false;
     }
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 5b1cc6b2..b009e1ca 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -678,7 +678,7 @@ void KChartView::importData()
     TQFile  inFile(filename);
     if (!inFile.open(IO_ReadOnly)) {
 	KMessageBox::sorry( 0, i18n("The file %1 could not be read.")
-			    .tqarg(filename) );
+			    .arg(filename) );
 	inFile.close();
 	return;
     }
diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp
index 5d0c6bf2..4d8fd0c8 100644
--- a/kchart/kdchart/KDChart.cpp
+++ b/kchart/kdchart/KDChart.cpp
@@ -302,7 +302,7 @@ void KDChart::paint( TQPainter*              painter,
         }
         //qDebug("xxx" );
         if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){
-            qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry.");
+            qDebug("ERROR: KDChart::paint() could not calculate the chart geometry.");
             bOk = false;
         }
     }else{
@@ -439,12 +439,12 @@ TQString KDChart::globals()
     }
 
     globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
-               .tqarg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
+               .arg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
     globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
     globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
-               .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
+               .arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
     globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
-               .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
+               .arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
 
 
     TQMap<char*,TQColor> colorMap;
diff --git a/kchart/kdchart/KDChartAreaPainter.cpp b/kchart/kdchart/KDChartAreaPainter.cpp
index 6c47aeed..2fca8d62 100644
--- a/kchart/kdchart/KDChartAreaPainter.cpp
+++ b/kchart/kdchart/KDChartAreaPainter.cpp
@@ -43,7 +43,7 @@
 KDChartLinesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp
index 3f3b312a..ee9dc879 100644
--- a/kchart/kdchart/KDChartAxesPainter.cpp
+++ b/kchart/kdchart/KDChartAxesPainter.cpp
@@ -65,7 +65,7 @@ int secondsSinceUTCStart( const TQDateTime& dt )
 KDChartPainter( params )
 {
     // Intentionally left blank.
-    // We cannot setup the tqgeometry yet
+    // We cannot setup the geometry yet
     // since we do not know the size of the painter.
 }
 
@@ -2823,7 +2823,7 @@ void KDChartAxesPainter::calculateLabelTexts(
                     const double secHour  = 60.0 * secMin;
                     const double secDay   = 24.0 * secHour;
                     //
-                    // we temporarily disable week tqalignment until bug
+                    // we temporarily disable week alignment until bug
                     // is fixed (1st week of year must not start in the
                     // preceeding year but rather be shown incompletely)
                     //
@@ -3661,7 +3661,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
     sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision
                                            : TQMIN(behindComma, nTrustedPrecision) );
     //qDebug("nVal: %f    sVal: "+sVal, nVal );
-    //qDebug( TQString("                     %1").tqarg(sVal));
+    //qDebug( TQString("                     %1").arg(sVal));
     if ( bUseAutoDigits ) {
         int comma = sVal.find( '.' );
         if ( -1 < comma ) {
@@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
             }
         }
     }
-    //qDebug( TQString("                       -  %1").tqarg(trueBehindComma));
+    //qDebug( TQString("                       -  %1").arg(trueBehindComma));
     return sVal;
 }
 
diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp
index 9f6e5fb5..7fed7520 100644
--- a/kchart/kdchart/KDChartBWPainter.cpp
+++ b/kchart/kdchart/KDChartBWPainter.cpp
@@ -55,7 +55,7 @@
 KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -291,7 +291,7 @@ void KDChartBWPainter::specificPaintData( TQPainter* painter,
 
     const bool noBrush = TQt::NoBrush == params()->bWChartBrush().style();
 
-    // Loop over the datasets, draw one box and whisker tqshape for each series.
+    // Loop over the datasets, draw one box and whisker shape for each series.
     for ( uint dataset  = chartDatasetStart;
             dataset <= chartDatasetEnd;
             ++dataset ) {
diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp
index f8ae89d2..8bfe1a76 100644
--- a/kchart/kdchart/KDChartBarPainter.cpp
+++ b/kchart/kdchart/KDChartBarPainter.cpp
@@ -48,7 +48,7 @@ KDChartBarPainter::KDChartBarPainter( KDChartParams* params ) :
     KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -226,7 +226,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
                                      ? 0.0
                                      : static_cast<int>( valueBlockGap ) * numValues;
 
-    // Set some tqgeometry values that apply to bar charts only
+    // Set some geometry values that apply to bar charts only
     double totalNumberOfBars = 0.0;
     double spaceBetweenDatasets = 0.0;
     switch ( params()->barChartSubType() ) {
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index 223920e4..823dd2c3 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -181,7 +181,7 @@ public:
       \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
       Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. right means there will be a gap between the right side of
+      alignment settings: e.g. right means there will be a gap between the right side of
       the box and its anchor point - if the main \c align parameter is set to right too
       the anchor point will to be outside of the box / if \c align is set to left
       (but the \c deltaAlign to right) the anchor point will be inside the box.
@@ -192,7 +192,7 @@ public:
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \param deltaScaleGlobal If true the actual delta X and delta Y values will
       be calculated by \c deltaX and \c deltaY based upon the size of the
@@ -297,7 +297,7 @@ public:
       \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
       Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. TQt::AlignRight means the box will be moved to the left
+      alignment settings: e.g. TQt::AlignRight means the box will be moved to the left
       (by the amount calculated using the \c deltaX value), so there will be a gap
       between the right side of the box and its anchor point IF the main \c align flag
       is set to TQt::AlignRight too, so the anchor point will to be outside of the
@@ -310,7 +310,7 @@ public:
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \note Moving of the box due to \c deltaAlign settings is applied after
       the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop
@@ -643,7 +643,7 @@ public slots: // PENDING(blackie) merge slots sections.
 
       Set this to KDHART_KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. right means there will be a gap between the right side of
+      alignment settings: e.g. right means there will be a gap between the right side of
       the box and its anchor point - if the main \c align parameter is set to right too
       the anchor point will to be outside of the box / if \c align is set to left
       (but the \c deltaAlign to right) the anchor point will be inside the box.
@@ -654,7 +654,7 @@ public slots: // PENDING(blackie) merge slots sections.
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \note Moving of the box due to \c deltaAlign settings is applied after
       the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index 82956e8c..b3fe1632 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -240,7 +240,7 @@ public:
       \image html "../refman_images/positions.png"
       \image latex "../refman_images/positions.png" "the PositionFlag enum" width=4in
 
-      \note The position and tqalignment of content to be printed at (or
+      \note The position and alignment of content to be printed at (or
       inside of, resp.) an area or a point -- like for printing data value texts next
       to their graphical representations (which might be a bar, line, pie slice,...) --
       is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c TQt::AlignmentFlags.
@@ -249,10 +249,10 @@ public:
 
       The position of content and the way it is aligned to this
       position is shown in the following drawing, note that annotation #2 and annotation #3
-      share the same PositionFlag but have different tqalignment flags set:
+      share the same PositionFlag but have different alignment flags set:
 
-      \image html "../refman_images/tqalignment.png"
-      \image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in
+      \image html "../refman_images/alignment.png"
+      \image latex "../refman_images/alignment.png" "positioning and aligning" width=4in
 
       \sa KDChartParams::setPrintDataValues
     */
diff --git a/kchart/kdchart/KDChartHiLoPainter.cpp b/kchart/kdchart/KDChartHiLoPainter.cpp
index bb8b2e39..d8f766c2 100644
--- a/kchart/kdchart/KDChartHiLoPainter.cpp
+++ b/kchart/kdchart/KDChartHiLoPainter.cpp
@@ -49,7 +49,7 @@
 KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp
index a7e01092..9f0995e8 100644
--- a/kchart/kdchart/KDChartLinesPainter.cpp
+++ b/kchart/kdchart/KDChartLinesPainter.cpp
@@ -56,7 +56,7 @@ KDChartLinesPainter::KDChartLinesPainter( KDChartParams* params ) :
     KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp
index 6e2a1284..a53f84c0 100644
--- a/kchart/kdchart/KDChartObjectFactory.cpp
+++ b/kchart/kdchart/KDChartObjectFactory.cpp
@@ -438,11 +438,11 @@ bool KDChartObjectFactory::isNumber( const TQVariant& v )
 bool KDChartObjectFactory::checkArgCount( const TQString& className, int count, int min, int max )
 {
     if ( count < min ) {
-        throwError( TQObject::tr( "Too few arguments when creating %1 object." ).tqarg( className ) );
+        throwError( TQObject::tr( "Too few arguments when creating %1 object." ).arg( className ) );
         return false;
     }
     if ( count > max ) {
-        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).tqarg( className ) );
+        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).arg( className ) );
         return false;
     }
     return true;
@@ -453,7 +453,7 @@ bool KDChartObjectFactory::checkArgsIsTQtClass( const TQSArgumentList& args, int
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::TQObjectPtr || !arg.qobject()->inherits( expected ) ) {
-        throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).tqarg(index).tqarg(constructing).tqarg(expected) );
+        throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).arg(index).arg(constructing).arg(expected) );
         return false;
     }
     return true;
@@ -464,7 +464,7 @@ bool KDChartObjectFactory::getString( const TQSArgumentList& args, int index, TQ
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::String ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).tqarg(index).tqarg(constructing) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).arg(index).arg(constructing) );
         return false;
     }
     else {
@@ -477,7 +477,7 @@ bool KDChartObjectFactory::getNumber( const TQSArgumentList& args, int index, do
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || !isNumber(arg.variant()) ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).tqarg(index).tqarg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).arg(index).arg( constructing ) );
         return false;
     }
     else {
@@ -508,7 +508,7 @@ bool KDChartObjectFactory::getBool( const TQSArgumentList& args, int index, bool
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::Bool ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).tqarg(index).tqarg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).arg(index).arg( constructing ) );
         return false;
     }
     else {
@@ -521,7 +521,7 @@ bool KDChartObjectFactory::checkIsTQtVariant( const TQSArgumentList& args, int i
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != expected ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").tqarg(index).tqarg(constructing).tqarg(variantName) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").arg(index).arg(constructing).arg(variantName) );
         return false;
     }
     else
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index df608579..5ec61095 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -103,7 +103,7 @@ _legendTitleWidth( 0 ),
 _legendTitleMetricsHeight( 0 )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 /**
@@ -979,7 +979,7 @@ TQPoint KDChartPainter::calculateAnchor( const KDChartCustomBox & box,
     // Rule:
     //
     //    A box may be aligned to another box (and the 2nd box may again be
-    //    aligned to a 3rd box and so on) but NO CIRCULAR tqalignment is allowed.
+    //    aligned to a 3rd box and so on) but NO CIRCULAR alignment is allowed.
     //
     if( !box.anchorBeingCalculated() ) {
 
@@ -1650,7 +1650,7 @@ void KDChartPainter::paintHeaderFooter( TQPainter* painter,
                     params()->headerFooterFontRelSize( iHdFt ) * averageValueP1000 ) );
             painter->setPen( params()->headerFooterColor( iHdFt ) );
             painter->setFont( actFont );
-            // Note: The tqalignment flags used here match the rect calculation
+            // Note: The alignment flags used here match the rect calculation
             //       done in KDChartPainter::setupGeometry().
             //       AlignTop is done to ensure that the hd/ft texts of the same
             //       group (e.g. Hd2L and Hd2 and Hd2R) have the same baselines.
@@ -2063,7 +2063,7 @@ void KDChartPainter::calculateAllAxesRects(
 
     int nAxesBottom = TQMAX( nAxesBottom0 + nAxesBottomADD, nMinDistance );
 
-    // for micro tqalignment with the X axis, we adjust the Y axis - but not for Area Charts:
+    // for micro alignment with the X axis, we adjust the Y axis - but not for Area Charts:
     // otherwise the areas drawn would overwrite the Y axis line.
     int nAxesLeft   = TQMAX( nAxesLeft0   + nAxesLeftADD,   nMinDistance )
                       - (bIsAreaChart ? 0 : 1);
@@ -2143,10 +2143,10 @@ void KDChartPainter::calculateAllAxesRects(
 
 /**
   This method will be called whenever any parameters that affect
-  tqgeometry have been changed. It will compute the appropriate
+  geometry have been changed. It will compute the appropriate
   positions for the various parts of the chart (legend, axes, data
   area etc.). The implementation in KDChartPainter computes a
-  standard tqgeometry that should be suitable for most chart
+  standard geometry that should be suitable for most chart
   types. Subclasses can provide their own implementations.
 
   \param data the data that will be displayed as a chart
@@ -2158,7 +2158,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
                                     const TQRect& drawRect )
 {
   //qDebug("INVOKING: KDChartPainter::setupGeometry()");
-    // avoid recursion from tqrepaint() being called due to params() changed signals...
+    // avoid recursion from repaint() being called due to params() changed signals...
     const bool oldBlockSignalsState = params()->signalsBlocked();
     const_cast < KDChartParams* > ( params() )->blockSignals( true );
 
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index aac8928f..deedda9e 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -707,7 +707,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
                 break;
             ++i;
         }while( properties(id, propSet) );
-        // retrieve marker tqalignment
+        // retrieve marker alignment
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnMarkerAlign( id, markerAlign ) ){
@@ -750,7 +750,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
 
         // extra lines:
 
-        // retrieve tqalignment of extra lines
+        // retrieve alignment of extra lines
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnExtraLinesAlign( id, extraLinesAlign ) ){
@@ -813,7 +813,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
 
         // markers at the ends of the extra lines:
 
-        // retrieve marker tqalignment
+        // retrieve marker alignment
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnExtraMarkersAlign( id, extraMarkersAlign ) ){
@@ -976,7 +976,7 @@ aligned to.
 This must be a reasonable combination of TQt::AlignmentFlags.
 \param negativeDeltaX The X distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.). <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -987,7 +987,7 @@ size of the chart and the specification made via parameter \c size.
 
 \param negativeDeltaY The Y distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1002,7 +1002,7 @@ special values that you might find usefull for Pie charts or for
 Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
 KDCHART_TANGENTIAL_ROTATION both leading to individual
 calculation of appropriate rotation for each data value.  Rotation
-will be performed around the internal <b>tqalignment point</b> of the
+will be performed around the internal <b>alignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
 The following parameters apply to values greater than zero or equal zero:
@@ -1013,7 +1013,7 @@ aligned to.
 This must be a reasonable combination of TQt::AlignmentFlags.
 \param negativeDeltaX The X distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1023,7 +1023,7 @@ delta value are calculated dynamically before painting based on the
 size of the chart and the specification made via parameter \c size.
 \param positiveDeltaY The Y distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1038,7 +1038,7 @@ special values that you might find usefull for Pie charts or for
 Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
 KDCHART_TANGENTIAL_ROTATION both leading to individual
 calculation of appropriate rotation for each data value.  Rotation
-will be performed around the internal <b>tqalignment point</b> of the
+will be performed around the internal <b>alignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
 \param layoutPolicy The way to handle too narrow space conflicts:
@@ -1872,10 +1872,10 @@ TQString KDChartParams::dataRegionFrameAreaName( uint dataRow,
                              uint data3rd )
 {
     return TQString( "%1/%2/%3/%4" )
-            .tqarg( KDChartEnums::AreaChartDataRegion, 5 )
-            .tqarg( dataRow, 5 )
-            .tqarg( dataCol, 5 )
-            .tqarg( data3rd, 5 );
+            .arg( KDChartEnums::AreaChartDataRegion, 5 )
+            .arg( dataRow, 5 )
+            .arg( dataCol, 5 )
+            .arg( data3rd, 5 );
 }
 
 
@@ -2609,7 +2609,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
 {
     if( pIterIdx )
         *pIterIdx = 0;
-    const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
+    const TQString key( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
     KDChartFrameSettings* it = _areaDict.find( key );
     bFound = ( it != 0 );
     if( bFound )
@@ -2643,7 +2643,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
   */
 bool KDChartParams::removeFrame( uint area )
 {
-    return _areaDict.remove( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
+    return _areaDict.remove( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
 }
 
 
@@ -4617,7 +4617,7 @@ void KDChartParams::setThreeDBarAngle( uint angle )
   point. Only used if chartType() == Line and if threeDLines() ==
   false. The default is not to draw markers.
 
-  \note Use the setLineMarkerStyle function to specify the tqshape
+  \note Use the setLineMarkerStyle function to specify the shape
   of the markers, use the setLineWidth function to set the
   width of the lines connecting the markers (or to surpress
   drawing of such lines, resp.)
@@ -7487,7 +7487,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use those sections to show some marginal information
   like department name, print date, page number... <br>
   <b>Note:</b> Those headers <b>share the same area</b> so make sure to
-  specify propper horizontal tqalignment for each section when using more than
+  specify propper horizontal alignment for each section when using more than
   one of them. By default \c HdFtPosHeader0 has centered alignement,
   \c HdFtPosHeader0L is aligned to the left and \c HdFtPosHeader0R to the
   right side. All of them are vertically aligned to the bottom, you may
@@ -7504,7 +7504,7 @@ void KDChartParams::setAxisParams( uint n,
   You could use this headers to show the main information such as project name,
   chart title or period of time (e.g. census year). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   \li Up to three <b>additional headers</b> ( \c HdFtPosHeader2 , \c
@@ -7513,7 +7513,7 @@ void KDChartParams::setAxisParams( uint n,
   This headers could show additional information such as project phase, chart
   sub-title or sub-period of time (e.g. census quarter-year). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   <p>
@@ -7524,7 +7524,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use these footers instead of (or additional to) the
   main header(s) for showing the main information... <br>
   Like their header-counterparts they share the same part of the printable area
-  so the restrictions regarding tqalignment mentioned above apply also to these
+  so the restrictions regarding alignment mentioned above apply also to these
   three sections.
 
   \li Up to three <b>additional footers</b> ( \c HdFtPosFooter2 , \c
@@ -7533,7 +7533,7 @@ void KDChartParams::setAxisParams( uint n,
   This footers could show additional information instead of (or additional to)
   the additional header(s). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   \li Up to three <b>trailing footers</b> ( \c HdFtPosFooter0 , \c
@@ -7542,7 +7542,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use those sections to show some marginal information
   instead of (or additional to) the leading header(s). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
 \note The names \c HdFtPosHeader or \c HdFtPosFooter are the basic names also returned by \c basicAxisPos.
diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h
index 16722694..840ad12e 100644
--- a/kchart/kdchart/KDChartParams.h
+++ b/kchart/kdchart/KDChartParams.h
@@ -393,7 +393,7 @@ public slots:
                    bool           addFrameHeightToLayout = true )
         {
             _areaDict.setAutoDelete( TRUE );
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
                               new KDChartFrameSettings(0,0,0,
                                                        frame,
                                                        outerGapX,
@@ -436,7 +436,7 @@ public slots:
                      shadowWidth,
                            sunPos );
 
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
                               new KDChartFrameSettings( 0,0,0, frame,
                                                         outerGapX,
                                                         outerGapY,
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 4f17e653..86f37d68 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -2194,12 +2194,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
                                 TQString str;
                                 if(areaId == KDChartEnums::AreaChartDataRegion)
                                     str = TQString( "%1/%2/%3/%4" )
-                                              .tqarg( areaId, 5 )
-                                              .tqarg( frameSettings->dataRow(), 5 )
-                                              .tqarg( frameSettings->dataCol(), 5 )
-                                              .tqarg( 0, 5 );//frameSettings->data3rd(), 5 );
+                                              .arg( areaId, 5 )
+                                              .arg( frameSettings->dataRow(), 5 )
+                                              .arg( frameSettings->dataCol(), 5 )
+                                              .arg( 0, 5 );//frameSettings->data3rd(), 5 );
                                 else
-                                    str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 );
+                                    str = TQString( "%1/-----/-----/-----" ).arg( areaId, 5 );
                                 _areaDict.replace( str, frameSettings );
                             }
                         }
diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp
index 44f4c60c..a8e126cb 100644
--- a/kchart/kdchart/KDChartPiePainter.cpp
+++ b/kchart/kdchart/KDChartPiePainter.cpp
@@ -55,7 +55,7 @@
 KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp
index 9ebed863..99cee953 100644
--- a/kchart/kdchart/KDChartPolarPainter.cpp
+++ b/kchart/kdchart/KDChartPolarPainter.cpp
@@ -50,7 +50,7 @@ KDChartPolarPainter::KDChartPolarPainter( KDChartParams* params ) :
     KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h
index cdd64f78..d963af51 100644
--- a/kchart/kdchart/KDChartPropertySet.h
+++ b/kchart/kdchart/KDChartPropertySet.h
@@ -721,14 +721,14 @@ public slots:
     }
 
     /**
-      Specify the ID of the property set specifying the tqalignment of the
+      Specify the ID of the property set specifying the alignment of the
       Marker to be displayed for this data value
       <b>or</b> specifying this flag directly.
 
       \note This function should be used for Line Charts only, otherwise
       the settings specified here will be ignored.
 
-      \param idMarkerAlign ID of the property set specifying the tqalignment
+      \param idMarkerAlign ID of the property set specifying the alignment
       of the Marker to be shown.
       Use special value KDChartPropertySet::UndefinedID
       to specify neither another property set's ID
@@ -737,7 +737,7 @@ public slots:
       if you do NOT want to inherit another property set's
       settings but want to specify the flag by using
       the following parameter.
-      \param markerAlign  The tqalignment of the marker to be shown.
+      \param markerAlign  The alignment of the marker to be shown.
       This parameter is stored but ignored if the previous parameter
       is not set to KDChartPropertySet::OwnID.
 
diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp
index 8797da5b..ba1e6fed 100644
--- a/kchart/kdchart/KDChartRingPainter.cpp
+++ b/kchart/kdchart/KDChartRingPainter.cpp
@@ -53,7 +53,7 @@
 KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp
index d530ea19..8217abfc 100644
--- a/kchart/kdchart/KDChartWidget.cpp
+++ b/kchart/kdchart/KDChartWidget.cpp
@@ -244,8 +244,8 @@ void KDChartWidget::resizeEvent( TQResizeEvent* /*event*/ )
   display process, so this is turned off by default.
 
   If active data reporting is turned on when the widget is already
-  shown, data will be reported after the next tqrepaint(). Call
-  tqrepaint() explicitly if necessary.
+  shown, data will be reported after the next repaint(). Call
+  repaint() explicitly if necessary.
 
   Active data is currently supported for bar, pie, and line charts
   (the latter only with markers, as trying to hit the line would be
@@ -281,7 +281,7 @@ bool KDChartWidget::isActiveData() const
   needs to be kept around. However, in most cases, it is worth
   spending the extra memory. Double-buffering is on by
   default. Turning double-buffering on or off does not trigger a
-  tqrepaint.
+  repaint.
 
   \param doublebuffered if true, turns double-buffering on, if false,
   turns double-buffering off
diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp
index 70283da6..c0985134 100644
--- a/kchart/kdchart/KDDrawText.cpp
+++ b/kchart/kdchart/KDDrawText.cpp
@@ -408,7 +408,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
             painter->drawLine( x+pBotRight.x(),     y+pBotRight.y()-3, x+pBotRight.x(),     y+pBotRight.y()+3 );
             */
 
-            // The horizontal and vertical tqalignment together define one of
+            // The horizontal and vertical alignment together define one of
             // NINE possible points: this point must be moved on the anchor.
             int hAlign = align & ( TQt::AlignLeft | TQt::AlignRight  | TQt::AlignHCenter );
             int vAlign = align & ( TQt::AlignTop  | TQt::AlignBottom | TQt::AlignVCenter );
diff --git a/kchart/kdchart/KDFrameProfileSection.h b/kchart/kdchart/KDFrameProfileSection.h
index 9fe38adf..48f70bb3 100644
--- a/kchart/kdchart/KDFrameProfileSection.h
+++ b/kchart/kdchart/KDFrameProfileSection.h
@@ -104,7 +104,7 @@ public:
 
 
     /**
-    Profile Curvature Mode: specifying the tqshape of a frame profile section.
+    Profile Curvature Mode: specifying the shape of a frame profile section.
     (curvature setting will be ignored for \c DirPlain profiles)
 
     \li \c CvtFlat looking like a evenly sloping surface.
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 8924ed33..70a22c70 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -110,7 +110,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
-            tqrepaint();
+            repaint();
         updateCursor( e->pos() );
     }
 }
@@ -167,7 +167,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
             s->moveSplitter( pos, id() );
         }
     }
-    tqrepaint();
+    repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const TQPoint& p )
@@ -321,7 +321,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   such a license) and are (C) Trolltech AS.
 
   A splitter lets the user control the size of child widgets by
-  dragging the boundary between the tqchildren. Any number of widgets
+  dragging the boundary between the children. Any number of widgets
   may be controlled.
 
   To show a TQListBox, a TQListView and a TQTextEdit side by side:
@@ -334,14 +334,14 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   \endcode
 
   In KDGanttMinimizeSplitter, the boundary can be either horizontal or
-  vertical.  The default is horizontal (the tqchildren are side by side)
+  vertical.  The default is horizontal (the children are side by side)
   but you can use setOrientation( TQSplitter::Vertical ) to set it to
   vertical.
 
   Use setResizeMode() to specify
   that a widget should keep its size when the splitter is resized.
 
-  Although KDGanttMinimizeSplitter normally resizes the tqchildren only
+  Although KDGanttMinimizeSplitter normally resizes the children only
   at the end of a resize operation, if you call setOpaqueResize( TRUE
   ) the widgets are resized as often as possible.
 
@@ -351,7 +351,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   sizes set by the user.
 
   If you hide() a child, its space will be distributed among the other
-  tqchildren. It will be reinstated when you show() it again. It is also
+  children. It will be reinstated when you show() it again. It is also
   possible to reorder the widgets within the splitter using
   moveToFirst() and moveToLast().
 */
@@ -402,7 +402,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p
 }
 
 /*!
-  Destroys the splitter and any tqchildren.
+  Destroys the splitter and any children.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
@@ -707,7 +707,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     } else {
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) {
-	    dd = w->tqgeometry().right() - pos;
+	    dd = w->geometry().right() - pos;
 	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
@@ -766,7 +766,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
-	    right = pick( w->tqgeometry().bottomRight() );
+	    right = pick( w->geometry().bottomRight() );
 	    dd = right - pos + 1;
 	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
 	    /*newRight = pos+dd-1;*/
@@ -968,7 +968,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
-            // KDGanttMinimizeSplitter with no tqchildren yet
+            // KDGanttMinimizeSplitter with no children yet
             maxl = TQWIDGETSIZE_MAX;
         }
     } else {
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 45b1b976..a1499a84 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -539,7 +539,7 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item,
                  the fastest mode.
               If Medium, there is extra repainting after releasing the
                  scrollbar. This provides fast scrolling with updated content
-                 after scrolling. Recommended, when tqrepaint problems occur.
+                 after scrolling. Recommended, when repaint problems occur.
                  This is the default value after startup.
               If Always, there is an extra update after every move of the
                  scrollbar. This entails slow scrolling with updated
@@ -622,7 +622,7 @@ void KDGanttView::slotHeaderSizeChanged()
     // legend is cleared - reinit legend with list
     legendItem* li;
     for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
-      myLegend->addLegendItem(li->tqshape, li->color, li->text );
+      myLegend->addLegendItem(li->shape, li->color, li->text );
     }
   }
 }
@@ -1216,7 +1216,7 @@ bool KDGanttView::showTaskLinks() const
 void KDGanttView::setFont(const TQFont& font)
 {
     myListView->setFont(font);
-    myListView->tqrepaint();
+    myListView->repaint();
     myTimeHeader->setFont(font);
     myLegend->setFont( font );
     TQWidget::setFont( font );
@@ -1306,21 +1306,21 @@ bool KDGanttView::showTimeTablePopupMenu() const
 
 
 /*!
-  Sets the tqshapes for a certain type of Gantt item. Not all items use
-  all three tqshapes (e.g., only summary items use the middle tqshape).
+  Sets the shapes for a certain type of Gantt item. Not all items use
+  all three shapes (e.g., only summary items use the middle shape).
 
-  This setting overrides any tqshape settings made on individual items.
+  This setting overrides any shape settings made on individual items.
   These settings will be taken as initial values of any newly created
   item of this certain type.
   See also the documentation of the KDGanttViewItem class.
 
-  \param type the type of Gantt items for which to set the tqshapes
-  \param start the tqshape to use for the beginning of the item
-  \param middle the tqshape to use for the middle of the item
-  \param end the tqshape to use for the end of the item
-  \param overwriteExisting if true, overwrites existing tqshape settings
+  \param type the type of Gantt items for which to set the shapes
+  \param start the shape to use for the beginning of the item
+  \param middle the shape to use for the middle of the item
+  \param end the shape to use for the end of the item
+  \param overwriteExisting if true, overwrites existing shape settings
   in the individual items
-  \sa tqshapes()
+  \sa shapes()
 */
 void KDGanttView::setShapes( KDGanttViewItem::Type type,
                              KDGanttViewItem::Shape start,
@@ -1344,18 +1344,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type,
 
 
 /*!
-  Queries the tqshapes for a particular type of Gantt item.
+  Queries the shapes for a particular type of Gantt item.
 
-  \param type the type of Gantt items for which to query the tqshapes
-  \param start the start tqshape is returned in this parameter
-  \param middle the middle tqshape is returned in this parameter
-  \param end the end tqshape is returned in this parameter
-  \return true if there was a general tqshape set for the specified
-  type. If the return value is false, the values of the three tqshape
+  \param type the type of Gantt items for which to query the shapes
+  \param start the start shape is returned in this parameter
+  \param middle the middle shape is returned in this parameter
+  \param end the end shape is returned in this parameter
+  \return true if there was a general shape set for the specified
+  type. If the return value is false, the values of the three shape
   parameters are undefined.
   \sa setShapes()
 */
-bool KDGanttView::tqshapes( KDGanttViewItem::Type type,
+bool KDGanttView::shapes( KDGanttViewItem::Type type,
                           KDGanttViewItem::Shape& start,
                           KDGanttViewItem::Shape& middle,
                           KDGanttViewItem::Shape& end ) const
@@ -1569,19 +1569,19 @@ void KDGanttView::clearLegend( )
 /*!
   Adds an item to the legend.
 
-  \param tqshape the tqshape to display
-  \param tqshapeColor the color in which to display the tqshape
+  \param shape the shape to display
+  \param shapeColor the color in which to display the shape
   \param text the text to display
   \sa clearLegend()
 */
-void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape,
-                                 const TQColor& tqshapeColor,
+void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape,
+                                 const TQColor& shapeColor,
                                  const TQString& text )
 {
-    myLegend->addLegendItem( tqshape,tqshapeColor,text );
+    myLegend->addLegendItem( shape,shapeColor,text );
     legendItem* item = new legendItem;
-    item->tqshape = tqshape;
-    item->color = tqshapeColor;
+    item->shape = shape;
+    item->color = shapeColor;
     item->text = text;
     myLegendItems->append( item );
 }
@@ -3412,58 +3412,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
                            showTimeTablePopupMenu() );
 
     // the Shapes element
-    TQDomElement tqshapesElement = doc.createElement( "Shapes" );
-    docRoot.appendChild( tqshapesElement );
-    TQDomElement tqshapesEventElement = doc.createElement( "Event" );
-    tqshapesElement.appendChild( tqshapesEventElement );
+    TQDomElement shapesElement = doc.createElement( "Shapes" );
+    docRoot.appendChild( shapesElement );
+    TQDomElement shapesEventElement = doc.createElement( "Event" );
+    shapesElement.appendChild( shapesEventElement );
     KDGanttViewItem::Shape start, middle, end;
-    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
                                  "Undefined" );
     }
-    TQDomElement tqshapesTaskElement = doc.createElement( "Task" );
-    tqshapesElement.appendChild( tqshapesTaskElement );
-    if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    TQDomElement shapesTaskElement = doc.createElement( "Task" );
+    shapesElement.appendChild( shapesTaskElement );
+    if( shapes( KDGanttViewItem::Task, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
                                  "Undefined" );
     }
-    TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" );
-    tqshapesElement.appendChild( tqshapesSummaryElement );
-    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    TQDomElement shapesSummaryElement = doc.createElement( "Summary" );
+    shapesElement.appendChild( shapesSummaryElement );
+    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
                                  "Undefined" );
     }
 
@@ -3601,7 +3601,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
         TQDomElement legendItemElement = doc.createElement( "LegendItem" );
         legendItemsElement.appendChild( legendItemElement );
         KDGanttXML::createStringNode( doc, legendItemElement, "Shape",
-                                 KDGanttViewItem::tqshapeToString( current->tqshape ) );
+                                 KDGanttViewItem::shapeToString( current->shape ) );
         KDGanttXML::createColorNode( doc, legendItemElement, "Color",
                                 current->color );
         KDGanttXML::createStringNode( doc, legendItemElement, "Text",
@@ -3754,17 +3754,17 @@ void KDGanttView::editItem( KDGanttViewItem*  item)
 
 
 /*!
-  This method returns the pixmap used for a certain tqshape, in the
+  This method returns the pixmap used for a certain shape, in the
   selected color and size.
 
-  \param tqshape the tqshape to generate
-  \param tqshapeColor the foreground color of the tqshape
-  \param backgroundColor the background color of the tqshape
-  \param itemSize the size of the tqshape
-  \return the generated tqshape pixmap
+  \param shape the shape to generate
+  \param shapeColor the foreground color of the shape
+  \param backgroundColor the background color of the shape
+  \param itemSize the size of the shape
+  \return the generated shape pixmap
 */
-TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
-                                const TQColor& tqshapeColor,
+TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
+                                const TQColor& shapeColor,
                                 const TQColor& backgroundColor, int itemSize)
 {
   // 10 is a good value as size
@@ -3774,11 +3774,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
   p.fill( backgroundColor );
   TQPainter paint (&p);
   TQBrush b = TQBrush ( TQt::SolidPattern );
-  b.setColor( tqshapeColor );
+  b.setColor( shapeColor );
   paint.setBrush( b );
   TQPen pen( TQt::black, 1 ) ;
   paint.setPen( pen );
-  switch (tqshape) {
+  switch (shape) {
   case KDGanttViewItem::TriangleDown:{
     TQPointArray arr = TQPointArray(3);
     arr.setPoint(0,-size/2,-hei);
@@ -3861,8 +3861,8 @@ void KDGanttView::initDefaults()
     myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::cyan;//summary
     myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::red;
 
-    // setting the default tqshape types
-    // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
+    // setting the default shape types
+    // currently, we take for each item for all three shapes (start, middle, end) the same default shape
     for (i = 0;i<3;++i) {
       myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] =  KDGanttViewItem::Diamond; //event
       myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] =  KDGanttViewItem::Square; //task
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index d272e382..21af450b 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -192,7 +192,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool tqshapes( KDGanttViewItem::Type type,
+    bool shapes( KDGanttViewItem::Type type,
                  KDGanttViewItem::Shape& start,
                  KDGanttViewItem::Shape& middle,
                  KDGanttViewItem::Shape& end ) const;
@@ -227,7 +227,7 @@ public:
     TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const;
 
     // Legend-related stuff
-    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
     void clearLegend();
     // Header-related stuff
     void setHorizonStart( const TQDateTime& start );
@@ -293,7 +293,7 @@ public:
     void setWeekendDays( int start, int end );
     void weekendDays( int& start, int& end ) const;
 
-    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -409,7 +409,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape tqshape;
+      KDGanttViewItem::Shape shape;
       TQColor color;
       TQString text;
     };
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index fab1b3bd..62205b6b 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -52,20 +52,20 @@
   directly. Instead, you should create items of one of the
   subclasses. This class provides methods common to all Gantt items.
 
-  The initialization of the tqshapes/colors of the item works as follows:
+  The initialization of the shapes/colors of the item works as follows:
 
   Shapes:
-  When a new item is created, the tqshapes are set to the default values
+  When a new item is created, the shapes are set to the default values
   for items of the type of this item, defined in the KDGanttView class with
   void setShapes( KDGanttViewItem::Type type,
   KDGanttViewItem::Shape start,
   KDGanttViewItem::Shape middle,
   KDGanttViewItem::Shape end );
   If there is no default value defined for this type,
-  the tqshapes are set as follows:
-  For TaskViewItems all three tqshapes are set to Square.
-  For SummaryViewItems all three tqshapes are set to TriangleDown.
-  For EventViewItems all three tqshapes are set to Diamond.
+  the shapes are set as follows:
+  For TaskViewItems all three shapes are set to Square.
+  For SummaryViewItems all three shapes are set to TriangleDown.
+  For EventViewItems all three shapes are set to Diamond.
 
   Colors:
   When a new item is created, the colors are set to the default values
@@ -75,7 +75,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the colors of the tqshapes are set to the default color for items of this type,
+  the colors of the shapes are set to the default color for items of this type,
   defined in the KDGanttView class with:
   void setDefaultColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default color in the KDGanttView class is set to
@@ -92,7 +92,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the highlight colors of the tqshapes are set to the default color for
+  the highlight colors of the shapes are set to the default color for
   items of this type, defined in the KDGanttView class with:
   void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default highlight color in the KDGanttView class is set to red
@@ -122,15 +122,15 @@
   shown or not.
   In the other mode (set with setDisplaySubitemsAsGroup( true ); ),
   called "calendar mode", the item is displayed as follows:
-  If the item has no tqchildren, it is displayed as usual.
-  If the item is opened (i.e., its tqchildren are displayed), the
+  If the item has no children, it is displayed as usual.
+  If the item is opened (i.e., its children are displayed), the
   start/end time of this item is computed automatically according to
-  the earliest start time/latest end time of its tqchildren. The item
-  and its tqchildren are displayed as usual.
-  If the item is closed (i.e., its tqchildren are hidden in the left
-  list view), the item itself is hidden, and its tqchildren are displayed
+  the earliest start time/latest end time of its children. The item
+  and its children are displayed as usual.
+  If the item is closed (i.e., its children are hidden in the left
+  list view), the item itself is hidden, and its children are displayed
   on the timeline of this item instead. To control the painting of
-  overlapping tqchildren, call \a setPriority() for the childs.
+  overlapping children, call \a setPriority() for the childs.
 
   Blocking of user interaction to open item:
   If you want to block users to open items used as parents of calendar items,
@@ -138,7 +138,7 @@
 
   Example 1, Color:
   If you create an instance of a KDGanttView class and add a SummaryViewItem
-  without setting any color/tqshape values, you get an item with three tqshapes
+  without setting any color/shape values, you get an item with three shapes
   of the form TriangleDown in the color magenta. If the item is highlighted,
   the color will change to the highlight color red.
 
@@ -147,12 +147,12 @@
   \a KDGanttView::setCalendarMode( true );
   \a KDGanttView::setDisplaySubitemsAsGroup( true );
   Insert root items in the Gantt view.
-  Insert items as tqchildren of these root item in the Gantt view.
+  Insert items as children of these root item in the Gantt view.
   You may use any item type as parent and child; there are no limitations.
   It is, however, recommended to use KDGanttViewTaskItems
-  Actually, you may add child items to the tqchildren themselves.
+  Actually, you may add child items to the children themselves.
   Such a child behaves then like a parent.
-  Now set the start/end time of the tqchildren to specify a time
+  Now set the start/end time of the children to specify a time
   interval for these items.
 */
 
@@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const
   Useful to get a so called "calendar view" with many items in one row.
   When \a displaySubitemsAsGroup() is set to true, this item has a normal view,
   when it is expanded. If it is not expanded (and has at least one child),
-  the item itself is hidden, and all tqchildren are displayed instead.
+  the item itself is hidden, and all children are displayed instead.
   To manage the painting priority of the childs (if overlapping),
   you may set \a priority() of these items.
 
@@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const
 /*!
   Specifies whether this item should be shown highlighted. The user
   can also highlight items with the mouse.
-  If the item displays its subitems (tqchildren) as a group
+  If the item displays its subitems (children) as a group
   (displaySubitemsAsGroup() == true),
   all changes apply to all subitems as well.
 
@@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const
 
 
 /*!
-  Specifies the tqshapes to be used for this item.
+  Specifies the shapes to be used for this item.
 
-  It is advisable not to use this method, but rather set the tqshapes
+  It is advisable not to use this method, but rather set the shapes
   for all items of a type with KDGanttView::setShapes() in order to
   get a uniform Gantt view.
 
-  \param start the start tqshape
-  \param middle the middle tqshape
-  \param end the end tqshape
-  \sa tqshapes(), setColors(), colors()
+  \param start the start shape
+  \param middle the middle shape
+  \param end the end shape
+  \sa shapes(), setColors(), colors()
 */
 void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 {
@@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 
 
 /*!
-  Creates tqshapes of the specified type \a tqshape.
-  The background tqshape color is set to black and the background tqshape
-  is slightly bit bigger than the foreground tqshape to have a black border
-  around the foreground tqshape.
+  Creates shapes of the specified type \a shape.
+  The background shape color is set to black and the background shape
+  is slightly bit bigger than the foreground shape to have a black border
+  around the foreground shape.
 
-  \param itemShape the foreground tqshape
-  \param middle itemShapeBack  the background tqshape
-  \param tqshape the type of the tqshape
+  \param itemShape the foreground shape
+  \param middle itemShapeBack  the background shape
+  \param shape the type of the shape
    (may be TriangleDown, TriangleUp, Diamond, Square, Circle)
-  \sa tqshapes(), setColors(), colors()
+  \sa shapes(), setColors(), colors()
 */
 void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
                                    KDCanvasPolygonItem* &itemShapeBack,
-                                   Shape tqshape )
+                                   Shape shape )
 {
   if ( itemShape && type() ==  Task )
     return;
@@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
     TQCanvasPolygonalItem * itemBack;
     int size = myItemSize+2;
     int hei = (myItemSize/3)/2;
-    switch (tqshape) {
+    switch (shape) {
     case TriangleDown:
         {
             item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem);
@@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
             break;
         }
     default:
-        // Uninitialized tqshape, can e.g. be the case with free-busy
-        // items which don't have any tqshapes
+        // Uninitialized shape, can e.g. be the case with free-busy
+        // items which don't have any shapes
         return;
     }
     item->setBrush(Qt::SolidPattern);
@@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
 
 
 /*!
-  Returns the tqshapes used for this item
+  Returns the shapes used for this item
 
-  \param start returns the start tqshape
-  \param middle returns the middle tqshape
-  \param end returns the end tqshape
+  \param start returns the start shape
+  \param middle returns the middle shape
+  \param end returns the end shape
   \sa setShapes(), setColors(), colors()
 */
-void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
+void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
 {
     start = myStartShape;
     middle = myMiddleShape;
@@ -943,16 +943,16 @@ void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
 
 
 /*!
-  Specifies the colors in which to draw the tqshapes of this item.
+  Specifies the colors in which to draw the shapes of this item.
 
   It is advisable not to use this method, but rather set the colors
   for all items of a type with KDGanttView::setColors() in order to
   get a uniform Gantt view.
 
-  \param start the color for the start tqshape
-  \param middle the color for the middle tqshape
-  \param end the color for the end tqshape
-  \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
+  \param start the color for the start shape
+  \param middle the color for the middle shape
+  \param end the color for the end shape
+  \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
                                  const TQColor& end )
@@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
   \param start returns the start color
   \param middle returns the middle color
   \param end returns the end color
-  \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
+  \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -992,21 +992,21 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
 
 
 /*!
-  Specifies the highlight colors in which to draw the tqshapes of this item.
+  Specifies the highlight colors in which to draw the shapes of this item.
 
   It is advisable not to use this method, but rather set the highlight
   colors for all items of a type with
   KDGanttView::setHighlightColors() in order to get a uniform Gantt
   view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
-  \param start the highlight color for the start tqshape
-  \param middle the highlight color for the middle tqshape
-  \param end the highlight color for the end tqshape
-  \sa highlightColors(), setShapes(), tqshapes()
+  \param start the highlight color for the start shape
+  \param middle the highlight color for the middle shape
+  \param end the highlight color for the end shape
+  \sa highlightColors(), setShapes(), shapes()
 */
 void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end )
 {
@@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m
   \param start returns the start highlight color
   \param middle returns the middle highlight color
   \param end returns the end highlight color
-  \sa setHighlightColors(), setShapes(), tqshapes()
+  \sa setHighlightColors(), setShapes(), shapes()
 */
 void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor&
   It is advisable not to use this method, but rather set the text color
   for all items with KDGanttView::setTextColor() in order to get a
   uniform Gantt view.
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
   \param color the text color
@@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const
 /*!
   \enum KDGanttViewItem::Shape
 
-  This enum is used in order to specify the tqshapes of a Gantt chart
+  This enum is used in order to specify the shapes of a Gantt chart
   item.
 */
 
@@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const
   for all items of a type with KDGanttView::setDefaultColor() in order to
   get a uniform Gantt view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const
   for all items of a type with KDGanttView::setDefaultHighlightColor()
   in order to get a uniform Gantt view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const
 /*!
   Returns the first child of this item.
 
-  \return the first child of this item, 0 if this item has no tqchildren
+  \return the first child of this item, 0 if this item has no children
 */
 KDGanttViewItem* KDGanttViewItem::firstChild() const
 {
@@ -1467,10 +1467,10 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     setDefaultColor( myGanttView->defaultColor(myType));
     // set default highlight color
     setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType));
-    // set tqshapes
-    if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
+    // set shapes
+    if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
 
-        //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes");
+        //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes");
     };
 
     setShapes(myStartShape,myMiddleShape,myEndShape);
@@ -1484,12 +1484,12 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     floatStartShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     floatEndShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
 
-    // set color of tqshapes
+    // set color of shapes
     if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) {
 
     };
     setColors(defaultColor(),defaultColor(), defaultColor());
-    // set highlight color of tqshapes
+    // set highlight color of shapes
     if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) {
 
     };
@@ -1506,9 +1506,9 @@ void KDGanttViewItem::initColorAndShapes(Type t)
 }
 
 
-TQString KDGanttViewItem::tqshapeToString( Shape tqshape )
+TQString KDGanttViewItem::shapeToString( Shape shape )
 {
-    switch( tqshape ) {
+    switch( shape ) {
     case TriangleDown:
         return "TriangleDown";
     case TriangleUp:
@@ -1569,13 +1569,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc,
     KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() );
     KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() );
     Shape startShape, middleShape, endShape;
-    tqshapes( startShape, middleShape, endShape );
+    shapes( startShape, middleShape, endShape );
     KDGanttXML::createStringNode( doc, itemElement, "StartShape",
-                             tqshapeToString( startShape ) );
+                             shapeToString( startShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "MiddleShape",
-                             tqshapeToString( middleShape ) );
+                             shapeToString( middleShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "EndShape",
-                             tqshapeToString( endShape ) );
+                             shapeToString( endShape ) );
     KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() );
     TQColor startColor, middleColor, endColor;
     colors( startColor, middleColor, endColor );
@@ -1942,9 +1942,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY )
 
 
 /*!
-  Returns the start time of the tqchildren of this item.
+  Returns the start time of the children of this item.
 
-  \return the start time of the tqchildren of this item
+  \return the start time of the children of this item
 */
 TQDateTime KDGanttViewItem::myChildStartTime()
 {
@@ -1976,9 +1976,9 @@ TQDateTime KDGanttViewItem::myChildStartTime()
 
 
 /*!
-  Returns the end time of the tqchildren of this item.
+  Returns the end time of the children of this item.
 
-  \return the end time of the tqchildren of this item
+  \return the end time of the children of this item
 */
 TQDateTime KDGanttViewItem::myChildEndTime()
 {
@@ -2042,7 +2042,7 @@ void KDGanttViewItem::setShowNoInformation( bool show )
 /*!
   If the name of this item is \a name (i.e., listViewText() == name),
   the pointer to this item is returned.  Otherwise, it looks for an
-  item with name \a name in the set of tqchildren and subtqchildren of
+  item with name \a name in the set of children and subchildren of
   this item.
   \param  name the name of the item
   \return the pointer to the item with name \a name
@@ -2363,37 +2363,37 @@ bool KDGanttViewItem::isCalendar( ) const
 /*!
   \var KDGanttViewItem::startShape
 
-  the tqshape at the beginning of the item
+  the shape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShape
 
-  the tqshape in the middle of the item
+  the shape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShape
 
-  the tqshape at the end of the item
+  the shape at the end of the item
 */
 
 /*!
   \var KDGanttViewItem::startShapeBack
 
-  the background tqshape at the beginning of the item
+  the background shape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShapeBack
 
-  the background tqshape in the middle of the item
+  the background shape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShapeBack
 
-  the background tqshape at the end of the item
+  the background shape at the end of the item
 */
 
 
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 972aa4d6..70ca358e 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -146,7 +146,7 @@ public:
   //bool isCalendar( ) const;
 
     void setShapes( Shape start, Shape middle, Shape end );
-    void tqshapes( Shape& start, Shape& middle, Shape& end ) const;
+    void shapes( Shape& start, Shape& middle, Shape& end ) const;
     void setDefaultColor( const TQColor& );
     TQColor defaultColor() const;
     void setColors( const TQColor& start, const TQColor& middle,
@@ -196,7 +196,7 @@ private:
     friend class KDGanttViewItemDrag;
     friend class itemAttributeDialog;
 
-    static TQString tqshapeToString( Shape tqshape );
+    static TQString shapeToString( Shape shape );
     static Shape stringToShape( const TQString& string );
     static TQString typeToString( Type type );
 
@@ -236,7 +236,7 @@ private:
     bool isMyTextCanvas(TQCanvasItem *tc);
     TQPoint myTextOffset;
     TQString _name;
-    bool tqshapeDefined;
+    bool shapeDefined;
     int _priority;
     static TQDict<KDGanttViewItem> sItemDict;
 };
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 92c60201..158da041 100644
--- a/kdgantt/KDGanttViewItemDrag.cpp
+++ b/kdgantt/KDGanttViewItemDrag.cpp
@@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
         pix = *(item->pixmap()) ;
     else {
         KDGanttViewItem::Shape start,  middle, end;
-        item->tqshapes( start, middle, end );
+        item->shapes( start, middle, end );
         TQColor st, mi, en;
         item->colors( st, mi, en );
         pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index ab8b5a92..e1cedba6 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -792,7 +792,7 @@ void  KDTimeHeaderWidget::preparePopupMenu()
     if (flagZoomToFit)
         myPopupMenu->changeItem( 1, i18n("Zoom (Fit)"));
     else
-        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) );
+        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) );
     int i = 0;
     int id;
     while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) {
@@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end)
     }
     flagDoNotRepaintAfterChange = false;
     updateTimeTable();
-    tqrepaint();
+    repaint();
     moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2));
     // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
     if (myGanttView && myGanttView->myCanvasView)
@@ -2219,7 +2219,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGridMinorWidth = Width;
     // the width of this widget is the gridwidth * the amount of items
     Width *= minorItems;
-    // if size changed, reset tqgeometry
+    // if size changed, reset geometry
     if (width() != Width   || height() != Height  )
         {
             resize( Width, Height );
@@ -2355,7 +2355,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGanttView->myTimeTable->setBlockUpdating( block );
     updateTimeTable();
     centerDateTime(myCenterDateTime);
-    tqrepaint();
+    repaint();
 }
 
 
@@ -2501,7 +2501,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent *  )
         //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) );
     }
     mouseDown = false;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -2516,11 +2516,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
     if ( mouseDown ) {
         if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) {
             mouseDown = false;
-            tqrepaint();
+            repaint();
             return;
         }
         endMouseDown = e->pos().x();
-        //tqrepaint;
+        //repaint;
         int val = -1;
         if (endMouseDown <  -x() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() -
@@ -2673,10 +2673,10 @@ void KDLegendWidget::clearLegend ( )
 }
 
 
-void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
+void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, TQt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( shape,  shapeColor, TQt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
     w->setBackgroundColor( TQt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
@@ -2933,7 +2933,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
         if ( tx < 0 )
             tx = header()->cellPos( cell );
 
-        // do any tqchildren of current need to be painted?
+        // do any children of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
         if ( ih != ith && 
             rootIsDecorated() &&
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 8b7bc215..f02357f9 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -331,7 +331,7 @@ public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
-  void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
+  void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index b51bcbd0..64ecbd84 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -43,7 +43,7 @@
 
   This class represents calendar items in Gantt charts.
 
-  A calendar item in a Gantt chart has no start/end tqshape,
+  A calendar item in a Gantt chart has no start/end shape,
   it is displayed as a rectangle.
   You can set the colors as usual, where only the first argument of
   setColors( col, col, col )
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index a98d65a1..5a34dbb5 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -462,7 +462,7 @@
                             <property name="text">
                                 <string>Text color:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 3ab24af8..8624d45d 100644
--- a/kdgantt/itemAttributeDialog.ui.h
+++ b/kdgantt/itemAttributeDialog.ui.h
@@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked()
       myItem->setTextColor( c );
     TQPixmap *  pix  = (TQPixmap *)ChangeText->pixmap();
     pix->fill( myItem->textColor() );
-    ChangeText->tqrepaint();
+    ChangeText->repaint();
 }
 
 
@@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = TQColorDialog::getColor( st, this );
@@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked()
 {
     if ( !myItem) return;
      KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = TQColorDialog::getColor( mi, this );
@@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
      TQColor c = TQColorDialog::getColor( en, this );
@@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item )
   //  DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10));
     LineEdit1->setText( item->text() );
     KDGanttViewItem::Shape start,  middle, end;
-    item->tqshapes( start, middle, end );
+    item->shapes( start, middle, end );
     TQColor st, mi, en;
     item->colors( st, mi, en );
     ChangeStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( st, this );
@@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( mi, this );
@@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked()
 {
     if ( !myItem) return;
    KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( en, this );
@@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & )
 void itemAttributeDialog::StartBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     start = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s )
 void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     middle = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 void itemAttributeDialog::EndBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     end = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index edcba8c9..02e01249 100644
--- a/kexi/3rdparty/kexisql/src/btree.c
+++ b/kexi/3rdparty/kexisql/src/btree.c
@@ -101,7 +101,7 @@ typedef struct FreelistInfo FreelistInfo;
 ** This routine rounds up a number of bytes to the next multiple of 4.
 **
 ** This might need to change for computer architectures that require
-** and 8-byte tqalignment boundry for structures.
+** and 8-byte alignment boundry for structures.
 */
 #define ROUNDUP(X)  ((X+3) & ~3)
 
@@ -726,7 +726,7 @@ int sqliteBtreeOpen(
 }
 
 /*
-** Close an open database and tqinvalidate all cursors.
+** Close an open database and invalidate all cursors.
 */
 static int fileBtreeClose(Btree *pBt){
   while( pBt->pCursor ){
@@ -1998,7 +1998,7 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){
 }
 
 /*
-** Reparent all tqchildren of the given page to be the given page.
+** Reparent all children of the given page to be the given page.
 ** In other words, for every child of pPage, invoke reparentPage()
 ** to make sure that each child knows that pPage is its parent.
 **
@@ -2321,7 +2321,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   ** the siblings.  An attempt is made to find NN siblings on either
   ** side of pPage.  More siblings are taken from one side, however, if
   ** pPage there are fewer than NN siblings on the other side.  If pParent
-  ** has NB or fewer tqchildren then all tqchildren of pParent are taken.
+  ** has NB or fewer children then all children of pParent are taken.
   */
   nxDiv = idx - NN;
   if( nxDiv + NB > pParent->nCell ){
@@ -2547,7 +2547,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
   }
 
   /*
-  ** Reparent tqchildren of all cells.
+  ** Reparent children of all cells.
   */
   for(i=0; i<nNew; i++){
     reparentChildPages(pBt, apNew[i]);
@@ -2794,7 +2794,7 @@ static int fileBtreeCreateTable(Btree *pBt, int *piTable){
 }
 
 /*
-** Erase the given database page and all its tqchildren.  Return
+** Erase the given database page and all its children.  Return
 ** the page to the freelist.
 */
 static int clearDatabasePage(Btree *pBt, Pgno pgno, int freePageFlag){
@@ -3274,8 +3274,8 @@ static int keyCompare(
 **      3.  Make sure no key is less than or equal to zLowerBound.
 **      4.  Make sure no key is greater than or equal to zUpperBound.
 **      5.  Check the integrity of overflow pages.
-**      6.  Recursively call checkTreePage on all tqchildren.
-**      7.  Verify that the depth of all tqchildren is the same.
+**      6.  Recursively call checkTreePage on all children.
+**      7.  Verify that the depth of all children is the same.
 **      8.  Make sure this page is at least 33% full or else it is
 **          the root of the tree.
 */
diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c
index 86feaa5b..3954fe6d 100644
--- a/kexi/3rdparty/kexisql/src/btree_rb.c
+++ b/kexi/3rdparty/kexisql/src/btree_rb.c
@@ -319,7 +319,7 @@ static void print_node(BtRbNode *pNode)
 
 /* 
  * Check the following properties of the red-black tree:
- * (1) - If a node is red, both of it's tqchildren are black
+ * (1) - If a node is red, both of it's children are black
  * (2) - Each path from a given node to a leaf (NULL) node passes thru the
  *       same number of black nodes 
  *
@@ -951,10 +951,10 @@ static int memRbtreeDelete(RbtCursor* pCur)
   }
 
   /* First do a standard binary-tree delete (node pZ is to be deleted). How
-   * to do this depends on how many tqchildren pZ has:
+   * to do this depends on how many children pZ has:
    *
-   * If pZ has no tqchildren or one child, then splice out pZ.  If pZ has two
-   * tqchildren, splice out the successor of pZ and replace the key and data of
+   * If pZ has no children or one child, then splice out pZ.  If pZ has two
+   * children, splice out the successor of pZ and replace the key and data of
    * pZ with the key and data of the spliced out successor.  */
   if( pZ->pLeft && pZ->pRight ){
     BtRbNode *pTmp;
@@ -1008,7 +1008,7 @@ static int memRbtreeDelete(RbtCursor* pCur)
   }
 
   /* pZ now points at the spliced out node. pChild is the only child of pZ, or
-   * NULL if pZ has no tqchildren. If pZ is black, and not the tree root, then we
+   * NULL if pZ has no children. If pZ is black, and not the tree root, then we
    * will have violated the "same number of black nodes in every path to a
    * leaf" property of the red-black tree. The code in do_delete_balancing()
    * repairs this. */
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 4ed6c51a..212be42e 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -126,7 +126,7 @@
 **      8       4      Right child (the Ptr(N+1) value).  Omitted on leaves.
 **
 ** The flags define the format of this btree page.  The leaf flag means that
-** this page has no tqchildren.  The zerodata flag means that this page carries
+** this page has no children.  The zerodata flag means that this page carries
 ** only keys and no data.  The intkey flag means that the key is a integer
 ** which is stored in the key size entry of the cell header rather than in
 ** the payload area.
@@ -212,7 +212,7 @@
 #include <assert.h>
 
 /* Round up a number to the next larger multiple of 8.  This is used
-** to force 8-byte tqalignment on 64-bit architectures.
+** to force 8-byte alignment on 64-bit architectures.
 */
 #define ROUND8(x)   ((x+7)&~7)
 
@@ -1286,14 +1286,14 @@ int sqlite3BtreeOpen(
 #endif
   }
   pBt->usableSize = pBt->pageSize - nReserve;
-  assert( (pBt->pageSize & 7)==0 );  /* 8-byte tqalignment of pageSize */
+  assert( (pBt->pageSize & 7)==0 );  /* 8-byte alignment of pageSize */
   sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize);
   *ppBtree = pBt;
   return SQLITE_OK;
 }
 
 /*
-** Close an open database and tqinvalidate all cursors.
+** Close an open database and invalidate all cursors.
 */
 int sqlite3BtreeClose(Btree *pBt){
   while( pBt->pCursor ){
@@ -1658,7 +1658,7 @@ int sqlite3BtreeBeginTrans(Btree *pBt, int wrflag){
 #ifndef SQLITE_OMIT_AUTOVACUUM
 
 /*
-** Set the pointer-map entries for all tqchildren of page pPage. Also, if
+** Set the pointer-map entries for all children of page pPage. Also, if
 ** pPage contains cells that point to overflow pages, set the pointer
 ** map entries for the overflow pages as well.
 */
@@ -3425,7 +3425,7 @@ static int reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){
 
 
 /*
-** Change the pParent pointer of all tqchildren of pPage to point back
+** Change the pParent pointer of all children of pPage to point back
 ** to pPage.
 **
 ** In other words, for every child of pPage, invoke reparentPage()
@@ -3879,7 +3879,7 @@ static int balance_nonroot(MemPage *pPage){
   ** the siblings.  An attempt is made to find NN siblings on either
   ** side of pPage.  More siblings are taken from one side, however, if
   ** pPage there are fewer than NN siblings on the other side.  If pParent
-  ** has NB or fewer tqchildren then all tqchildren of pParent are taken.
+  ** has NB or fewer children then all children of pParent are taken.
   */
   nxDiv = idx - NN;
   if( nxDiv + NB > pParent->nCell ){
@@ -3911,7 +3911,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /* Make nMaxCells a multiple of 2 in order to preserve 8-byte
-  ** tqalignment */
+  ** alignment */
   nMaxCells = (nMaxCells + 1)&~1;
 
   /*
@@ -3930,13 +3930,13 @@ static int balance_nonroot(MemPage *pPage){
   }
   szCell = (int*)&apCell[nMaxCells];
   aCopy[0] = (u8*)&szCell[nMaxCells];
-  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
   for(i=1; i<NB; i++){
     aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
   }
   aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
+  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
 #ifndef SQLITE_OMIT_AUTOVACUUM
   if( pBt->autoVacuum ){
     aFrom = &aSpace[5*pBt->pageSize];
@@ -4199,7 +4199,7 @@ static int balance_nonroot(MemPage *pPage){
 #ifndef SQLITE_OMIT_AUTOVACUUM
     /* If this is an auto-vacuum database, update the pointer map entries
     ** that point to the siblings that were rearranged. These can be: left
-    ** tqchildren of cells, the right-child of the page, or overflow pages
+    ** children of cells, the right-child of the page, or overflow pages
     ** pointed to by cells.
     */
     if( pBt->autoVacuum ){
@@ -4284,7 +4284,7 @@ static int balance_nonroot(MemPage *pPage){
   }
 
   /*
-  ** Reparent tqchildren of all cells.
+  ** Reparent children of all cells.
   */
   for(i=0; i<nNew; i++){
     rc = reparentChildPages(apNew[i]);
@@ -4842,7 +4842,7 @@ int sqlite3BtreeCreateTable(Btree *pBt, int *piTable, int flags){
 }
 
 /*
-** Erase the given database page and all its tqchildren.  Return
+** Erase the given database page and all its children.  Return
 ** the page to the freelist.
 */
 static int clearDatabasePage(
@@ -5457,8 +5457,8 @@ static void checkList(
 **  NO  3.  Make sure no key is less than or equal to zLowerBound.
 **  NO  4.  Make sure no key is greater than or equal to zUpperBound.
 **      5.  Check the integrity of overflow pages.
-**      6.  Recursively call checkTreePage on all tqchildren.
-**      7.  Verify that the depth of all tqchildren is the same.
+**      6.  Recursively call checkTreePage on all children.
+**      7.  Verify that the depth of all children is the same.
 **      8.  Make sure this page is at least 33% full or else it is
 **          the root of the tree.
 */
diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c
index 9818c954..67ed7975 100644
--- a/kexi/3rdparty/kexisql3/src/build.c
+++ b/kexi/3rdparty/kexisql3/src/build.c
@@ -2331,7 +2331,7 @@ void sqlite3CreateIndex(
     sqliteFree(zStmt);
 
     /* Fill the index with data and reparse the schema. Code an OP_Expire
-    ** to tqinvalidate all pre-compiled statements.
+    ** to invalidate all pre-compiled statements.
     */
     if( pTblName ){
       sqlite3RefillIndex(pParse, pIndex, iMem);
diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c
index ac209552..8d9cfbbd 100644
--- a/kexi/3rdparty/kexisql3/src/expr.c
+++ b/kexi/3rdparty/kexisql3/src/expr.c
@@ -623,7 +623,7 @@ void sqlite3ExprListDelete(ExprList *pList){
 ** Walk an expression tree.  Call xFunc for each node visited.
 **
 ** The return value from xFunc determines whether the tree walk continues.
-** 0 means continue walking the tree.  1 means do not walk tqchildren
+** 0 means continue walking the tree.  1 means do not walk children
 ** of the current node but continue with siblings.  2 means abandon
 ** the tree walk completely.
 **
@@ -1949,7 +1949,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
   */
   op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1);
 
-  /* Verify correct tqalignment of TK_ and OP_ constants
+  /* Verify correct alignment of TK_ and OP_ constants
   */
   assert( pExpr->op!=TK_ISNULL || op==OP_NotNull );
   assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull );
diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c
index 8d6acd5c..1c1029f9 100644
--- a/kexi/3rdparty/kexisql3/src/main.c
+++ b/kexi/3rdparty/kexisql3/src/main.c
@@ -467,7 +467,7 @@ int sqlite3_create_function(
   /* Check if an existing function is being overridden or deleted. If so,
   ** and there are active VMs, then return SQLITE_BUSY. If a function
   ** is being overridden/deleted but there are no active VMs, allow the
-  ** operation to continue but tqinvalidate all precompiled statements.
+  ** operation to continue but invalidate all precompiled statements.
   */
   p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0);
   if( p && p->iPrefEnc==enc && p->nArg==nArg ){
@@ -934,7 +934,7 @@ int sqlite3_create_collation(
 
   /* Check if this call is removing or replacing an existing collation 
   ** sequence. If so, and there are active VMs, return busy. If there
-  ** are no active VMs, tqinvalidate any pre-compiled statements.
+  ** are no active VMs, invalidate any pre-compiled statements.
   */
   pColl = sqlite3FindCollSeq(db, (u8)enc, zName, strlen(zName), 0);
   if( pColl && pColl->xCmp ){
diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c
index 60cb43bd..4b981350 100644
--- a/kexi/3rdparty/kexisql3/src/pager.c
+++ b/kexi/3rdparty/kexisql3/src/pager.c
@@ -1076,7 +1076,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){
 **
 ** The master journal file contains the names of all child journals.
 ** To tell if a master journal can be deleted, check to each of the
-** tqchildren.  If all tqchildren are either missing or do not refer to
+** children.  If all children are either missing or do not refer to
 ** a different master journal, then this master journal can be deleted.
 */
 static int pager_delmaster(const char *zMaster){
diff --git a/kexi/3rdparty/kexisql3/src/sqlite3.h b/kexi/3rdparty/kexisql3/src/sqlite3.h
index be29db69..414c6cac 100644
--- a/kexi/3rdparty/kexisql3/src/sqlite3.h
+++ b/kexi/3rdparty/kexisql3/src/sqlite3.h
@@ -1248,7 +1248,7 @@ int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
 ** is NULL pointer, then SQLite does a search for an appropriate temporary
 ** file directory.
 **
-** Once sqlite3_open() has been called, changing this variable will tqinvalidate
+** Once sqlite3_open() has been called, changing this variable will invalidate
 ** the current temporary database, if any.
 */
 extern char *sqlite3_temp_directory;
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index 5ab2e4e6..c0457ffc 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -85,7 +85,7 @@ struct WhereTerm {
   i16 leftColumn;         /* Column number of X in "X <op> <expr>" */
   u16 operator;           /* A WO_xx value describing <op> */
   u8 flags;               /* Bit flags.  See below */
-  u8 nChild;              /* Number of tqchildren that must disable us */
+  u8 nChild;              /* Number of children that must disable us */
   WhereClause *pWC;       /* The clause this term is part of */
   Bitmask prereqRight;    /* Bitmask of tables used by pRight */
   Bitmask prereqAll;      /* Bitmask of tables referenced by p */
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index ce6f8f3b..a1f65a90 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -60,7 +60,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index d81d1870..5bc7f3b3 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -84,14 +84,14 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
     m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
 
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*=================== set tqlayout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*======================== draw contents =========================*/
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 2b4b76b7..731c38bd 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index d8be5249..e297ee52 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -330,14 +330,14 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text)
 	TQString msg;
 	if (feature_name.isEmpty())
 		msg = i18n("This function is not available for version %1 of %2 application.")
-			.tqarg(KEXI_VERSION_STRING)
-			.tqarg(KEXI_APP_NAME); 
+			.arg(KEXI_VERSION_STRING)
+			.arg(KEXI_APP_NAME); 
 	else {
 		TQString feature_name_(feature_name);
 		msg = i18n("\"%1\" function is not available for version %2 of %3 application.")
-			.tqarg(feature_name_.replace("&",""))
-			.tqarg(KEXI_VERSION_STRING)
-			.tqarg(KEXI_APP_NAME);
+			.arg(feature_name_.replace("&",""))
+			.arg(KEXI_VERSION_STRING)
+			.arg(KEXI_APP_NAME);
 	}
 
 	TQString extra_text_(extra_text);
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 49cbeb3b..851a4d3a 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -193,7 +193,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p || !p->second) {
-		//try in tqchildren...
+		//try in children...
 		if (alsoCheckInChildren) {
 			TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
 			for( ; it.current(); ++it ) {
@@ -217,7 +217,7 @@ bool KexiActionProxy::isSupported(const char* action_name) const
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p) {
-		//not supported explicitly - try in tqchildren...
+		//not supported explicitly - try in children...
 		if (m_focusedChild)
 			return m_focusedChild->isSupported(action_name);
 		TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
@@ -234,7 +234,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
 {
 	TQPair<TQSignal*,bool> *p = m_signals[action_name];
 	if (!p) {
-		//not supported explicitly - try in tqchildren...
+		//not supported explicitly - try in children...
 		if (alsoCheckInChildren) {
 			if (m_focusedChild)
 				return m_focusedChild->isAvailable(action_name, alsoCheckInChildren);
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index facb09b3..163efced 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -150,7 +150,7 @@ class KEXICORE_EXPORT KexiActionProxy
 
 		/*! Adds \a child of this proxy. Children will receive activateSharedAction() event,
 		 If activateSharedAction() "event" is not consumed by the main proxy,
-		 we start to iterate over proxy tqchildren (in unspecified order) to and call 
+		 we start to iterate over proxy children (in unspecified order) to and call 
 		 activateSharedAction() on every child until one of them accept the "event".
 		 
 		 If proxy child is destroyed, it is automatically detached from its parent proxy. 
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 451eb66a..01f0adb3 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -97,7 +97,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group
 		d->isDatabaseShortcut = false;
 	}
 	else {
-		//ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").tqarg(group).tqarg(type)
+		//ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").arg(group).arg(type)
 		return false;
 	}
 
@@ -194,9 +194,9 @@ bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data,
 				groupPrefix = "Database%1"; //do not i18n!
 
 			int number = 1;
-			while (config.hasGroup(groupPrefix.tqarg(number))) //a new group key couldn't exist
+			while (config.hasGroup(groupPrefix.arg(number))) //a new group key couldn't exist
 				number++;
-			groupKey = groupPrefix.tqarg(number);
+			groupKey = groupPrefix.arg(number);
 		}
 		if (_groupKey) //return this one (generated or found)
 			*_groupKey = groupKey;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 14651f3f..67e81a5d 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -379,7 +379,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 			<< prevViewMode << " restored." << endl;
 		const Kexi::ObjectStatus status(*this);
 		setStatus(mainWin()->project()->dbConnection(), 
-			i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),"");
+			i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(newViewMode)),"");
 		append( status );
 		m_currentViewMode = prevViewMode;
 		return false;
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 669039cc..49b3c46d 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -54,7 +54,7 @@ class KexiInternalPartManager
 					fullname, 0, fullname);
 				if (!part) {
 					if (msgHdr)
-						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName));
+						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").arg(partName));
 				}
 				else
 					m_parts.insert(partName, part);
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 6671e168..49f1aeab 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -66,7 +66,7 @@ public:
 				singleStatusString.prepend(TQString("\n\n")+i18n("Details:")+" ");
 			if (KMessageBox::No==KMessageBox::questionYesNo(0, 
 				((viewMode == Kexi::DesignViewMode) 
-					? i18n("Object \"%1\" could not be opened in Design View.").tqarg(item.name())
+					? i18n("Object \"%1\" could not be opened in Design View.").arg(item.name())
 					: i18n("Object could not be opened in Data View."))+"\n"
 				+ i18n("Do you want to open it in Text View?") + singleStatusString, 0, 
 				KStdGuiItem::open(), KStdGuiItem::cancel()))
@@ -246,7 +246,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 //	KexiDialogBase *dlg = createInstance(win,item,viewMode);
 //	if (!dlg)
 //		return 0;
-//	TQString capt = TQString("%1 : %2").tqarg(item.name()).tqarg(instanceName());
+//	TQString capt = TQString("%1 : %2").arg(item.name()).arg(instanceName());
 	KexiDialogBase *dlg = new KexiDialogBase(win);
 	dlg->m_supportedViewModes = m_supportedViewModes;
 //	dlg->m_neverSaved = item.neverSaved();
@@ -293,7 +293,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 					i18n("Could not load object's definition."), i18n("Object design may be corrupted."));
 			m_status.append( 
 				Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.")
-				.tqarg(item.name()), TQString()) );
+				.arg(item.name()), TQString()) );
 
 			dlg->close();
 			delete dlg;
@@ -367,7 +367,7 @@ bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQStr
 {
 	if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) {
 		m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), 
-			i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) );
+			i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").arg(dataID) );
 		m_status.append( *dlg );
 		return false;
 	}
@@ -431,7 +431,7 @@ tristate Part::rename(KexiMainWindow *win, KexiPart::Item &item, const TQString&
 GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, const char* nameSuffix)
  : TQObject(part, 
    (part->info()->objectName() 
-    + (nameSuffix ? TQString(":%1").tqarg(nameSuffix) : TQString())).latin1() )
+    + (nameSuffix ? TQString(":%1").arg(nameSuffix) : TQString())).latin1() )
  , KXMLGUIClient(win)
 {
 	if(!win->project()->data()->userMode())
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index f6fcd7d8..d651f8d0 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -131,7 +131,7 @@ Manager::part(Info *i)
 		if(!p) {
 			kdDebug() << "Manager::part(): failed :( (ERROR #" << error << ")" << endl;
 			kdDebug() << "  " << KLibLoader::self()->lastErrorMessage() << endl;
-			i->setBroken(true, i18n("Error while loading plugin \"%1\"").tqarg(i->objectName()));
+			i->setBroken(true, i18n("Error while loading plugin \"%1\"").arg(i->objectName()));
 			setError(i->errorMessage());
 			return 0;
 		}
@@ -198,7 +198,7 @@ Manager::infoForMimeType(const TQString &mimeType)
 	Info *i = mimeType.isEmpty() ? 0 : m_partsByMime[mimeType.latin1()];
 	if (i)
 		return i;
-	setError(i18n("No plugin for mime type \"%1\"").tqarg(mimeType));
+	setError(i18n("No plugin for mime type \"%1\"").arg(mimeType));
 	return 0;
 }
 
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 5b26cb39..1dbe4eef 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -180,7 +180,7 @@ KexiProject::openInternal(bool *incompatibleWithKexi)
 		*incompatibleWithKexi = false;
 	kdDebug() << "KexiProject::open(): " << d->data->databaseName() <<" "<< d->data->connectionData()->driverName  << endl;
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not open project \"%1\".").tqarg(d->data->databaseName()));
+		i18n("Could not open project \"%1\".").arg(d->data->databaseName()));
 	
 	if (!createConnection()) {
 		kdDebug() << "KexiProject::open(): !createConnection()" << endl;
@@ -225,7 +225,7 @@ tristate
 KexiProject::create(bool forceOverwrite)
 {
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not create project \"%1\".").tqarg(d->data->databaseName()));
+		i18n("Could not create project \"%1\".").arg(d->data->databaseName()));
 		
 	if (!createConnection())
 		return false;
@@ -529,9 +529,9 @@ KexiProject::initProject()
 		d->data->setDescription( str );
 /*	KexiDB::RowData data;
 	TQString sql = "select db_value from kexi__db where db_property='%1'";
-	if (d->connection->querySingleRecord( sql.tqarg("project_caption"), data ) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.arg("project_caption"), data ) && !data[0].toString().isEmpty())
 		d->data->setCaption(data[0].toString());
-	if (d->connection->querySingleRecord( sql.tqarg("project_desc"), data) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.arg("project_desc"), data) && !data[0].toString().isEmpty())
 		d->data->setDescription(data[0].toString());*/
 
 	return true;
@@ -736,7 +736,7 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite
 	KexiDialogBase *dlg  = part->openInstance(wnd, item, viewMode, staticObjectArgs);
 	if (!dlg) {
 		if (part->lastOperationStatus().error())
-			setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>"
+			setError(i18n("Opening object \"%1\" failed.").arg(item.name())+"<br>"
 				+part->lastOperationStatus().message, 
 				part->lastOperationStatus().description);
 		return 0;
@@ -817,13 +817,13 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const
 		}
 		if (this->itemForMimeType(item.mimeType(), newName)!=0) {
 			setError( i18n("Could not use this name. Object with name \"%1\" already exists.")
-				.tqarg(newName) );
+				.arg(newName) );
 			return false;
 		}
 	}
 
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not rename object \"%1\".").tqarg(item.name()) );
+		i18n("Could not rename object \"%1\".").arg(item.name()) );
 	if (!checkWritable())
 		return false;
 	KexiPart::Part *part = findPartFor(item);
@@ -960,7 +960,7 @@ KexiProject::createBlankProject(bool &cancelled, KexiProjectData* data,
 		if (KMessageBox::Yes != KMessageBox::warningYesNo(0, "<qt>"+i18n(
 			"The project %1 already exists.\n"
 			"Do you want to replace it with a new, blank one?")
-				.tqarg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
+				.arg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
 			TQString(), KGuiItem(i18n("Replace")), KStdGuiItem::cancel() ))
 //todo add serverInfoString() for server-based prj
 		{
@@ -985,7 +985,7 @@ tristate KexiProject::dropProject(KexiProjectData* data,
 	KexiDB::MessageHandler* handler, bool dontAsk)
 {
 	if (!dontAsk && KMessageBox::Yes != KMessageBox::warningYesNo(0, 
-		i18n("Do you want to drop the project \"%1\"?").tqarg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
+		i18n("Do you want to drop the project \"%1\"?").arg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
 		return cancelled;
 
 	KexiProject prj( new KexiProjectData(*data), handler );
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index 9f0106bc..9b9203c8 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -155,13 +155,13 @@ TQString KexiProjectData::infoString(bool nobr) const
 {
 	if (constConnectionData()->fileName().isEmpty()) {
 		//server-based
-		return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").tqarg(databaseName()) + (nobr ? "</nobr>" : "")
+		return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").arg(databaseName()) + (nobr ? "</nobr>" : "")
 			+ (nobr ? " <nobr>" : " ") + i18n("database connection", "(connection %1)")
-			.tqarg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
+			.arg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
 	}
 	//file-based
 	return TQString(nobr ? "<nobr>" : "") 
-		+ TQString("\"%1\"").tqarg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
+		+ TQString("\"%1\"").arg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
 }
 
 void KexiProjectData::setReadOnly(bool set)
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 04197412..1ba85265 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -149,7 +149,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
 		KAction *a = *it;
 		if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) {
 			//o is not KexiDialogBase or its child:
-			// only tqinvalidate action if it comes from mainwindow's KActionCollection
+			// only invalidate action if it comes from mainwindow's KActionCollection
 			// (thus part-actions are untouched when the focus is e.g. in the Property Editor)
 			continue;
 		}
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index 45df1b0d..65f2e68f 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy)
 
 void KexiViewBase::addChildView( KexiViewBase* childView )
 {
-	m_tqchildren.append( childView );
+	m_children.append( childView );
 	addActionProxyChild( childView );
 	childView->m_parentView = this;
 //	if (m_parentView)
@@ -318,8 +318,8 @@ void KexiViewBase::setAvailable(const char* action_name, bool set)
 void KexiViewBase::updateActions(bool activated)
 {
 	//do nothing here
-	//do the same for tqchildren :)
- 	for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) {
+	//do the same for children :)
+ 	for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) {
 		it.current()->updateActions(activated);
 	}
 }
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 1b2b6f38..564f5a20 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -270,7 +270,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		 Can be useful when single class is used for more than one view (e.g. KexiDBForm). */
 		int m_viewMode;
 
-		TQPtrList<KexiViewBase> m_tqchildren;
+		TQPtrList<KexiViewBase> m_children;
 
 		bool m_dirty : 1;
 
diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index faa8076a..e7470e45 100755
--- a/kexi/doc/dev/CHANGELOG-Kexi-js
+++ b/kexi/doc/dev/CHANGELOG-Kexi-js
@@ -5010,7 +5010,7 @@ doesn't work)
 
 2003-12-03
 - KMDI modes enabled
-- KexiStatusBar introduced
+- KexitStatusBar introduced
 
 2003-11-30
 - KexiDB::Field::isFPNumericType() added
diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
index bfab0a72..0de7a77a 100644
--- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
+++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html
@@ -259,7 +259,7 @@ The following example presents a form where text fields and labels were placed b
 Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
 </p>
 <p>
-Using tqlayout in this form improves tqalignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
+Using tqlayout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
  <br>
  <br><img src="img/05_04_08_form_well_fit.png">
  <br>Example form with tqlayout used<br><br>
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index b7712aa8..7ac415e1 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -83,7 +83,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <property name="text" >
 <string>Name</string>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>WordBreak|AlignBottom</set>
 </property>
 </widget>
@@ -141,7 +141,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <property name="text" >
 <string>Surname</string>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>WordBreak|AlignBottom</set>
 </property>
 </widget>
@@ -157,7 +157,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 <height>70</height>
 </rect>
 </property>
-<property name="tqalignment" >
+<property name="alignment" >
 <set>AlignTop|AlignRight</set>
 </property>
 <property name="storedPixmapId" >
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 241a1291..a2cddd89 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -139,9 +139,9 @@ TQString
 PropertyCommand::name() const
 {
 	if(m_oldvalues.count() >= 2)
-		return i18n("Change \"%1\" property for multiple widgets" ).tqarg(TQString(m_property));
+		return i18n("Change \"%1\" property for multiple widgets" ).arg(TQString(m_property));
 	else
-		return i18n("Change \"%1\" property for widget \"%2\"" ).tqarg(TQString(m_property)).tqarg(TQString(m_oldvalues.begin().key()));
+		return i18n("Change \"%1\" property for widget \"%2\"" ).arg(TQString(m_property)).arg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -435,7 +435,7 @@ AdjustSizeCommand::execute()
 		{
 			for(TQWidget *w = list.first(); w; w = list.next()) {
 				ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
-				if(item && !item->tqchildren()->isEmpty()) { // container
+				if(item && !item->children()->isEmpty()) { // container
 					TQSize s;
 					if(item->container() && item->container()->tqlayout())
 						s = w->sizeHint();
@@ -545,17 +545,17 @@ AdjustSizeCommand::getSizeFromChildren(ObjectTreeItem *item)
 	{
 		TQSize s;
 		// get size for each container, and keep the biggest one
-		for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next())
+		for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next())
 			s = s.expandedTo(getSizeFromChildren(tree));
 		return s;
 	}
 
 	int tmpw = 0, tmph = 0;
-	for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) {
+	for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) {
 		if(!tree->widget())
 			continue;
-		tmpw = TQMAX(tmpw, tree->widget()->tqgeometry().right());
-		tmph = TQMAX(tmph, tree->widget()->tqgeometry().bottom());
+		tmpw = TQMAX(tmpw, tree->widget()->geometry().right());
+		tmph = TQMAX(tmph, tree->widget()->geometry().bottom());
 	}
 
 	return TQSize(tmpw, tmph) + TQSize(10, 10);
@@ -621,9 +621,9 @@ LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCSt
 	if (!titem)
 		return; //better this than a crash
 	Container *m_container = titem->container();
-	// We save the tqgeometry of each wigdet
-	for(ObjectTreeItem *it = m_container->objectTree()->tqchildren()->first(); it; it = m_container->objectTree()->tqchildren()->next())
-		m_geometries.insert(it->name().latin1(), it->widget()->tqgeometry());
+	// We save the geometry of each wigdet
+	for(ObjectTreeItem *it = m_container->objectTree()->children()->first(); it; it = m_container->objectTree()->children()->next())
+		m_geometries.insert(it->name().latin1(), it->widget()->geometry());
 }
 
 void
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
 TQString
 LayoutPropertyCommand::name() const
 {
-	return i18n("Change tqlayout of widget \"%1\"").tqarg(TQString(m_oldvalues.begin().key()));
+	return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -740,7 +740,7 @@ InsertWidgetCommand::execute()
 		WidgetInfo *winfo = m_container->form()->library()->widgetInfoForClassName(m_class);
 		KMessageBox::sorry(FormManager::self()->activeForm() ? FormManager::self()->activeForm()->widget() : 0,
 				i18n("Could not insert widget of type \"%1\". A problem with widget's creation encountered.")
-				.tqarg(winfo ? winfo->name() : TQString()));
+				.arg(winfo ? winfo->name() : TQString()));
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
@@ -830,7 +830,7 @@ TQString
 InsertWidgetCommand::name() const
 {
 	if(!m_name.isEmpty())
-		return i18n("Insert widget \"%1\"").tqarg(TQString(m_name));
+		return i18n("Insert widget \"%1\"").arg(TQString(m_name));
 	else
 		return i18n("Insert widget");
 }
@@ -867,7 +867,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	m_list->sort(); // we sort them now, before creating the tqlayout
 
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
-		m_pos.insert(w->name(), w->tqgeometry());
+		m_pos.insert(w->name(), w->geometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
 	if(item && item->parent()->container())
 		m_containername = item->parent()->name();
@@ -912,7 +912,7 @@ CreateLayoutCommand::execute()
 
 	container->setSelectedWidget(0, false);
 	w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
-	// sizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry
+	// sizeHint of these widgets depends on geometry, so give them appropriate geometry
 	if(m_type == Container::HFlow)
 		w->resize( TQSize(700, 20) );
 	else if(m_type == Container::VFlow)
@@ -1019,7 +1019,7 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_form = container->form();
 	m_type = container->layoutType();
 
-	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next())
+	for(ObjectTreeItem *tree = container->objectTree()->children()->first(); tree; tree = container->objectTree()->children()->next())
 	{
 		TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size());
 		m_pos.insert(tree->widget()->name(), r);
@@ -1041,7 +1041,7 @@ BreakLayoutCommand::unexecute()
 TQString
 BreakLayoutCommand::name() const
 {
-	return i18n("Break Layout: \"%1\"").tqarg(m_name);
+	return i18n("Break Layout: \"%1\"").arg(m_name);
 }
 
 void
@@ -1208,7 +1208,7 @@ PasteWidgetCommand::changePos(TQDomElement &el, const TQPoint &newpos)
 {
 	//TQDomElement el = widg.cloneNode(true).toElement();
 	TQDomElement rect;
-	// Find the widget tqgeometry if there is one
+	// Find the widget geometry if there is one
 	for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		if((n.toElement().tagName() == "property") && (n.toElement().attribute("name") == "geometry"))
@@ -1253,7 +1253,7 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container)
 	if(!w)
 		return;
 
-	while((w->tqgeometry() == r) && (w != 0))// there is already a widget there, with the same size
+	while((w->geometry() == r) && (w != 0))// there is already a widget there, with the same size
 	{
 		w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
@@ -1302,7 +1302,7 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T
 
 	TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false);
 
-	while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size
+	while(w && (w->geometry() == r))// there is already a widget there, with the same size
 	{
 		w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index 64e5a253..ad468261 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -105,7 +105,7 @@ class KFORMEDITOR_EXPORT GeometryPropertyCommand : public Command
 
 /*! This command is used when an item in 'Align Widgets position' is selected. You just need
 to give the list of widget names (the selected ones), and the
-  type of tqalignment (see the enum for possible values). */
+  type of alignment (see the enum for possible values). */
 class KFORMEDITOR_EXPORT AlignWidgetsCommand : public Command
 {
 	public:
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 38b6e08e..e1dcf1be 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -334,7 +334,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item)
 	{
 		if( !item || (*item)[i].toString().isEmpty())
 		{
-			setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").tqarg(m_data->column(i)->captionAliasOrName()),
+			setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").arg(m_data->column(i)->captionAliasOrName()),
 				item);
 			return;
 		}
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index d1275adc..706ef69b 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -73,7 +73,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev)
 		}
 	}
 //	else if(ev->type() == TQEvent::ChildInserted) {
-		// widget's tqchildren have changed, we need to reinstall filter
+		// widget's children have changed, we need to reinstall filter
 //		installRecursiveEventFilter(m_widget, this);
 //	}
 
@@ -180,7 +180,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 						unSelectWidget(m_moving);
 					else // the widget is the only selected, so it means we want to copy it
 					{
-						//m_copyRect = m_moving->tqgeometry();
+						//m_copyRect = m_moving->geometry();
 						m_state = CopyingWidget;
 						if(m_form->formWidget())
 							m_form->formWidget()->initBuffer();
@@ -408,7 +408,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 				ObjectTreeItem *item = form()->objectTree()->lookup(form()->selectedWidgets()->first()->name());
 				if(!item || !item->parent())
 					return true;
-				ObjectTreeList *list = item->parent()->tqchildren();
+				ObjectTreeList *list = item->parent()->children();
 				if(list->count() == 1)
 					return true;
 				int index = list->findRef(item);
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
 			return;
 		}
 	}
-	m_container->setGeometry(m_container->tqgeometry()); // just update tqlayout
+	m_container->setGeometry(m_container->geometry()); // just update tqlayout
 	m_layout->activate();
 }
 
@@ -656,7 +656,7 @@ Container::createBoxLayout(WidgetList *list)
 {
 	TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		list->append( tree->widget());
 	list->sort();
 
@@ -669,7 +669,7 @@ void
 Container::createFlowLayout()
 {
 	KexiFlowLayout *flow = dynamic_cast<KexiFlowLayout*>(m_layout);
-	if(!flow || m_tree->tqchildren()->isEmpty())
+	if(!flow || m_tree->children()->isEmpty())
 		return;
 
 	const int offset = 15;
@@ -684,7 +684,7 @@ Container::createFlowLayout()
 	}
 
 	// fill the list
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		list->append( tree->widget());
 	list->sort();
 
@@ -741,11 +741,11 @@ Container::createGridLayout(bool testOnly)
 	int end=-1000;
 	bool same = false;
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		vlist->append( tree->widget());
 	vlist->sort();
 
-	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		hlist->append( tree->widget());
 	hlist->sort();
 
@@ -759,19 +759,19 @@ Container::createGridLayout(bool testOnly)
 
 			for(; it2.current() != 0; ++it2) {
 				TQWidget *nextw = it2.current();
-				if((w->y() >= nextw->y()) || (nextw->y() >= w->tqgeometry().bottom()))
+				if((w->y() >= nextw->y()) || (nextw->y() >= w->geometry().bottom()))
 					break;
 
-				if(!w->tqgeometry().intersects(nextw->tqgeometry()))
+				if(!w->geometry().intersects(nextw->geometry()))
 					break;
 				// If the geometries of the two widgets intersect each other,
 				// we move one of the widget to the rght or bottom of the other
 				if((nextw->y() - w->y()) > abs(nextw->x() - w->x()))
-					nextw->move(nextw->x(), w->tqgeometry().bottom()+1);
+					nextw->move(nextw->x(), w->geometry().bottom()+1);
 				else if(nextw->x() >= w->x())
-					nextw->move(w->tqgeometry().right()+1, nextw->y());
+					nextw->move(w->geometry().right()+1, nextw->y());
 				else
-					w->move(nextw->tqgeometry().right()+1, nextw->y());
+					w->move(nextw->geometry().right()+1, nextw->y());
 			}
 		}
 	}
@@ -782,7 +782,7 @@ Container::createGridLayout(bool testOnly)
 		TQWidget *w = it.current();
 		WidgetListIterator it2 = it;
 		if(!same) { // this widget will make a new row
-			end = w->tqgeometry().bottom();
+			end = w->geometry().bottom();
 			rows.append(w->y());
 		}
 
@@ -796,9 +796,9 @@ Container::createGridLayout(bool testOnly)
 		if(nextw->y() >= end)
 			same = false;
 		else {
-			same = !(same && (nextw->y() >= w->tqgeometry().bottom()));
+			same = !(same && (nextw->y() >= w->geometry().bottom()));
 			if(!same)
-				end = w->tqgeometry().bottom();
+				end = w->geometry().bottom();
 		}
 	}
 	kdDebug() << "the new grid will have n rows: n == " << rows.size() << endl;
@@ -811,7 +811,7 @@ Container::createGridLayout(bool testOnly)
 		TQWidget *w = it.current();
 		WidgetListIterator it2 = it;
 		if(!same) {
-			end = w->tqgeometry().right();
+			end = w->geometry().right();
 			cols.append(w->x());
 		}
 
@@ -823,9 +823,9 @@ Container::createGridLayout(bool testOnly)
 		if(nextw->x() >= end)
 			same = false;
 		else {
-			same = !(same && (nextw->x() >= w->tqgeometry().right()));
+			same = !(same && (nextw->x() >= w->geometry().right()));
 			if(!same)
-				end = w->tqgeometry().right();
+				end = w->geometry().right();
 		}
 	}
 	kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
@@ -841,7 +841,7 @@ Container::createGridLayout(bool testOnly)
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
-		TQRect r = w->tqgeometry();
+		TQRect r = w->geometry();
 		uint wcol=0, wrow=0, endrow=0, endcol=0;
 		uint i = 0;
 
@@ -971,7 +971,7 @@ Container::drawConnection(TQMouseEvent *mev)
 	{
 		FormManager::self()->createdConnection()->setReceiver(m_moving->name());
 		FormManager::self()->createSlotMenu(m_moving);
-		m_container->tqrepaint();
+		m_container->repaint();
 		return;
 	}
 	// the user clicked outside the menu, we cancel the connection
@@ -997,12 +997,12 @@ Container::drawSelectionRect(TQMouseEvent *mev)
 	setSelectedWidget(m_container, false);
 	TQWidget *widgetToSelect = 0;
 	// We check which widgets are in the rect and select them
-	for(ObjectTreeItem *item = m_tree->tqchildren()->first(); item; item = m_tree->tqchildren()->next())
+	for(ObjectTreeItem *item = m_tree->children()->first(); item; item = m_tree->children()->next())
 	{
 		TQWidget *w = item->widget();
 		if(!w)
 			continue;
-		if(w->tqgeometry().intersects(r) && w != m_container) {
+		if(w->geometry().intersects(r) && w != m_container) {
 			if (widgetToSelect)
 				setSelectedWidget(widgetToSelect, true/*add*/, false/*raise*/, true/*moreWillBeSelected*/);
 			widgetToSelect = w; //select later
@@ -1013,7 +1013,7 @@ Container::drawSelectionRect(TQMouseEvent *mev)
 
 	m_insertRect = TQRect();
 	m_state = DoingNothing;
-	m_container->tqrepaint();
+	m_container->repaint();
 }
 
 void
@@ -1070,7 +1070,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev)
 		//FormManager::self()->undo(); // undo last moving
 		//m_moving->move(m_initialPos);
 		if(m_form->formWidget())  {
-			m_container->tqrepaint();
+			m_container->repaint();
 			m_form->formWidget()->initBuffer();
 		}
 		m_state = CopyingWidget;
@@ -1081,7 +1081,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev)
 	if(m_form->formWidget())  {
 		TQValueList<TQRect> rectList;
 		for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) {
-			TQRect drawRect = w->tqgeometry();
+			TQRect drawRect = w->geometry();
 			TQPoint p = mev->pos() - m_grab;
 			drawRect.moveBy(p.x(), p.y());
 			p = m_container->mapTo(m_form->widget(), TQPoint(0, 0));
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 2e30d5f4..e41e5613 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -256,7 +256,7 @@ InsertPageCommand::execute()
 	if(classname == "KFDTabWidget")
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
-		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
+		TQString n = i18n("Page %1").arg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
 
@@ -455,7 +455,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
 	wSplitter->setName(i18n("Splitter"));
 	wSplitter->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter"));
-	wSplitter->setDescription(i18n("A container that enables user to resize its tqchildren"));
+	wSplitter->setDescription(i18n("A container that enables user to resize its children"));
 	addClass(wSplitter);
 
 	KFormDesigner::WidgetInfo *wHFlow = new KFormDesigner::WidgetInfo(this);
@@ -682,7 +682,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
 		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) );
-//		if( ((TQWidgetStack*)m_widget)->tqchildren()->count() == 4) // == the stack has only one page
+//		if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
@@ -872,8 +872,8 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos)
 	if(!tab)
 		return;
 
-	KFormDesigner::ObjectTreeItem *item = tab->tqchildren()->take(oldpos);
-	tab->tqchildren()->insert(newpos, item);
+	KFormDesigner::ObjectTreeItem *item = tab->children()->take(oldpos);
+	tab->children()->insert(newpos, item);
 }
 
 void ContainerFactory::addStackPage()
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index afc37086..2607fcca 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -492,7 +492,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	if(classname == "KLineEdit")
 	{
 		KLineEdit *lineedit = static_cast<KLineEdit*>(w);
-		createEditor(classname, lineedit->text(), lineedit, container, lineedit->tqgeometry(), lineedit->tqalignment(), true);
+		createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true);
 		return true;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
@@ -505,7 +505,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 			editText();
 		}
 		else
-			createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(classname, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	else if(classname == "KPushButton")
@@ -531,7 +531,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
 	{
 		TQCheckBox *check = static_cast<TQCheckBox*>(w);
-		//TQRect r(check->tqgeometry());
+		//TQRect r(check->geometry());
 		//r.setX(r.x() + 20);
 		TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w);
 		TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
@@ -860,7 +860,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
 	}
 	else if(classname == "KexiPictureLabel")
 	{
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 237c7ec8..6ed3e570 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -365,7 +365,7 @@ Form::changeName(const TQCString &oldname, const TQCString &newname)
 	if(!d->topTree->rename(oldname, newname)) // rename failed
 	{
 		KMessageBox::sorry(widget()->topLevelWidget(),
-			i18n("Renaming widget \"%1\" to \"%2\" failed.").tqarg(TQString(oldname)).tqarg(TQString(newname)));
+			i18n("Renaming widget \"%1\" to \"%2\" failed.").arg(TQString(oldname)).arg(TQString(newname)));
 //moved to WidgetPropertySet::slotChangeProperty()
 //		KMessageBox::sorry(widget()->topLevelWidget(),
 //		i18n("A widget with this name already exists. "
@@ -499,7 +499,7 @@ void collectContainers(ObjectTreeItem* item, TQPtrDict<char>& containers)
 			<< " " << item->container()->objectTree()->name() << endl;
 		containers.insert( item->container(), (const char *)1 );
 	}
-	for (ObjectTreeListIterator it(*item->tqchildren()); it.current(); ++it)
+	for (ObjectTreeListIterator it(*item->children()); it.current(); ++it)
 		collectContainers(it.current(), containers);
 }
 
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 7df731c6..9bb68925 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -67,7 +67,7 @@ class KFORMEDITOR_EXPORT FormWidget
 		/*! This function inits the buffer used for double-buffering. Called before drawing rect. */
 		virtual void initBuffer() = 0;
 
-		/*! Clears the form, ie pastes the whole buffer to tqrepaint the Form. */
+		/*! Clears the form, ie pastes the whole buffer to repaint the Form. */
 		virtual void clearForm() = 0;
 
 		/*! This function highlights two widgets (to is optional), which are
@@ -109,7 +109,7 @@ class FormPrivate
 
 		PixmapCollection  *pixcollection;
 
-		//! This map is used to store cursor tqshapes before inserting (so we can restore them later)
+		//! This map is used to store cursor shapes before inserting (so we can restore them later)
 		TQMap<TQObject*,TQCursor> cursors;
 
 		//!This string list is used to store the widgets which hasMouseTracking() == true (eg lineedits)
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 24347c40..9161049d 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -621,7 +621,7 @@ FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant
 		case TQVariant::Cursor:
 		{
 			type = parent.createElement("cursor");
-			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
+			valueE = parent.createTextNode(TQString::number(value.toCursor().shape()));
 			type.appendChild(valueE);
 			break;
 		}
@@ -964,14 +964,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 
 	savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	// Important: save dataSource property FIRST before properties like "tqalignment"
+	// Important: save dataSource property FIRST before properties like "alignment"
 	// - needed when subproperties are defined after subwidget creation, and subwidget is created after setting "dataSource"
 	//   (this is the case for KexiDBAutoField)
 //! @todo more properties like "dataSource" may needed here...
 //	if (-1 != item->widget()->metaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+	// We don't want to save the geometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
 	if(item && !item->parent()) {
 		// save form widget size, but not its position
 		savePropertyValue(tclass, domDoc, "geometry",
@@ -992,10 +992,10 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 	for(TQMap<TQString,TQVariant>::ConstIterator it = map->constBegin(); it != endIt; ++it)
 	{
 		const TQCString name( it.key().latin1() );
-		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "tqalignment") {
+		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "alignment") {
 			if(!savedAlignment) // not to save it twice
 			{
-				savePropertyValue(tclass, domDoc, "tqalignment", item->widget()->property("tqalignment"), item->widget());
+				savePropertyValue(tclass, domDoc, "alignment", item->widget()->property("alignment"), item->widget());
 				savedAlignment = true;
 			}
 		}
@@ -1038,13 +1038,13 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		case Container::Grid: // grid tqlayout
 		{
 			tqlayout.setTagName("grid");
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
 				saveWidget(objIt, tqlayout, domDoc, true);
 			break;
 		}
 		case Container::HBox: case Container::VBox:
 		{
-			// as we don't save tqgeometry, we need to sort widgets in the right order, not creation order
+			// as we don't save geometry, we need to sort widgets in the right order, not creation order
 			WidgetList *list;
 			if(tqlayout.tagName() == "hbox") {
 				list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
@@ -1055,7 +1055,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 				tqlayout.setTagName("vbox");
 			}
 
-			for(ObjectTreeItem *objTree = item->tqchildren()->first(); objTree; objTree = item->tqchildren()->next())
+			for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
 				list->append(objTree->widget());
 			list->sort();
 
@@ -1090,7 +1090,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		}
 		default:
 		{
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
 				saveWidget(objIt, tclass, domDoc);
 		}
 	}
@@ -1391,7 +1391,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			{
 				TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) );
 				if(name == "geometry" && dynamic_cast<FormWidget*>(w)) {
-					//fix tqgeometry if needed - this is top level form widget
+					//fix geometry if needed - this is top level form widget
 					TQRect r( val.toRect() );
 					if (r.left()<0) //negative X!
 						r.moveLeft(0);
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 5fb76ca8..f75a4232 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -413,7 +413,7 @@ FormManager::resetCreatedConnection()
 		m_active->formWidget()->clearForm();
 	}
 	if (m_active && m_active->widget())
-		m_active->widget()->tqrepaint();
+		m_active->widget()->repaint();
 }
 
 void
@@ -863,14 +863,14 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	if(!multiple)
 	{
 		if(w == container->form()->widget())
-			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").tqarg(w->name()) );
+			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").arg(w->name()) );
 		else
 			m_popup->insertTitle( SmallIcon(
 				container->form()->library()->iconName(w->className())), TQString(w->name()) + " : " + n );
 	}
 	else
 		m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets")
-		+ TQString(" (%1)").tqarg(widgetsCount));
+		+ TQString(" (%1)").arg(widgetsCount));
 
 	KAction *a;
 #define PLUG_ACTION(_name, forceVisible) \
@@ -1380,9 +1380,9 @@ FormManager::selectAll()
 		return;
 
 	activeForm()->selectFormWidget();
-	uint count = activeForm()->objectTree()->tqchildren()->count();
-	for(ObjectTreeItem *it = activeForm()->objectTree()->tqchildren()->first(); it; 
-		it = activeForm()->objectTree()->tqchildren()->next(), count--)
+	uint count = activeForm()->objectTree()->children()->count();
+	for(ObjectTreeItem *it = activeForm()->objectTree()->children()->first(); it; 
+		it = activeForm()->objectTree()->children()->next(), count--)
 	{
 		activeForm()->setSelectedWidget(it->widget(), /*add*/true, /*raise*/false, /*moreWillBeSelected*/count>1);
 	}
@@ -1550,7 +1550,7 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
+	const bool hasChildren = !form->objectTree()->children()->isEmpty();
 
 	// Layout actions
 	enableAction("layout_menu", hasChildren);
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index a43100ff..f5c72d73 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -221,13 +221,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		bool isRedoing() const { return m_isRedoing; }
 
 	public slots:
-		/*! Deletes the selected widget in active Form and all of its tqchildren. */
+		/*! Deletes the selected widget in active Form and all of its children. */
 		void deleteWidget();
 
-		/*! Copies the slected widget and all its tqchildren of the active Form using an XML representation. */
+		/*! Copies the slected widget and all its children of the active Form using an XML representation. */
 		void copyWidget();
 
-		/*! Cuts (ie Copies and deletes) the selected widget and all its tqchildren of
+		/*! Cuts (ie Copies and deletes) the selected widget and all its children of
 		 the active Form using an XML representation. */
 		void cutWidget();
 
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index e2ada714..fa86e804 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -64,14 +64,14 @@ ObjectTreeItem::rename(const TQString &name)
 void
 ObjectTreeItem::addChild(ObjectTreeItem *c)
 {
-	m_tqchildren.append(c);
+	m_children.append(c);
 	c->setParent(this);
 }
 
 void
 ObjectTreeItem::removeChild(ObjectTreeItem *c)
 {
-	m_tqchildren.remove(c);
+	m_children.remove(c);
 }
 
 void
@@ -141,10 +141,10 @@ ObjectTree::ObjectTree(const TQString &classn, const TQString &name, TQWidget *w
 
 ObjectTree::~ObjectTree()
 {
-//	for(ObjectTreeItem *it = tqchildren()->first(); it; it = tqchildren()->next())
+//	for(ObjectTreeItem *it = children()->first(); it; it = children()->next())
 //		removeItem(it->name());
-	while (tqchildren()->first()) {
-		removeItem(tqchildren()->first());
+	while (children()->first()) {
+		removeItem(children()->first());
 	}
 }
 
@@ -216,7 +216,7 @@ ObjectTree::removeItem(ObjectTreeItem *c)
 	if (m_container && m_container->form())
 		m_container->form()->emitChildRemoved(c);
 
-	for(ObjectTreeItem *it = c->tqchildren()->first(); it; it = c->tqchildren()->next())
+	for(ObjectTreeItem *it = c->children()->first(); it; it = c->children()->next())
 		removeItem(it->name());
 
 	m_treeDict.remove(c->name());
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index b37d7caa..eaa95a0c 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -58,7 +58,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 
 /*! 
  @short An item representing a widget
- Holds the properties of a widget (classname, name, parent, tqchildren ..).
+ Holds the properties of a widget (classname, name, parent, children ..).
  @author Lucijan Busch <lucijan@kde.org>
  */
 class KFORMEDITOR_EXPORT ObjectTreeItem
@@ -72,7 +72,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQWidget* widget() const { return m_widget; }
 		EventEater* eventEater() const { return m_eater; }
 		ObjectTreeItem* parent() const { return m_parent; }
-		ObjectTreeList* tqchildren() { return &m_tqchildren; }
+		ObjectTreeList* children() { return &m_children; }
 
 		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
 		  The TQVariant is the old value (ie first value) of the property whose name is the TQString. */
@@ -121,7 +121,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 	protected:
 		TQString m_className;
 		TQString m_name;
-		ObjectTreeList	m_tqchildren;
+		ObjectTreeList	m_children;
 		TQGuardedPtr<Container> m_container;
 		TQMap<TQString, TQVariant> m_props;
 		TQMap<TQString, TQVariant> *m_subprops;
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index ba48214b..82cb67bb 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -367,7 +367,7 @@ ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent)
 		last = last->nextSibling();
 	treeItem->moveItem(last);
 
-	ObjectTreeList *list = item->tqchildren();
+	ObjectTreeList *list = item->children();
 	for(ObjectTreeItem *it = list->first(); it; it = list->next())
 		loadTree(it, treeItem);
 
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index e3b73975..a8605e7b 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -168,7 +168,7 @@ RichTextDialog::cursorPositionChanged(int, int)
 	m_toolbar->setButton(TBUnder, m_edit->underline());
 
 	int id = 0;
-	switch(m_edit->tqalignment())
+	switch(m_edit->alignment())
 	{
 		case TQt::AlignLeft:    id = TBLeft; break;
 		case TQt::AlignCenter:  id = TBCenter; break;
diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h
index 25150873..f5ae41ea 100644
--- a/kexi/formeditor/richtextdialog.h
+++ b/kexi/formeditor/richtextdialog.h
@@ -30,7 +30,7 @@ class KColorCombo;
 namespace KFormDesigner {
 
 //! A simple dialog to edit rich text
-/*! It allows to change font name, style and color, tqalignment. */
+/*! It allows to change font name, style and color, alignment. */
 class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
 {
 	Q_OBJECT
diff --git a/kexi/formeditor/scripting/formscript.cpp b/kexi/formeditor/scripting/formscript.cpp
index 1123e093..aa32bc02 100644
--- a/kexi/formeditor/scripting/formscript.cpp
+++ b/kexi/formeditor/scripting/formscript.cpp
@@ -71,7 +71,7 @@ FormScript::execute(const TQString &functionName)
 		m_script->callFunction(functionName);
 	}
 	catch(Kross::Api::Exception& e) {
-		kdDebug() << TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) << endl;
+		kdDebug() << TQString("EXCEPTION type='%1' description='%2'").arg(e.type()).arg(e.description()) << endl;
 		return false;
 	}
 	return true;
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 074b8810..3e0651b1 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -47,7 +47,7 @@ Spring::setOrientation(Qt::Orientation orient)
 	SizeType type = sizeType();
 	m_orient = orient;
 	setSizeType(type);
-	tqrepaint();
+	repaint();
 }
 
 Spring::SizeType
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 09549ddc..1a7b7dda 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -323,7 +323,7 @@ KFormDesignerKDevPart::closeForm(Form *form)
 {
 	int res = KMessageBox::warningYesNoCancel( m_workspace->topLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -535,13 +535,13 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart()
 
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 386bdabf..07e7edfd 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -344,7 +344,7 @@ KFormDesignerPart::closeForm(Form *form)
 {
 	int res = KMessageBox::questionYesNoCancel( m_workspace->topLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -451,7 +451,7 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
+	const bool hasChildren = !form->objectTree()->children()->isEmpty();
 
 	// Layout actions
 	ENABLE_ACTION("layout_menu", hasChildren);
@@ -558,14 +558,14 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text)
 
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
-	w->tqrepaint();
+	w->repaint();
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -663,7 +663,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp
index 85e93204..53a9a15b 100644
--- a/kexi/formeditor/utils.cpp
+++ b/kexi/formeditor/utils.cpp
@@ -88,7 +88,7 @@ void
 KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form)
 {
 	ObjectTreeItem *tree = form->objectTree()->lookup(w->name());
-	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->isEmpty())
+	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty())
 		&& !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)
 		) //fix weird behaviour
 		return; // if the user has set a cursor for this widget or this is a container, don't change it
@@ -108,7 +108,7 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 	int tmpw = 0, tmph = 0;
 	TQObjectList *list = w->queryList(inheritClass, 0, false, false);
 	for(TQObject *o = list->first(); o; o = list->next()) {
-		TQRect  r = ((TQWidget*)o)->tqgeometry();
+		TQRect  r = ((TQWidget*)o)->geometry();
 		tmpw = TQMAX(tmpw, r.right());
 		tmph = TQMAX(tmph, r.bottom());
 	}
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index 5107b45c..d6d56acb 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -94,18 +94,18 @@ class VerWidgetList : public WidgetList
 KFORMEDITOR_EXPORT void removeChildrenFromList(WidgetList &list);
 
 /*! This helper function install an event filter on \a object and all of its
-  tqchildren, directed to \a container.
+  children, directed to \a container.
   This is necessary to filter events for composed widgets. */
 KFORMEDITOR_EXPORT void installRecursiveEventFilter(TQObject *object, TQObject *container);
 
 /*! This helper function removes an event filter installed before
-  on \a object and all of its tqchildren.
+  on \a object and all of its children.
   This is necessary to filter events for composed widgets. */
 KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *container);
 
 KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form);
 
-/*! \return the size of \a w tqchildren. This can be used eg to get widget's sizeHint. */
+/*! \return the size of \a w children. This can be used eg to get widget's sizeHint. */
 KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING);
 
 }
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 61688ac6..9bec64ba 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -183,7 +183,7 @@ void WidgetFactory::hideClass(const char *classname)
 
 void
 WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
-	TQWidget *w, Container *container, TQRect tqgeometry,
+	TQWidget *w, Container *container, TQRect geometry,
 	int align, bool useFrame, bool multiLine, BackgroundMode background)
 {
 //#ifdef KEXI_KTEXTEDIT
@@ -198,7 +198,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->setPalette(w->palette());
 		textedit->setFont(w->font());
 		textedit->setResizePolicy(TQScrollView::Manual);
-		textedit->setGeometry(tqgeometry);
+		textedit->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			textedit->setBackgroundMode(w->backgroundMode());
 		else
@@ -232,7 +232,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		editor->setAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
-		editor->setGeometry(tqgeometry);
+		editor->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			editor->setBackgroundMode(w->backgroundMode());
 		else
@@ -317,7 +317,7 @@ WidgetFactory::editList(TQWidget *w, TQStringList &list)
 	KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(w->name()), &dialog, "editlist");
 	dialog.setMainWidget(edit);
 	edit->insertStringList(list);
 //	edit->show();
@@ -456,7 +456,7 @@ WidgetFactory::resetEditor()
 	if(m_widget)
 	{
 		disconnect(m_widget, 0, this, 0);
-		m_widget->tqrepaint();
+		m_widget->repaint();
 	}
 
 //js	delete m_handles;
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 9e585625..7c9c5ceb 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -384,10 +384,10 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 
 		/*! This function creates a KLineEdit to input some text and edit a widget's contents.
 		 This can be used in startEditing(). \a text is the text to display by default
-		  in the line edit, \a w is the edited widget, \a tqgeometry is the tqgeometry the new line
+		  in the line edit, \a w is the edited widget, \a geometry is the geometry the new line
 		   edit should have, and \a align is TQt::AlignmentFlags of the new line edit. */
 		void createEditor(const TQCString &classname, const TQString &text,
-			TQWidget *w, Container *container, TQRect tqgeometry,
+			TQWidget *w, Container *container, TQRect geometry,
 			int align, bool useFrame=false, bool multiLine = false,
 			BackgroundMode background = TQt::NoBackground);
 
@@ -403,7 +403,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 into \a list when the user presses "Ok".*/
 		bool editList(TQWidget *w, TQStringList &list);
 
-		/*! This function creates a little editor to modify rich text. It supports tqalignment,
+		/*! This function creates a little editor to modify rich text. It supports alignment,
 		 subscript and superscript and all basic formatting properties.
 		  If the user presses "Ok", the edited text is put in \a text.
 		  If he presses "Cancel", nothing happens. */
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 9a680db5..953b220b 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -219,8 +219,8 @@ WidgetLibrary::lookupFactories()
 		if (KFormDesigner::version()!=factoryVersion) {
 			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" 
 				" has version '%2' but required Widget Factory version is '%3'\n"
-				" -- skipping this factory!").tqarg(ptr->library()).tqarg(factoryVersion)
-				.tqarg(KFormDesigner::version()) << endl;
+				" -- skipping this factory!").arg(ptr->library()).arg(factoryVersion)
+				.arg(KFormDesigner::version()) << endl;
 			continue;
 		}
 		d->services.insert(ptr->library().latin1(), new KService::Ptr( ptr ));
@@ -739,7 +739,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
 
 	KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup");
-	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name()));
+	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name()));
 	popup->insertItem(iconHorizontal, textHorizontal, 1);
 	popup->insertItem(iconVertical, textVertical, 2);
 	popup->insertSeparator();
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 5ed8f96d..8d7d7daf 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -253,7 +253,7 @@ WidgetPropertySet::addWidget(TQWidget *w)
 		//second widget, update metainfo
 		d->set["this:className"].setValue("special:multiple");
 		d->set["this:classString"].setValue(
-			i18n("Multiple Widgets") + TQString(" (%1)").tqarg(d->widgets.count()) );
+			i18n("Multiple Widgets") + TQString(" (%1)").arg(d->widgets.count()) );
 		d->set["this:iconName"].setValue("multiple_obj");
 		//name doesn't make sense for now
 		d->set["name"].setValue("");
@@ -328,7 +328,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd();
 
 			if(meta->isEnumType()) {
-				if(qstrcmp(propertyName, "tqalignment") == 0)  {
+				if(qstrcmp(propertyName, "alignment") == 0)  {
 					createAlignProperty(meta, w, subwidget);
 					continue;
 				}
@@ -678,7 +678,7 @@ WidgetPropertySet::isNameValid(const TQString &name)
 		KMessageBox::sorry(KFormDesigner::FormManager::self()->activeForm()->widget(),
 			i18n("Could not rename widget \"%1\" to \"%2\" because "
 			"\"%3\" is not a valid name (identifier) for a widget.\n")
-			.tqarg(w->name()).tqarg(name).tqarg(name));
+			.arg(w->name()).arg(name).arg(name));
 		d->slotPropertyChangedEnabled = false;
 		d->set["name"].resetValue();
 		d->slotPropertyChangedEnabled = true;
@@ -689,7 +689,7 @@ WidgetPropertySet::isNameValid(const TQString &name)
 		KMessageBox::sorry( KFormDesigner::FormManager::self()->activeForm()->widget(),
 			i18n("Could not rename widget \"%1\" to \"%2\" "
 			"because a widget with the name \"%3\" already exists.\n")
-			.tqarg(w->name()).tqarg(name).tqarg(name));
+			.arg(w->name()).arg(name).arg(name));
 		d->slotPropertyChangedEnabled = false;
 		d->set["name"].resetValue();
 		d->slotPropertyChangedEnabled = true;
@@ -740,7 +740,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev)
 			if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion
 				return false;
 
-			d->set["geometry"] = TQT_TQWIDGET(o)->tqgeometry();
+			d->set["geometry"] = TQT_TQWIDGET(o)->geometry();
 		}
 	}
 	else if(d->widgets.count() > 1 && ev->type() == TQEvent::Move) // the widget is being moved, we update the property
@@ -775,8 +775,8 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 
 	TQStringList list;
 	TQString value;
-	const int tqalignment = subwidget->property("tqalignment").toInt();
-	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(tqalignment) ) );
+	const int alignment = subwidget->property("alignment").toInt();
+	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(alignment) ) );
 
 	TQStrList *enumKeys = new TQStrList(meta->enumKeys());
 	const TQStringList possibleValues( TQStringList::fromStrList(*enumKeys) );
@@ -786,7 +786,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 	bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(widget);
 
 	if(possibleValues.find("AlignHCenter")!=possibleValues.constEnd())  {
-		// Create the horizontal tqalignment property
+		// Create the horizontal alignment property
 		if(keys.find("AlignHCenter")!=keys.constEnd() || keys.find("AlignCenter")!=keys.constEnd())
 			value = "AlignHCenter";
 		else if(keys.find("AlignRight")!=keys.constEnd())
@@ -812,7 +812,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 
 	if(possibleValues.find("AlignTop")!=possibleValues.constEnd())
 	{
-		// Create the ver tqalignment property
+		// Create the ver alignment property
 		if(keys.find("AlignTop")!=keys.constEnd())
 			value = "AlignTop";
 		else if(keys.find("AlignBottom")!=keys.constEnd())
@@ -837,7 +837,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid
 	) {
 		// Create the wordbreak property
 		KoProperty::Property *p = new KoProperty::Property("wordbreak", 
-			TQVariant(tqalignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );
+			TQVariant(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );
 		d->set.addProperty(p);
 		updatePropertyValue(tree, "wordbreak");
 		if (!KFormDesigner::FormManager::self()->activeForm()->library()->isPropertyVisible(
@@ -865,9 +865,9 @@ WidgetPropertySet::saveAlignProperty(const TQString &property)
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(
 		(TQWidget*)d->widgets.first() );
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first();
-	int count = subwidget->metaObject()->findProperty("tqalignment", true);
+	int count = subwidget->metaObject()->findProperty("alignment", true);
 	const TQMetaProperty *meta = subwidget->metaObject()->property(count, true);
-	subwidget->setProperty("tqalignment", meta->keysToValue(list));
+	subwidget->setProperty("alignment", meta->keysToValue(list));
 
 	ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(
 		d->widgets.first()->name() );
@@ -877,11 +877,11 @@ WidgetPropertySet::saveAlignProperty(const TQString &property)
 	if(d->isUndoing)
 		return;
 
-	if(d->lastCommand && d->lastCommand->property() == "tqalignment")
+	if(d->lastCommand && d->lastCommand->property() == "alignment")
 		d->lastCommand->setValue(meta->keysToValue(list));
 	else {
 		d->lastCommand = new PropertyCommand(this, d->widgets.first()->name(),
-			subwidget->property("tqalignment"), meta->keysToValue(list), "tqalignment");
+			subwidget->property("alignment"), meta->keysToValue(list), "alignment");
 		KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 	}
 }
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index afb303d1..f1f96a99 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -157,15 +157,15 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
 		// Following functions are used to create special types of properties, different
 		// from TQ_PROPERTY
 
-		/*! Creates the properties related to tqalignment (ie hAlign, vAlign and WordBreak) for
+		/*! Creates the properties related to alignment (ie hAlign, vAlign and WordBreak) for
 		 the TQWidget \a widget. \a subwidget is the same as \a widget if the widget itself handles
 		 the property and it's a child widget if the child handles the property. 
 		 For example, the second case is true for KexiDBAutoField.
-		 \a meta  is the TQMetaProperty for "tqalignment" property" of subwidget.  */
+		 \a meta  is the TQMetaProperty for "alignment" property" of subwidget.  */
 		void createAlignProperty(const TQMetaProperty *meta, TQWidget *widget, TQWidget *subwidget);
 
-		/*! Saves the properties related to tqalignment (ie hAlign, vAlign and WordBreak)
-		 and modifies the "tqalignment" property of  the widget.*/
+		/*! Saves the properties related to alignment (ie hAlign, vAlign and WordBreak)
+		 and modifies the "alignment" property of  the widget.*/
 		void saveAlignProperty(const TQString &property);
 
 		/*! Creates the "tqlayout" property, for the Container representing \a item. */
diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp
index 5386d3d6..f4a1346f 100644
--- a/kexi/kexidb/alter.cpp
+++ b/kexi/kexidb/alter.cpp
@@ -181,7 +181,7 @@ int AlterTableHandler::alteringTypeForProperty(const TQCString& propertyName)
 		if (KexiDB::isExtendedTableFieldProperty(propertyName))
 			return (int)ExtendedSchemaAlteringRequired;
 		KexiDBWarn << TQString("AlterTableHandler::alteringTypeForProperty(): property \"%1\" not found!")
-			.tqarg(propertyName.data()) << endl;
+			.arg(propertyName.data()) << endl;
 	}
 	return res;
 }
@@ -214,9 +214,9 @@ void AlterTableHandler::ChangeFieldPropertyAction::updateAlteringRequirements()
 TQString AlterTableHandler::ChangeFieldPropertyAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Set \"%1\" property for table field \"%2\" to \"%3\"")
-		.tqarg(m_propertyName).tqarg(fieldName()).tqarg(m_newValue.toString());
+		.arg(m_propertyName).arg(fieldName()).arg(m_newValue.toString());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
 	return s;
 }
 
@@ -267,7 +267,7 @@ static void debugActionDict(AlterTableHandler::ActionDict *dict, int fieldUID, b
 	else
 		fieldName = "??";
 	TQString dbg = TQString("Action dict for field \"%1\" (%2, UID=%3):")
-		.tqarg(fieldName).tqarg(dict->count()).tqarg(fieldUID);
+		.arg(fieldName).arg(dict->count()).arg(fieldUID);
 	KexiDBDbg << dbg << endl;
 #ifdef KEXI_DEBUG_GUI
 	if (simulate)
@@ -495,9 +495,9 @@ void AlterTableHandler::RemoveFieldAction::updateAlteringRequirements()
 
 TQString AlterTableHandler::RemoveFieldAction::debugString(const DebugOptions& debugOptions)
 {
-	TQString s = TQString("Remove table field \"%1\"").tqarg(fieldName());
+	TQString s = TQString("Remove table field \"%1\"").arg(fieldName());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(uid()));
+		s.append(TQString(" (UID=%1)").arg(uid()));
 	return s;
 }
 
@@ -583,11 +583,11 @@ void AlterTableHandler::InsertFieldAction::updateAlteringRequirements()
 TQString AlterTableHandler::InsertFieldAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Insert table field \"%1\" at position %2")
-		.tqarg(m_field->name()).tqarg(m_index);
+		.arg(m_field->name()).arg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
 	if (debugOptions.showFieldDebug)
-		s.append(TQString(" (%1)").tqarg(m_field->debugString()));
+		s.append(TQString(" (%1)").arg(m_field->debugString()));
 	return s;
 }
 
@@ -710,9 +710,9 @@ void AlterTableHandler::MoveFieldPositionAction::updateAlteringRequirements()
 TQString AlterTableHandler::MoveFieldPositionAction::debugString(const DebugOptions& debugOptions)
 {
 	TQString s = TQString("Move table field \"%1\" to position %2")
-		.tqarg(fieldName()).tqarg(m_index);
+		.arg(fieldName()).arg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").tqarg(uid()));
+		s.append(TQString(" (UID=%1)").arg(uid()));
 	return s;
 }
 
@@ -878,7 +878,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 		}
 	}
 	// - Debug
-	TQString dbg = TQString("** Overall altering requirements: %1").tqarg(args.requirements);
+	TQString dbg = TQString("** Overall altering requirements: %1").arg(args.requirements);
 	KexiDBDbg << dbg << endl;
 
 	if (args.onlyComputeRequirements) {
@@ -892,14 +892,14 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 	if (args.simulate)
 		KexiUtils::addAlterTableActionDebug(dbg, 0);
 #endif
-	dbg = TQString("** Ordered, simplified actions (%1, was %2):").tqarg(currentActionsCount).tqarg(allActionsCount);
+	dbg = TQString("** Ordered, simplified actions (%1, was %2):").arg(currentActionsCount).arg(allActionsCount);
 	KexiDBDbg << dbg << endl;
 #ifdef KEXI_DEBUG_GUI
 	if (args.simulate)
 		KexiUtils::addAlterTableActionDebug(dbg, 0);
 #endif
 	for (int i=0; i<allActionsCount; i++) {
-		debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").tqarg(i+1), args.debugString);
+		debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").arg(i+1), args.debugString);
 	}
 
 	if (args.requirements == 0) {//nothing to do
@@ -918,7 +918,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 	if (recreateTable) {
 		TQString tempDestTableName;
 		while (true) {
-			tempDestTableName = TQString("%1_temp%2%3").tqarg(newTable->name()).tqarg(TQString::number(rand(), 16)).tqarg(TQString::number(rand(), 16));
+			tempDestTableName = TQString("%1_temp%2%3").arg(newTable->name()).arg(TQString::number(rand(), 16)).arg(TQString::number(rand(), 16));
 			if (!d->conn->tableSchema(tempDestTableName))
 				break;
 		}
@@ -1007,7 +1007,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 		// -Some source fields can be skipped in case when there are deleted fields.
 		// -Some destination fields can be skipped in case when there 
 		//  are new empty fields without fixed/default value.
-		TQString sql = TQString("INSERT INTO %1 (").tqarg(d->conn->escapeIdentifier(newTable->name()));
+		TQString sql = TQString("INSERT INTO %1 (").arg(d->conn->escapeIdentifier(newTable->name()));
 		//insert list of dest. fields
 		bool first = true;
 		TQString sourceFields;
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index 34add49a..017e75e4 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -254,8 +254,8 @@ bool Connection::connect()
 	d->serverVersion.clear();
 	if (!(d->isConnected = drv_connect(d->serverVersion))) {
 		setError(m_driver->isFileDriver() ?
-			i18n("Could not open \"%1\" project file.").tqarg(TQDir::convertSeparators(d->conn_data->fileName()))
-			: i18n("Could not connect to \"%1\" database server.").tqarg(d->conn_data->serverInfoString()) );
+			i18n("Could not open \"%1\" project file.").arg(TQDir::convertSeparators(d->conn_data->fileName()))
+			: i18n("Could not connect to \"%1\" database server.").arg(d->conn_data->serverInfoString()) );
 	}
 	return d->isConnected;
 }
@@ -363,7 +363,7 @@ bool Connection::drv_databaseExists( const TQString &dbName, bool ignoreErrors )
 
 	if (list.find( dbName )==list.end()) {
 		if (!ignoreErrors)
-			setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(dbName));
+			setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").arg(dbName));
 		return false;
 	}
 
@@ -384,19 +384,19 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors )
 		if (!file.exists() || ( !file.isFile() && !file.isSymLink()) ) {
 			if (!ignoreErrors)
 				setError(ERR_OBJECT_NOT_FOUND, i18n("Database file \"%1\" does not exist.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isReadable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not readable.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isWritable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not writable.")
-				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		return true;
@@ -424,7 +424,7 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors )
 
 #define createDatabase_CLOSE \
 	{ if (!closeDatabase()) { \
-		setError(i18n("Database \"%1\" created but could not be closed after creation.").tqarg(dbName) ); \
+		setError(i18n("Database \"%1\" created but could not be closed after creation.").arg(dbName) ); \
 		return false; \
 	} }
 
@@ -438,12 +438,12 @@ bool Connection::createDatabase( const TQString &dbName )
 		return false;
 
 	if (databaseExists( dbName )) {
-		setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").tqarg(dbName) );
+		setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").arg(dbName) );
 		return false;
 	}
 	if (m_driver->isSystemDatabaseName( dbName )) {
 		setError(ERR_SYSTEM_NAME_RESERVED, 
-			i18n("Cannot create database \"%1\". This name is reserved for system database.").tqarg(dbName) );
+			i18n("Cannot create database \"%1\". This name is reserved for system database.").arg(dbName) );
 		return false;
 	}
 	if (m_driver->isFileDriver()) {
@@ -458,7 +458,7 @@ bool Connection::createDatabase( const TQString &dbName )
 
 	//low-level create
 	if (!drv_createDatabase( dbName )) {
-		setError(i18n("Error creating database \"%1\" on the server.").tqarg(dbName) );
+		setError(i18n("Error creating database \"%1\" on the server.").arg(dbName) );
 		closeDatabase();//sanity
 		return false;
 	}
@@ -472,7 +472,7 @@ bool Connection::createDatabase( const TQString &dbName )
 	if (!tmpdbName.isEmpty() || !m_driver->d->isDBOpenedAfterCreate) {
 		//db need to be opened
 		if (!useDatabase( dbName, false/*not yet kexi compatible!*/ )) {
-			setError(i18n("Database \"%1\" created but could not be opened.").tqarg(dbName) );
+			setError(i18n("Database \"%1\" created but could not be opened.").arg(dbName) );
 			return false;
 		}
 	}
@@ -566,7 +566,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 	if (!drv_useDatabase( my_dbName, cancelled, msgHandler )) {
 		if (cancelled && *cancelled)
 			return false;
-		TQString msg(i18n("Opening database \"%1\" failed.").tqarg( my_dbName ));
+		TQString msg(i18n("Opening database \"%1\" failed.").arg( my_dbName ));
 		if (error())
 			setError( this, msg );
 		else
@@ -589,7 +589,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		d->databaseVersion.major = num;
 /*		if (true!=querySingleNumber(
 			"select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_major_ver")), num)) {
-			d->errorInvalidDBContents(notfound_str.tqarg("kexidb_major_ver"));
+			d->errorInvalidDBContents(notfound_str.arg("kexidb_major_ver"));
 			return false;
 		}*/
 		num = d->dbProperties->value("kexidb_minor_ver").toInt(&ok);
@@ -598,7 +598,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		d->databaseVersion.minor = num;
 /*		if (true!=querySingleNumber(
 			"select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_minor_ver")), num)) {
-			d->errorInvalidDBContents(notfound_str.tqarg("kexidb_minor_ver"));
+			d->errorInvalidDBContents(notfound_str.arg("kexidb_minor_ver"));
 			return false;
 		}*/
 
@@ -607,8 +607,8 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool
 		if (m_driver->versionMajor()!=KexiDB::versionMajor()) {
 			setError(ERR_INCOMPAT_DATABASE_VERSION,
 				i18n("Database version (%1) does not match Kexi application's version (%2)")
-				.tqarg( TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()) )
-				.tqarg( TQString("%1.%2").tqarg(KexiDB::versionMajor()).tqarg(KexiDB::versionMinor()) ) );
+				.arg( TQString("%1.%2").arg(versionMajor()).arg(versionMinor()) )
+				.arg( TQString("%1.%2").arg(KexiDB::versionMajor()).arg(KexiDB::versionMinor()) ) );
 			return false;
 		}
 		if (m_driver->versionMinor()!=KexiDB::versionMinor()) {
@@ -686,7 +686,7 @@ bool Connection::useTemporaryDatabaseIfNeeded(TQString &tmpdbName)
 		if (!ret) {
 			setError(errorNum(), 
 				i18n("Error during starting temporary connection using \"%1\" database name.")
-				.tqarg(tmpdbName) );
+				.arg(tmpdbName) );
 			return false;
 		}
 	}
@@ -725,7 +725,7 @@ bool Connection::dropDatabase( const TQString &dbName )
 	}
 
 	if (m_driver->isSystemDatabaseName( dbToDrop )) {
-		setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").tqarg(dbToDrop) );
+		setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").arg(dbToDrop) );
 		return false;
 	}
 
@@ -765,7 +765,7 @@ TQStringList Connection::objectNames(int objType, bool* ok)
 	if (objType==KexiDB::AnyObjectType)
 		sql = "SELECT o_name FROM kexi__objects";
 	else
-		sql = TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType);
+		sql = TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").arg(objType);
 
 	Cursor *c = executeQuery(sql);
 	if (!c) {
@@ -852,7 +852,7 @@ TQValueList<int> Connection::objectIds(int objType)
 		return list;
 
 	Cursor *c = executeQuery(
-		TQString::fromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType));
+		TQString::fromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").arg(objType));
 	if (!c)
 		return list;
 	for (c->moveFirst(); !c->eof(); c->moveNext())
@@ -903,12 +903,12 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 
 			if (field->isFPNumericType() && field->precision()>0) {
 				if (field->scale()>0)
-					v += TQString::fromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale());
+					v += TQString::fromLatin1("(%1,%2)").arg(field->precision()).arg(field->scale());
 				else
-					v += TQString::fromLatin1("(%1)").tqarg(field->precision());
+					v += TQString::fromLatin1("(%1)").arg(field->precision());
 			}
 			else if (field->type()==Field::Text && field->length()>0)
-				v += TQString::fromLatin1("(%1)").tqarg(field->length());
+				v += TQString::fromLatin1("(%1)").arg(field->length());
 
 			if (autoinc)
 				v += (" " +
@@ -1163,12 +1163,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 						TQString internalUniqueTableAlias( TQString("__kexidb_") + lookupTable->name() + "_"
 							+ TQString::number(internalUniqueTableAliasNumber++) );
 						s_additional_joins += TQString("LEFT OUTER JOIN %1 AS %2 ON %3.%4=%5.%6")
-							.tqarg(escapeIdentifier(lookupTable->name(), options.identifierEscaping))
-							.tqarg(internalUniqueTableAlias)
-							.tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
-							.tqarg(escapeIdentifier(f->name(), options.identifierEscaping))
-							.tqarg(internalUniqueTableAlias)
-							.tqarg(escapeIdentifier(boundField->name(), options.identifierEscaping));
+							.arg(escapeIdentifier(lookupTable->name(), options.identifierEscaping))
+							.arg(internalUniqueTableAlias)
+							.arg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
+							.arg(escapeIdentifier(f->name(), options.identifierEscaping))
+							.arg(internalUniqueTableAlias)
+							.arg(escapeIdentifier(boundField->name(), options.identifierEscaping));
 
 						//add visibleField to the list of SELECTed fields //if it is not yet present there
 //not needed						if (!querySchema.findTableField( visibleField->table()->name()+"."+visibleField->name() )) {
@@ -1221,12 +1221,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 						kexidb_subquery_prefix + lookupQuery->name() + "_"
 						+ TQString::number(internalUniqueQueryAliasNumber++) );
 					s_additional_joins += TQString("LEFT OUTER JOIN (%1) AS %2 ON %3.%4=%5.%6")
-						.tqarg(selectStatement( *lookupQuery, params, options ))
-						.tqarg(internalUniqueQueryAlias)
-						.tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
-						.tqarg(escapeIdentifier(f->name(), options.identifierEscaping))
-						.tqarg(internalUniqueQueryAlias)
-						.tqarg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping));
+						.arg(selectStatement( *lookupQuery, params, options ))
+						.arg(internalUniqueQueryAlias)
+						.arg(escapeIdentifier(f->table()->name(), options.identifierEscaping))
+						.arg(escapeIdentifier(f->name(), options.identifierEscaping))
+						.arg(internalUniqueQueryAlias)
+						.arg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping));
 
 					if (!s_additional_fields.isEmpty())
 						s_additional_fields += TQString::fromLatin1(", ");
@@ -1306,7 +1306,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 			s_from += TQString::fromLatin1("(");
 			s_from += selectStatement( *it.current(), params, options );
 			s_from += TQString::fromLatin1(") AS %1%2")
-				.tqarg(kexidb_subquery_prefix).tqarg(subqueries_for_lookup_data_counter);
+				.arg(kexidb_subquery_prefix).arg(subqueries_for_lookup_data_counter);
 		}
 		sql += s_from;
 	}
@@ -1541,7 +1541,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 		if (m_driver->isSystemObjectName( tableName )) {
 			clearError();
 			setError(ERR_SYSTEM_NAME_RESERVED, i18n("System name \"%1\" cannot be used as table name.")
-				.tqarg(tableSchema->name()));
+				.arg(tableSchema->name()));
 			return false;
 		}
 
@@ -1550,7 +1550,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 			clearError();
 			setError(ERR_SYSTEM_NAME_RESERVED,
 				i18n("System name \"%1\" cannot be used as one of fields in \"%2\" table.")
-				.tqarg(sys_field->name()).tqarg(tableName));
+				.arg(sys_field->name()).arg(tableName));
 			return false;
 		}
 	}
@@ -1565,7 +1565,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 			if (existingTable == tableSchema) {
 				clearError();
 				setError(ERR_OBJECT_EXISTS, 
-					i18n("Could not create the same table \"%1\" twice.").tqarg(tableSchema->name()) );
+					i18n("Could not create the same table \"%1\" twice.").arg(tableSchema->name()) );
 				return false;
 			}
 //TODO(js): update any structure (e.g. queries) that depend on this table!
@@ -1579,7 +1579,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis
 	else {
 		if (this->tableSchema( tableSchema->name() ) != 0) {
 			clearError();
-			setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").tqarg(tableSchema->name()) );
+			setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").arg(tableSchema->name()) );
 			return false;
 		}
 	}
@@ -1707,7 +1707,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov
 		|| this->tableSchema(tableSchema->name())!=tableSchema
 		|| this->tableSchema(tableSchema->id())!=tableSchema)
 	{
-		setError(ERR_OBJECT_NOT_FOUND, errmsg.tqarg(tableSchema->name())
+		setError(ERR_OBJECT_NOT_FOUND, errmsg.arg(tableSchema->name())
 			+i18n("Unexpected name or identifier."));
 		return false;
 	}
@@ -1718,7 +1718,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov
 
 	//sanity checks:
 	if (m_driver->isSystemObjectName( tableSchema->name() )) {
-		setError(ERR_SYSTEM_NAME_RESERVED, errmsg.tqarg(tableSchema->name()) + d->strItIsASystemObject());
+		setError(ERR_SYSTEM_NAME_RESERVED, errmsg.arg(tableSchema->name()) + d->strItIsASystemObject());
 		return false;
 	}
 
@@ -1757,7 +1757,7 @@ tristate Connection::dropTable( const TQString& table )
 	TableSchema* ts = tableSchema( table );
 	if (!ts) {
 		setError(ERR_OBJECT_NOT_FOUND, i18n("Table \"%1\" does not exist.")
-			.tqarg(table));
+			.arg(table));
 		return false;
 	}
 	return dropTable(ts);
@@ -1772,7 +1772,7 @@ tristate Connection::alterTable( TableSchema& tableSchema, TableSchema& newTable
 
 	if (&tableSchema == &newTableSchema) {
 		setError(ERR_OBJECT_THE_SAME, i18n("Could not alter table \"%1\" using the same table.")
-			.tqarg(tableSchema.name()));
+			.arg(tableSchema.name()));
 		return false;
 	}
 //TODO(js): implement real altering
@@ -1793,18 +1793,18 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 {
 	clearError();
 	if (&tableSchema!=d->tables[tableSchema.id()]) {
-		setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").tqarg(tableSchema.name()));
+		setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").arg(tableSchema.name()));
 		return false;
 	}
 	if (newName.isEmpty() || !KexiUtils::isIdentifier(newName)) {
-		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").tqarg(newName));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").arg(newName));
 		return false;
 	}
 	const TQString oldTableName = tableSchema.name();
 	const TQString newTableName = newName.lower().stripWhiteSpace();
 	if (oldTableName.lower().stripWhiteSpace() == newTableName) {
 		setError(ERR_OBJECT_THE_SAME, i18n("Could rename table \"%1\" using the same name.")
-			.tqarg(newTableName));
+			.arg(newTableName));
 		return false;
 	}
 //TODO: alter table name for server DB backends!
@@ -1816,7 +1816,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 	if (!replace && destTableExists) {
 		setError(ERR_OBJECT_EXISTS,
 			i18n("Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists.")
-			.tqarg(tableSchema.name()).tqarg(newName).tqarg(newName));
+			.arg(tableSchema.name()).arg(newName).arg(newName));
 		return false;
 	}
 
@@ -1839,12 +1839,12 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 
 		// the new table owns the previous table's id:
 		if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3")
-			.tqarg(origID).tqarg(tableSchema.id()).tqarg((int)TableObjectType)))
+			.arg(origID).arg(tableSchema.id()).arg((int)TableObjectType)))
 		{
 			return false;
 		}
 		if (!executeSQL(TQString::fromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2")
-			.tqarg(origID).tqarg(tableSchema.id())))
+			.arg(origID).arg(tableSchema.id())))
 		{
 			return false;
 		}
@@ -1862,7 +1862,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam
 	// Update kexi__objects
 	//TODO
 	if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2")
-		.tqarg(m_driver->escapeString(tableSchema.name())).tqarg(tableSchema.id())))
+		.arg(m_driver->escapeString(tableSchema.name())).arg(tableSchema.id())))
 	{
 		alterTableName_ERR;
 		return false;
@@ -1890,7 +1890,7 @@ bool Connection::drv_alterTableName(TableSchema& tableSchema, const TQString& ne
 	tableSchema.setName(newName);
 
 	if (!executeSQL(TQString::fromLatin1("ALTER TABLE %1 RENAME TO %2")
-		.tqarg(escapeIdentifier(oldTableName)).tqarg(escapeIdentifier(newName))))
+		.arg(escapeIdentifier(oldTableName)).arg(escapeIdentifier(newName))))
 	{
 		tableSchema.setName(oldTableName); //restore old name
 		return false;
@@ -1938,7 +1938,7 @@ bool Connection::dropQuery( const TQString& query )
 	QuerySchema* qs = querySchema( query );
 	if (!qs) {
 		setError(ERR_OBJECT_NOT_FOUND, i18n("Query \"%1\" does not exist.")
-			.tqarg(query));
+			.arg(query));
 		return false;
 	}
 	return dropQuery(qs);
@@ -2014,7 +2014,7 @@ bool Connection::rollbackAutoCommitTransaction(const Transaction& trans)
 
 #define SET_ERR_TRANS_NOT_SUPP \
 	{ setError(ERR_UNSUPPORTED_DRV_FEATURE, \
-	 i18n("Transactions are not supported for \"%1\" driver.").tqarg(m_driver->name() )); }
+	 i18n("Transactions are not supported for \"%1\" driver.").arg(m_driver->name() )); }
 
 #define SET_BEGIN_TR_ERROR \
 	 { if (!error()) \
@@ -2270,7 +2270,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 {
 	//not found: retrieve schema
 /*	KexiDB::Cursor *cursor;
-	if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").tqarg(objId) )))
+	if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").arg(objId) )))
 		return false;
 	if (!cursor->moveFirst()) {
 		deleteCursor(cursor);
@@ -2287,7 +2287,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 	}
 	sdata.m_name = data[2].toString();
 	if (!KexiUtils::isIdentifier( sdata.m_name )) {
-		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").tqarg(sdata.m_name));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").arg(sdata.m_name));
 		return false;
 	}
 	sdata.m_caption = data[3].toString();
@@ -2302,7 +2302,7 @@ tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata )
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.tqarg(objectID), data))
+		.arg(objectID), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2312,7 +2312,7 @@ tristate Connection::loadObjectSchemaData( int objectType, const TQString& objec
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc "
 		"FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-		.tqarg(objectType).tqarg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
+		.arg(objectType).arg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2326,7 +2326,7 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject )
 		int existingID;
 		if (true == querySingleNumber(TQString::fromLatin1(
 			"SELECT o_id FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-			.tqarg(sdata.type()).tqarg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID))
+			.arg(sdata.type()).arg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID))
 		{
 			//we already have stored a schema data with the same name and type:
 			//just update it's properties as it would be existing object
@@ -2366,9 +2366,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject )
 	}
 	//existing object:
 	return executeSQL(TQString("UPDATE kexi__objects SET o_type=%2, o_caption=%3, o_desc=%4 WHERE o_id=%1")
-		.tqarg(sdata.id()).tqarg(sdata.type())
-		.tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
-		.tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) );
+		.arg(sdata.id()).arg(sdata.type())
+		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
+		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) );
 }
 
 tristate Connection::querySingleRecordInternal(RowData &data, const TQString* sql, QuerySchema* query, 
@@ -2407,7 +2407,7 @@ tristate Connection::querySingleRecord(QuerySchema& query, RowData &data, bool a
 bool Connection::checkIfColumnExists(Cursor *cursor, uint column)
 {
 	if (column >= cursor->fieldCount()) {
-		setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").tqarg(column));
+		setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").arg(column));
 		return false;
 	}
 	return true;
@@ -2695,7 +2695,7 @@ bool Connection::loadExtendedTableSchemaData(TableSchema& tableSchema)
 	int errorLine, errorColumn;
 	if (!doc.setContent( extendedTableSchemaString, &errorMsg, &errorLine, &errorColumn ))
 		loadExtendedTableSchemaData_ERR2( i18n("Error in XML data: \"%1\" in line %2, column %3.\nXML data: ")
-			.tqarg(errorMsg).tqarg(errorLine).tqarg(errorColumn) + extendedTableSchemaString.left(1024));
+			.arg(errorMsg).arg(errorLine).arg(errorColumn) + extendedTableSchemaString.left(1024));
 
 //! @todo look at the current format version (KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION)
 	
@@ -2777,7 +2777,7 @@ KexiDB::Field* Connection::setupField( const RowData &data )
 
 	if (!KexiUtils::isIdentifier( data.at(2).toString() )) {
 		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"")
-			.tqarg( data.at(2).toString() ));
+			.arg( data.at(2).toString() ));
 		ok = false;
 		return 0;
 	}
@@ -2809,7 +2809,7 @@ KexiDB::TableSchema* Connection::setupTableSchema( const RowData &data )
 	if (!(cursor = executeQuery(
 		TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
 			"f_options, f_default, f_order, f_caption, f_help"
-			" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->m_id) )))
+			" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->m_id) )))
 	{
 		delete t;
 		return 0;
@@ -2869,7 +2869,7 @@ TableSchema* Connection::tableSchema( const TQString& tableName )
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.tqarg(m_tableName).tqarg(KexiDB::TableObjectType), data))
+			.arg(m_tableName).arg(KexiDB::TableObjectType), data))
 		return 0;
 
 	return setupTableSchema(data);
@@ -2884,7 +2884,7 @@ TableSchema* Connection::tableSchema( int tableId )
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.tqarg(tableId), data))
+		.arg(tableId), data))
 		return 0;
 
 	return setupTableSchema(data);
@@ -2904,7 +2904,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const
 {
 	if (objectID<=0)
 		return false;
-	TQString sql(TQString::fromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID));
+	TQString sql(TQString::fromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").arg(objectID));
 	TQString sql_sub( KexiDB::sqlWhere(m_driver, KexiDB::Field::Text, "o_sub_id", dataID) );
 
 	bool ok, exists;
@@ -2943,7 +2943,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
 	if (!loadDataBlock( objID, sqlText, "sql" )) {
 		setError(ERR_OBJECT_NOT_FOUND, 
 			i18n("Could not find definition for query \"%1\". Removing this query is recommended.")
-			.tqarg(data[2].toString()));
+			.arg(data[2].toString()));
 		return 0;
 	}
 	d->parser()->parse( sqlText );
@@ -2953,8 +2953,8 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
 		setError(ERR_SQL_PARSE_ERROR, 
 			i18n("<p>Could not load definition for query \"%1\". "
 			"SQL statement for this query is invalid:<br><tt>%2</tt></p>\n"
-			"<p>You can open this query in Text View and correct it.</p>").tqarg(data[2].toString())
-			.tqarg(d->parser()->statement()));
+			"<p>You can open this query in Text View and correct it.</p>").arg(data[2].toString())
+			.arg(d->parser()->statement()));
 		return 0;
 	}
 	if (!setupObjectSchemaData( data, *query )) {
@@ -2976,7 +2976,7 @@ QuerySchema* Connection::querySchema( const TQString& queryName )
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.tqarg(m_queryName).tqarg(KexiDB::QueryObjectType), data))
+			.arg(m_queryName).arg(KexiDB::QueryObjectType), data))
 		return 0;
 
 	return setupQuerySchema(data);
@@ -2991,7 +2991,7 @@ QuerySchema* Connection::querySchema( int queryId )
 	clearError();
 	RowData data;
 	if (true!=querySingleRecord(TQString::fromLatin1(
-		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").tqarg(queryId), data))
+		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").arg(queryId), data))
 		return 0;
 
 	return setupQuerySchema(data);
@@ -3207,7 +3207,7 @@ bool Connection::updateRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 				TQVariant val = data[ pkeyFieldsOrder[i] ];
 				if (val.isNull() || !val.isValid()) {
 					setError(ERR_UPDATE_NULL_PKEY_FIELD,
-						i18n("Primary key's field \"%1\" cannot be empty.").tqarg(it.current()->name()));
+						i18n("Primary key's field \"%1\" cannot be empty.").arg(it.current()->name()));
 	//js todo: pass the field's name somewhere!
 					return false;
 				}
@@ -3291,7 +3291,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 				KexiDBWarn << "NO ENTIRE MASTER TABLE's PKEY SPECIFIED!" << endl;
 				setError(ERR_INSERT_NO_ENTIRE_MASTER_TABLES_PKEY,
 					i18n("Could not insert row because it does not contain entire master table's primary key.")
-					.tqarg(query.name()));
+					.arg(query.name()));
 				return false;
 			}
 		}
@@ -3395,7 +3395,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID)
 		KexiDBWarn << " -- NO MASTER TABLE!" << endl;
 		setError(ERR_DELETE_NO_MASTER_TABLE,
 			i18n("Could not delete row because there is no master table defined.")
-			.tqarg(query.name()));
+			.arg(query.name()));
 		return false;
 	}
 	IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0;
@@ -3429,7 +3429,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID)
 			TQVariant val = data[ pkeyFieldsOrder[i] ];
 			if (val.isNull() || !val.isValid()) {
 				setError(ERR_DELETE_NULL_PKEY_FIELD, i18n("Primary key's field \"%1\" cannot be empty.")
-					.tqarg(it.current()->name()));
+					.arg(it.current()->name()));
 //js todo: pass the field's name somewhere!
 				return false;
 			}
diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index dc95e30f..75c30cfa 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -57,7 +57,7 @@ Cursor::Cursor(Connection* conn, QuerySchema& query, uint options )
 	, m_options(options)
 {
 #ifdef KEXI_DEBUG_GUI
-	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").tqarg(query.name())+query.debugString());
+	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").arg(query.name())+query.debugString());
 #endif
 	init();
 }
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp
index 1edf5a25..9e384deb 100644
--- a/kexi/kexidb/dbobjectnamevalidator.cpp
+++ b/kexi/kexidb/dbobjectnamevalidator.cpp
@@ -45,7 +45,7 @@ Validator::Result ObjectNameValidator::internalCheck(
 		return Validator::Ok;
 	message = i18n("You cannot use name \"%1\" for your object.\n"
 		"It is reserved for internal Kexi objects. Please choose another name.")
-		.tqarg(v.toString());
+		.arg(v.toString());
 	details = i18n("Names of internal Kexi objects are starting with \"kexi__\".");
 	return Validator::Error;
 }
diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp
index 27b6a5b2..490a7390 100644
--- a/kexi/kexidb/dbproperties.cpp
+++ b/kexi/kexidb/dbproperties.cpp
@@ -39,19 +39,19 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
 		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.tqarg(m_conn->driver()->escapeString(name)), ok);
+			.arg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
 			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.tqarg(m_conn->driver()->escapeString(value.toString()))
-			.tqarg(m_conn->driver()->escapeString(name))))
+			.arg(m_conn->driver()->escapeString(value.toString()))
+			.arg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+			setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 			return false;
 		}
 		return true;
@@ -59,10 +59,10 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value
 
 	if (!m_conn->executeSQL(
 		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.tqarg(m_conn->driver()->escapeString(name))
-		.tqarg(m_conn->driver()->escapeString(value.toString()))))
+		.arg(m_conn->driver()->escapeString(name))
+		.arg(m_conn->driver()->escapeString(value.toString()))))
 	{
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
 		return false;
 	}
 	return true;
@@ -77,19 +77,19 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
 		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.tqarg(m_conn->driver()->escapeString(name)), ok);
+			.arg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
 			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.tqarg(m_conn->driver()->escapeString(caption))
-			.tqarg(m_conn->driver()->escapeString(name))))
+			.arg(m_conn->driver()->escapeString(caption))
+			.arg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+			setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 			return false;
 		}
 		return true;
@@ -97,10 +97,10 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt
 
 	if (!m_conn->executeSQL(
 		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.tqarg(m_conn->driver()->escapeString(name))
-		.tqarg(m_conn->driver()->escapeString(caption))))
+		.arg(m_conn->driver()->escapeString(name))
+		.arg(m_conn->driver()->escapeString(caption))))
 	{
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
 		return false;
 	}
 	return true;
@@ -113,7 +113,7 @@ TQVariant DatabaseProperties::value( const TQString& _name )
 	if (true!=m_conn->querySingleString(
 		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
 		+ m_conn->driver()->escapeString(name), result)) {
-		m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").tqarg(name));
+		m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").arg(name));
 		return TQVariant();
 	}
 	return result;
@@ -128,7 +128,7 @@ TQString DatabaseProperties::caption( const TQString& _name )
 	if (true!=m_conn->querySingleString(
 		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
 		+ m_conn->driver()->escapeString(name), result)) {
-		setError(m_conn, i18n("Could not read database property \"%1\".").tqarg(name));
+		setError(m_conn, i18n("Could not read database property \"%1\".").arg(name));
 		return TQString();
 	}
 	return result;
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index 5d8f8d48..d760a004 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -106,16 +106,16 @@ bool Driver::isValid()
 	{
 		setError(ERR_INCOMPAT_DRIVER_VERSION,
 		i18n("Incompatible database driver's \"%1\" version: found version %2, expected version %3.")
-		.tqarg(name())
-		.tqarg(TQString("%1.%2").tqarg(version().major).tqarg(version().minor))
-		.tqarg(TQString("%1.%2").tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor)));
+		.arg(name())
+		.arg(TQString("%1.%2").arg(version().major).arg(version().minor))
+		.arg(TQString("%1.%2").arg(KexiDB::version().major).arg(KexiDB::version().minor)));
 		return false;
 	}
 
-	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").tqarg(name());
+	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").arg(name());
 	TQString not_init = i18n("Value of \"%1\" is not initialized for the driver.");
 	if (beh->ROW_ID_FIELD_NAME.isEmpty()) {
-		setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.tqarg("DriverBehaviour::ROW_ID_FIELD_NAME"));
+		setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.arg("DriverBehaviour::ROW_ID_FIELD_NAME"));
 		return false;
 	}
 
diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp
index 8c7f096a..462ce608 100644
--- a/kexi/kexidb/driver_p.cpp
+++ b/kexi/kexidb/driver_p.cpp
@@ -85,7 +85,7 @@ void DriverPrivate::initInternalProperties()
 	propertyCaptions["transaction_nested"] = i18n("Nested transactions support");
 
 	properties["kexidb_driver_version"] =
-	  TQString("%1.%2").tqarg(version().major).tqarg(version().minor);
+	  TQString("%1.%2").arg(version().major).arg(version().minor);
 	propertyCaptions["kexidb_driver_version"] =
 	  i18n("KexiDB driver version");
 }
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 5abacc94..1f348ddf 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -137,12 +137,12 @@ bool DriverManagerInternal::lookupDrivers()
 		if (major_ver != KexiDB::version().major || minor_ver != KexiDB::version().minor) {
 			KexiDBWarn << TQString("DriverManagerInternal::lookupDrivers(): '%1' driver" 
 				" has version '%2' but required KexiDB driver version is '%3.%4'\n"
-				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor) << endl;
+				" -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiDB::version().major).arg(KexiDB::version().minor) << endl;
 			possibleProblems += TQString("\"%1\" database driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor);
+				.arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiDB::version().major).arg(KexiDB::version().minor);
 			continue;
 		}
 
@@ -186,7 +186,7 @@ KexiDB::Driver::Info DriverManagerInternal::driverInfo(const TQString &name)
 {
 	KexiDB::Driver::Info i = m_driversInfo[name.lower()];
 	if (!error() && i.name.isEmpty())
-		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) );
 	return i;
 }
 
@@ -203,7 +203,7 @@ Driver* DriverManagerInternal::driver(const TQString& name)
 		return drv; //cached
 
 	if (!m_services_lcase.contains(name.lower())) {
-		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) );
 		return 0;
 	}
 
@@ -216,7 +216,7 @@ Driver* DriverManagerInternal::driver(const TQString& name)
 
 	if (!drv) {
 		setError(ERR_DRIVERMANAGER, i18n("Could not load database driver \"%1\".")
-				.tqarg(name) );
+				.arg(name) );
 		if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound";
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
@@ -360,7 +360,7 @@ KService::Ptr DriverManager::serviceInfo(const TQString &name)
 	if (d_int->m_services_lcase.contains(name.lower())) {
 		return *d_int->m_services_lcase.find(name.lower());
 	} else {
-		setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").arg(name) );
 		return KService::Ptr();
 	}
 }
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
index 18682a4f..44853163 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
@@ -175,7 +175,7 @@ bool MySqlConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("show tables like %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool MySqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index faa7b582..d6262bef 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -190,15 +190,15 @@ bool pqxxSqlConnection::drv_useDatabase( const TQString &dbName, bool *cancelled
 	if (data()->port == 0)
 		data()->port = 5432;
 
-	conninfo += TQString::fromLatin1(" port='%1'").tqarg(data()->port);
+	conninfo += TQString::fromLatin1(" port='%1'").arg(data()->port);
 
-	conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(dbName);
+	conninfo += TQString::fromLatin1(" dbname='%1'").arg(dbName);
 
 	if (!data()->userName.isNull())
-		conninfo += TQString::fromLatin1(" user='%1'").tqarg(data()->userName);
+		conninfo += TQString::fromLatin1(" user='%1'").arg(data()->userName);
 
 	if (!data()->password.isNull())
-		conninfo += TQString::fromLatin1(" password='%1'").tqarg(data()->password);
+		conninfo += TQString::fromLatin1(" password='%1'").arg(data()->password);
 
 	try
 	{
@@ -346,7 +346,7 @@ bool pqxxSqlConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("select 1 from pg_class where relkind='r' and relname LIKE %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool pqxxSqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
index 14d2217a..1fb33233 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
@@ -46,7 +46,7 @@ bool SQLiteAdminTools::vacuum(const KexiDB::ConnectionData& data, const TQString
 #else
 	KexiDB::DriverManager manager;
 	KexiDB::Driver *drv = manager.driver(data.driverName);
-	TQString title( i18n("Could not compact database \"%1\".").tqarg(TQDir::convertSeparators(databaseName)) );
+	TQString title( i18n("Could not compact database \"%1\".").arg(TQDir::convertSeparators(databaseName)) );
 	if (!drv) {
 		setError(&manager, title);
 		return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index b10d5383..08d639ba 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -130,7 +130,7 @@ bool SQLiteConnection::drv_containsTable( const TQString &tableName )
 {
 	bool success;
 	return resultExists(TQString("select name from sqlite_master where type='table' and name LIKE %1")
-		.tqarg(driver()->escapeString(tableName)), success) && success;
+		.arg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool SQLiteConnection::drv_getTablesList( TQStringList &list )
@@ -200,7 +200,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
 		if (KMessageBox::Continue != 
 			askQuestion( 
 			i18n("Do you want to open file \"%1\" as read-only?")
-				.tqarg(TQDir::convertSeparators(data()->fileName()))
+				.arg(TQDir::convertSeparators(data()->fileName()))
 			+ "\n\n"
 			+ i18n("The file is probably already open on this or another computer.") + " "
 			+ i18n("Could not gain exclusive access for writing the file."),
@@ -264,7 +264,7 @@ bool SQLiteConnection::drv_dropDatabase( const TQString &dbName )
 	const TQString filename = data()->fileName();
 	if (TQFile(filename).exists() && !TQDir().remove(filename)) {
 		setError(ERR_ACCESS_RIGHTS, i18n("Could not remove file \"%1\".")
-			.tqarg(TQDir::convertSeparators(filename)) + " "
+			.arg(TQDir::convertSeparators(filename)) + " "
 			+ i18n("Check the file's permissions and whether it is already opened and locked by another application."));
 		return false;
 	}
@@ -396,7 +396,7 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri
 
 	// 3. copy all rows to the new table
 	if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2")
-		.tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName))))
+		.arg(escapeIdentifier(tableSchema.name())).arg(escapeIdentifier(oldTableName))))
 	{
 		drv_alterTableName_ERR;
 		return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index d24d906d..96802596 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -79,7 +79,7 @@ tristate SQLiteVacuum::run()
 	}
 	m_dlg = new KProgressDialog(0, 0, i18n("Compacting database"), 
 		"<qt>"+i18n("Compacting database \"%1\"...")
-		.tqarg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>")
+		.arg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>")
 	);
 	m_dlg->adjustSize();
 	m_dlg->resize(300, m_dlg->height());
@@ -98,7 +98,7 @@ tristate SQLiteVacuum::run()
 		const uint newSize = TQFileInfo(m_filePath).size();
 		const uint decrease = 100-100*newSize/origSize;
 		KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.")
-			.tqarg(decrease).tqarg(KIO::convertSize(newSize)));
+			.arg(decrease).arg(KIO::convertSize(newSize)));
 	}
 	return m_result;
 }
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index 034154bf..d9a33b4c 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -82,7 +82,7 @@ Field::Type BaseExpr::type()
 
 TQString BaseExpr::debugString()
 {
-	return TQString("BaseExpr(%1,type=%1)").tqarg(m_token).tqarg(Driver::defaultSQLTypeName(type()));
+	return TQString("BaseExpr(%1,type=%1)").arg(m_token).arg(Driver::defaultSQLTypeName(type()));
 }
 
 bool BaseExpr::validate(ParseInfo& /*parseInfo*/)
@@ -241,7 +241,7 @@ TQString UnaryExpr::debugString()
 	return "UnaryExpr('" 
 		+ tokenToDebugString() + "', "
 		+ (m_arg ? m_arg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -256,7 +256,7 @@ TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NULL";
 	if (m_token==SQL_IS_NOT_NULL)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NOT NULL";
-	return TQString("{INVALID_OPERATOR#%1} ").tqarg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
+	return TQString("{INVALID_OPERATOR#%1} ").arg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
 }
 
 void UnaryExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -419,7 +419,7 @@ TQString BinaryExpr::debugString()
 		+ "," + (m_larg ? m_larg->debugString() : TQString("<NONE>")) 
 		+ ",'" + tokenToDebugString() + "',"
 		+ (m_rarg ? m_rarg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString BinaryExpr::tokenToString()
@@ -449,7 +449,7 @@ TQString BinaryExpr::tokenToString()
 	/* not handled here */
 	default:;
 	}
-	return TQString("{INVALID_BINARY_OPERATOR#%1} ").tqarg(m_token);
+	return TQString("{INVALID_BINARY_OPERATOR#%1} ").arg(m_token);
 }
 
 TQString BinaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -529,7 +529,7 @@ Field::Type ConstExpr::type()
 TQString ConstExpr::debugString()
 {
 	return TQString("ConstExpr('") + tokenToDebugString() +"'," + toString()
-		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -601,13 +601,13 @@ void QueryParameterExpr::setType(Field::Type type)
 
 TQString QueryParameterExpr::debugString()
 {
-	return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").tqarg(value.toString())
-		+ TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
+	return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").arg(value.toString())
+		+ TQString("',type=%1)").arg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").tqarg(value.toString());
+	return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").arg(value.toString());
 }
 
 void QueryParameterExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -656,7 +656,7 @@ VariableExpr* VariableExpr::copy() const
 TQString VariableExpr::debugString()
 {
 	return TQString("VariableExpr(") + name
-		+ TQString(",type=%1)").tqarg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
+		+ TQString(",type=%1)").arg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
 }
 
 TQString VariableExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -719,15 +719,15 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 					parseInfo.errMsg = i18n("Ambiguous field name");
 					parseInfo.errDescr = i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. "
 						"Use \"<tableName>.%4\" notation to specify table name.")
-						.tqarg(firstField->table()->name()).tqarg(f->table()->name())
-						.tqarg(fieldName).tqarg(fieldName);
+						.arg(firstField->table()->name()).arg(f->table()->name())
+						.arg(fieldName).arg(fieldName);
 					return false;
 				}
 			}
 		}
 		if (!firstField) {
 			parseInfo.errMsg = i18n("Field not found");
-			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").tqarg(fieldName);
+			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").arg(fieldName);
 			return false;
 		}
 		//ok
@@ -754,8 +754,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 		if (covered) {
 			parseInfo.errMsg = i18n("Could not access the table directly using its name");
 			parseInfo.errDescr = i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-				"you can write \"%3\"").tqarg(tableName)
-				.tqarg(TQString(tableName+"."+fieldName)).tqarg(TQString(tableAlias+"."+fieldName.latin1()));
+				"you can write \"%3\"").arg(tableName)
+				.arg(TQString(tableName+"."+fieldName)).arg(TQString(tableAlias+"."+fieldName.latin1()));
 			return false;
 		}
 	}
@@ -773,7 +773,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 
 	if (!ts) {
 		parseInfo.errMsg = i18n("Table not found");
-		parseInfo.errDescr = i18n("Unknown table \"%1\"").tqarg(tableName);
+		parseInfo.errDescr = i18n("Unknown table \"%1\"").arg(tableName);
 		return false;
 	}
 
@@ -786,8 +786,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	//it's a table.*
 	if (fieldName=="*") {
 		if (positionsList->count()>1) {
-			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").tqarg(tableName);
-			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").tqarg(tableName);
+			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").arg(tableName);
+			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").arg(tableName);
 			return false;
 		}
 		tableForQueryAsterisk = ts;
@@ -800,7 +800,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	if (!realField) {
 		parseInfo.errMsg = i18n("Field not found");
 		parseInfo.errDescr = i18n("Table \"%1\" has no \"%2\" field")
-			.tqarg(tableName).tqarg(fieldName);
+			.arg(tableName).arg(fieldName);
 		return false;
 	}
 
@@ -815,9 +815,9 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 			numberOfTheSameFields++;
 		if (numberOfTheSameFields>1) {
 			parseInfo.errMsg = i18n("Ambiguous \"%1.%2\" expression")
-				.tqarg(tableName).tqarg(fieldName);
+				.arg(tableName).arg(fieldName);
 			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-				.tqarg(tableName).tqarg(fieldName);
+				.arg(tableName).arg(fieldName);
 			return false;
 		}
 	}
@@ -880,7 +880,7 @@ TQString FunctionExpr::debugString()
 	res.append( TQString("FunctionExpr(") + name );
 	if (args)
 		res.append(TQString(",") + args->debugString());
-	res.append(TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())));
+	res.append(TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())));
 	return res;
 }
 
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index 6666fcfd..b12000ac 100644
--- a/kexi/kexidb/field.cpp
+++ b/kexi/kexidb/field.cpp
@@ -179,7 +179,7 @@ TQString Field::typeName(uint type)
 TQString Field::typeString(uint type)
 {
 	m_typeNames.init();
-	return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").tqarg(type);
+	return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").arg(type);
 }
 
 TQString Field::typeGroupName(uint typeGroup)
@@ -191,7 +191,7 @@ TQString Field::typeGroupName(uint typeGroup)
 TQString Field::typeGroupString(uint typeGroup)
 {
 	m_typeGroupNames.init();
-	return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").tqarg(typeGroup);
+	return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").arg(typeGroup);
 }
 
 Field::Type Field::typeForString(const TQString& typeString)
@@ -330,7 +330,7 @@ void
 Field::setType(Type t)
 {
 	if (m_expr) {
-		KexiDBWarn << TQString("Field::setType(%1)").tqarg(t) 
+		KexiDBWarn << TQString("Field::setType(%1)").arg(t) 
 			<< " could not set type because the field has expression assigned!" << endl;
 		return;
 	}
@@ -589,12 +589,12 @@ TQString Field::debugString() const
 	dbg += (conn && conn->driver()) ? conn->driver()->sqlTypeName(type()) : Driver::defaultSQLTypeName(type());
 	if (isFPNumericType() && m_precision>0) {
 		if (scale()>0)
-			dbg += TQString::fromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale());
+			dbg += TQString::fromLatin1("(%1,%2)").arg(m_precision).arg(scale());
 		else 
-			dbg += TQString::fromLatin1("(%1)").tqarg(m_precision);
+			dbg += TQString::fromLatin1("(%1)").arg(m_precision);
 	}
 	else if (m_type==Field::Text && m_length>0)
-		dbg += TQString::fromLatin1("(%1)").tqarg(m_length);
+		dbg += TQString::fromLatin1("(%1)").arg(m_length);
 	if (m_constraints & Field::AutoInc)
 		dbg += " AUTOINC";
 	if (m_constraints & Field::Unique)
@@ -608,18 +608,18 @@ TQString Field::debugString() const
 	if (m_constraints & Field::NotEmpty)
 		dbg += " NOTEMPTY";
 	if (!m_defaultValue.isNull())
-		dbg += TQString(" DEFAULT=[%1]").tqarg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue);
+		dbg += TQString(" DEFAULT=[%1]").arg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue);
 	if (m_expr)
 		dbg += " EXPRESSION=" + m_expr->debugString();
 	if (m_customProperties && !m_customProperties->isEmpty()) {
-		dbg += TQString(" CUSTOM PROPERTIES (%1): ").tqarg(m_customProperties->count());
+		dbg += TQString(" CUSTOM PROPERTIES (%1): ").arg(m_customProperties->count());
 		bool first = true;
 		foreach (CustomPropertiesMap::ConstIterator, it, *m_customProperties) {
 			if (first)
 				first = false;
 			else
 				dbg += ", ";
-			dbg += TQString("%1 = %2 (%3)").tqarg(TQString(it.key())).tqarg(TQString(it.data().toString())).tqarg(TQString(it.data().typeName()));
+			dbg += TQString("%1 = %2 (%3)").arg(TQString(it.key())).arg(TQString(it.data().toString())).arg(TQString(it.data().typeName()));
 		}
 	}
 	return dbg;
diff --git a/kexi/kexidb/fieldlist.cpp b/kexi/kexidb/fieldlist.cpp
index dea19876..292ba75e 100644
--- a/kexi/kexidb/fieldlist.cpp
+++ b/kexi/kexidb/fieldlist.cpp
@@ -94,7 +94,7 @@ void FieldList::renameField(KexiDB::Field *field, const TQString& newName)
 {
 	if (!field || field != m_fields_by_name[ field->name() ]) {
 		KexiDBFatal << "FieldList::renameField() no field found " 
-			<< (field ? TQString("\"%1\"").tqarg(field->name()) : TQString()) << endl;
+			<< (field ? TQString("\"%1\"").arg(field->name()) : TQString()) << endl;
 		return;
 	}
 	m_fields_by_name.take( field->name() );
@@ -157,7 +157,7 @@ void FieldList::debug()
 }
 
 static TQString subListWarning1(const TQString& fname) {
-	return TQString("FieldList::subList() could not find field \"%1\"").tqarg(fname);
+	return TQString("FieldList::subList() could not find field \"%1\"").arg(fname);
 }
 
 FieldList* FieldList::subList(const TQString& n1, const TQString& n2, 
@@ -212,7 +212,7 @@ FieldList* FieldList::subList(const TQValueList<uint>& list)
 	foreach(TQValueList<uint>::ConstIterator, it, list) {
 		f = field(*it);
 		if (!f) {
-			KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").tqarg(*it) << endl;
+			KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").arg(*it) << endl;
 			delete fl;
 			return 0;
 		}
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 62a0665e..05728d00 100644
--- a/kexi/kexidb/lookupfieldschema.cpp
+++ b/kexi/kexidb/lookupfieldschema.cpp
@@ -91,7 +91,7 @@ void LookupFieldSchema::RowSource::setValues(const TQStringList& values)
 TQString LookupFieldSchema::RowSource::debugString() const
 {
 	return TQString("rowSourceType:'%1' rowSourceName:'%2' rowSourceValues:'%3'\n")
-		.tqarg(typeName()).tqarg(name()).tqarg(m_values ? m_values->join("|") : TQString());
+		.arg(typeName()).arg(name()).arg(m_values ? m_values->join("|") : TQString());
 }
 
 void LookupFieldSchema::RowSource::debug() const
@@ -144,11 +144,11 @@ TQString LookupFieldSchema::debugString() const
 		" boundColumn:%2 visibleColumns:%3 maximumListRows:%4 displayWidget:%5\n"
 		" columnHeadersVisible:%6 limitToList:%7\n"
 		" columnWidths:%8 )")
-		.tqarg(m_rowSource.debugString())
-		.tqarg(m_boundColumn).tqarg(visibleColumnsString).tqarg(m_maximumListRows)
-		.tqarg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox")
-		.tqarg(m_columnHeadersVisible).tqarg(m_limitToList)
-		.tqarg(columnWidthsStr);
+		.arg(m_rowSource.debugString())
+		.arg(m_boundColumn).arg(visibleColumnsString).arg(m_maximumListRows)
+		.arg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox")
+		.arg(m_columnHeadersVisible).arg(m_limitToList)
+		.arg(columnWidthsStr);
 }
 
 void LookupFieldSchema::debug() const
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index c2cece0b..38a7d386 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -142,10 +142,10 @@ void yyerror(const char *str)
 
 			if (parser->isReservedKeyword(ctoken.latin1()))
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("\"%1\" is a reserved keyword").tqarg(ctoken)+lexerErr, ctoken, current) );
+					i18n("\"%1\" is a reserved keyword").arg(ctoken)+lexerErr, ctoken, current) );
 			else
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("Syntax Error near \"%1\"").tqarg(ctoken)+lexerErr, ctoken, current) );
+					i18n("Syntax Error near \"%1\"").arg(ctoken)+lexerErr, ctoken, current) );
 		}
 	}
 }
@@ -204,7 +204,7 @@ bool parseData(Parser *p, const char *data)
 			{
 				if(tableList.findRef(item->table()) == -1)
 				{
-					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(item->table()->name()), ctoken, current);
+					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").arg(item->table()->name()), ctoken, current);
 					parser->setError(err);
 
 					yyerror("fieldlisterror");
@@ -288,15 +288,15 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						setError(i18n("Ambiguous field name"), 
 							i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. "
 								"Use \"<tableName>.%4\" notation to specify table name.")
-								.tqarg(firstField->table()->name()).tqarg(f->table()->name())
-								.tqarg(fieldName).tqarg(fieldName));
+								.arg(firstField->table()->name()).arg(f->table()->name())
+								.arg(fieldName).arg(fieldName));
 						return false;
 					}
 				}
 			}
 			if (!firstField) {
 					setError(i18n("Field not found"), 
-						i18n("Table containing \"%1\" field not found").tqarg(fieldName));
+						i18n("Table containing \"%1\" field not found").arg(fieldName));
 					return false;
 			}
 			//ok
@@ -321,8 +321,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 			if (covered) {
 				setError(i18n("Could not access the table directly using its name"), 
 					i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-					"you can write \"%3\"").tqarg(tableName)
-					.tqarg(tableName+"."+fieldName).tqarg(tableAlias+"."+fieldName.latin1()));
+					"you can write \"%3\"").arg(tableName)
+					.arg(tableName+"."+fieldName).arg(tableAlias+"."+fieldName.latin1()));
 				return false;
 			}
 		}
@@ -348,8 +348,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 
 			if (fieldName=="*") {
 				if (positionsList->count()>1) {
-					setError(i18n("Ambiguous \"%1.*\" expression").tqarg(tableName),
-						i18n("More than one \"%1\" table or alias defined").tqarg(tableName));
+					setError(i18n("Ambiguous \"%1.*\" expression").arg(tableName),
+						i18n("More than one \"%1\" table or alias defined").arg(tableName));
 					return false;
 				}
 				parseInfo.querySchema->addAsterisk( new QueryAsterisk(parseInfo.querySchema, ts) );
@@ -368,9 +368,9 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						if (otherTS->field(fieldName))
 							numberOfTheSameFields++;
 						if (numberOfTheSameFields>1) {
-							setError(i18n("Ambiguous \"%1.%2\" expression").tqarg(tableName).tqarg(fieldName),
+							setError(i18n("Ambiguous \"%1.%2\" expression").arg(tableName).arg(fieldName),
 								i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-								.tqarg(tableName).tqarg(fieldName));
+								.arg(tableName).arg(fieldName));
 							return false;
 						}
 					}
@@ -379,7 +379,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 				}
 				else {
 					setError(i18n("Field not found"), i18n("Table \"%1\" has no \"%2\" field")
-						.tqarg(tableName).tqarg(fieldName));
+						.arg(tableName).arg(fieldName));
 					return false;
 				}
 			}
@@ -436,7 +436,7 @@ QuerySchema* buildSelectQuery(
 			TableSchema *s = parser->db()->tableSchema(TQString(tname));
 			if(!s) {
 				setError(//i18n("Field List Error"), 
-					i18n("Table \"%1\" does not exist").tqarg(TQString(tname)));
+					i18n("Table \"%1\" does not exist").arg(TQString(tname)));
 	//			yyerror("fieldlisterror");
 				CLEANUP;
 				return 0;
@@ -511,7 +511,7 @@ QuerySchema* buildSelectQuery(
 				aliasVariable = e->toBinary()->right()->toVariable();
 				if (!aliasVariable) {
 					setError(i18n("Invalid alias definition for column \"%1\"")
-						.tqarg(columnExpr->toString())); //ok?
+						.arg(columnExpr->toString())); //ok?
 					CLEANUP;
 					return 0;
 				}
@@ -542,7 +542,7 @@ QuerySchema* buildSelectQuery(
 				e->toBinary()->m_larg = 0;
 			}
 			else {
-				setError(i18n("Invalid \"%1\" column definition").tqarg(e->toString())); //ok?
+				setError(i18n("Invalid \"%1\" column definition").arg(e->toString())); //ok?
 				CLEANUP;
 				return 0;
 			}
@@ -610,7 +610,7 @@ QuerySchema* buildSelectQuery(
 							(*it).ascending, (*it).columnNumber-1 ))
 						{
 							setError(i18n("Could not define sorting - no column at position %1")
-								.tqarg((*it).columnNumber));
+								.arg((*it).columnNumber));
 							CLEANUP;
 							return 0;
 						}
@@ -619,7 +619,7 @@ QuerySchema* buildSelectQuery(
 						Field * f = querySchema->findTableField((*it).aliasOrName);
 						if (!f) {
 							setError(i18n("Could not define sorting - "
-								"column name or alias \"%1\" does not exist").tqarg((*it).aliasOrName));
+								"column name or alias \"%1\" does not exist").arg((*it).aliasOrName));
 							CLEANUP;
 							return 0;
 						}
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index 091d516b..c7c3aa99 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -3111,7 +3111,7 @@ YYACCEPT;
 			Field *f = item->table()->field(item->name());
 			if(!f)
 			{
-				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current);
 				parser->setError(err);
 				yyerror("fieldlisterror");
 			}	
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index 7775885d..5a8357f2 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -1201,7 +1201,7 @@ IDENTIFIER
 			Field *f = item->table()->field(item->name());
 			if(!f)
 			{
-				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current);
 				parser->setError(err);
 				yyerror("fieldlisterror");
 			}	
@@ -1360,7 +1360,7 @@ ColWildCard:
 {
 	$$ = new VariableExpr($1);
 	KexiDBDbg << "  Invalid identifier! " << $1 << endl;
-	setError(i18n("Invalid identifier \"%1\"").tqarg($1));
+	setError(i18n("Invalid identifier \"%1\"").arg($1));
 }*/
 ;
 
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index cff98a31..47e5d95c 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -402,11 +402,11 @@ TQString OrderByColumn::debugString() const
 	if (m_column) {
 		if (m_pos>-1)
 			return TQString("COLUMN_AT_POSITION_%1(%2, %3)")
-				.tqarg(m_pos+1).tqarg(m_column->debugString()).tqarg(orderString);
+				.arg(m_pos+1).arg(m_column->debugString()).arg(orderString);
 		else
-			return TQString("COLUMN(%1, %2)").tqarg(m_column->debugString()).tqarg(orderString);
+			return TQString("COLUMN(%1, %2)").arg(m_column->debugString()).arg(orderString);
 	}
-	return m_field ? TQString("FIELD(%1, %2)").tqarg(m_field->debugString()).tqarg(orderString)
+	return m_field ? TQString("FIELD(%1, %2)").arg(m_field->debugString()).arg(orderString)
 	 : TQString("NONE");
 }
 
@@ -801,7 +801,7 @@ TQString QuerySchema::debugString()
 	else {
 		dbg1 = "<NONE>\n";
 	}
-	dbg1.prepend( TQString("(%1):\n").tqarg(fieldsExpandedCount) );
+	dbg1.prepend( TQString("(%1):\n").arg(fieldsExpandedCount) );
 	dbg += dbg1;
 
 	//it's safer to delete fieldsExpanded for now 
@@ -847,7 +847,7 @@ TQString QuerySchema::debugString()
 		for (int i=0; it.current(); ++it, i++) {
 			TQCString *alias = d->columnAlias(i);
 			if (alias)
-				aliases += (TQString("field #%1: ").tqarg(i) 
+				aliases += (TQString("field #%1: ").arg(i) 
 					+ (it.current()->name().isEmpty() ? "<noname>" : it.current()->name())
 					+ " -> " + (const char*)*alias + "\n");
 		}
@@ -862,7 +862,7 @@ TQString QuerySchema::debugString()
 		for (int i=0; t_it.current(); ++t_it, i++) {
 			TQCString *alias = d->tableAliases[i];
 			if (alias)
-				aliases += (TQString("table #%1: ").tqarg(i) 
+				aliases += (TQString("table #%1: ").arg(i) 
 					+ (t_it.current()->name().isEmpty() ? "<noname>" : t_it.current()->name())
 					+ " -> " + (const char*)*alias + "\n");
 		}
@@ -872,7 +872,7 @@ TQString QuerySchema::debugString()
 	if (!where.isEmpty())
 		dbg += (TQString("\n-WHERE EXPRESSION:\n") + where);
 	if (!orderByColumnList().isEmpty())
-		dbg += (TQString("\n-ORDER BY (%1):\n").tqarg(orderByColumnList().count()) 
+		dbg += (TQString("\n-ORDER BY (%1):\n").arg(orderByColumnList().count()) 
 			+ orderByColumnList().debugString());
 	return dbg;
 }
@@ -1292,7 +1292,7 @@ void QuerySchema::computeFieldsExpanded()
 						visibleColumn = new Field();
 						visibleColumn->setName(
 							TQString::fromLatin1("[multiple_visible_fields_%1]")
-							.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
+							.arg( ++numberOfColumnsWithMultipleVisibleFields ));
 						visibleColumn->setExpression( 
 							new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 						if (!d->ownedVisibleColumns) {
@@ -1352,7 +1352,7 @@ void QuerySchema::computeFieldsExpanded()
 					visibleColumn = new Field();
 					visibleColumn->setName(
 						TQString::fromLatin1("[multiple_visible_fields_%1]")
-						.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
+						.arg( ++numberOfColumnsWithMultipleVisibleFields ));
 					visibleColumn->setExpression( 
 						new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 					if (!d->ownedVisibleColumns) {
@@ -1509,8 +1509,8 @@ void QuerySchema::computeFieldsExpanded()
 				}
 				else {
 					const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
-						.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
-						.tqarg(ci->field->table()->name()).tqarg(ci->field->name()) );
+						.arg( ++numberOfColumnsWithMultipleVisibleFields )
+						.arg(ci->field->table()->name()).arg(ci->field->name()) );
 					uint *index = lookup_dict[ key ];
 					if (index)
 						ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
@@ -1543,8 +1543,8 @@ void QuerySchema::computeFieldsExpanded()
 			}
 			else {
 				const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
-					.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
-					.tqarg(ci->field->table()->name()).tqarg(ci->field->name()) );
+					.arg( ++numberOfColumnsWithMultipleVisibleFields )
+					.arg(ci->field->table()->name()).arg(ci->field->name()) );
 				uint *index = lookup_dict[ key ];
 				if (index)
 					ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
diff --git a/kexi/kexidb/queryschemaparameter.cpp b/kexi/kexidb/queryschemaparameter.cpp
index 4cead962..4418f6e9 100644
--- a/kexi/kexidb/queryschemaparameter.cpp
+++ b/kexi/kexidb/queryschemaparameter.cpp
@@ -36,12 +36,12 @@ QuerySchemaParameter::~QuerySchemaParameter()
 
 TQString QuerySchemaParameter::debugString() const
 {
-	return TQString("msg=\"%1\" type=\"%2\"").tqarg(Field::typeName(type)).tqarg(message);
+	return TQString("msg=\"%1\" type=\"%2\"").arg(Field::typeName(type)).arg(message);
 }
 
 void KexiDB::debug(const QuerySchemaParameterList& list)
 {
-	KexiDBDbg << TQString("Query parameters (%1):").tqarg(list.count()) << endl;
+	KexiDBDbg << TQString("Query parameters (%1):").arg(list.count()) << endl;
 	foreach(QuerySchemaParameterListConstIterator, it, list)
 		KexiDBDbg << " - " << (*it).debugString() << endl;
 }
diff --git a/kexi/kexidb/schemadata.cpp b/kexi/kexidb/schemadata.cpp
index 9b691349..9370a3ac 100644
--- a/kexi/kexidb/schemadata.cpp
+++ b/kexi/kexidb/schemadata.cpp
@@ -51,5 +51,5 @@ TQString SchemaData::schemaDataDebugString() const
 		desc+="...";
 	}
 	return TQString("id=%1 name='%2' caption='%3' desc='%4'")
-		.tqarg(m_id).tqarg(m_name).tqarg(m_caption).tqarg(desc);
+		.arg(m_id).arg(m_name).arg(m_caption).arg(desc);
 }
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 904469bc..570043fe 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -140,7 +140,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 			userAtHost += "@";
 		userAtHost += (d->connData.hostName.isEmpty() ? "localhost" : d->connData.hostName);
 		TQTextStream cout(stdout,IO_WriteOnly);
-		cout << i18n("Enter password for %1: ").tqarg(userAtHost);
+		cout << i18n("Enter password for %1: ").arg(userAtHost);
 //! @todo make use of pty/tty here! (and care about portability)
 		TQTextStream cin(stdin,IO_ReadOnly);
 		cin >> d->connData.password;
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index 8551a0ef..594773af 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -138,7 +138,7 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details)
 	if (!obj->serverErrorMsg().isEmpty())
 		details += "<p><b><nobr>" +i18n("Message from server:") + "</nobr></b><br>" + obj->serverErrorMsg();
 	if (!obj->recentSQLString().isEmpty())
-		details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").tqarg(obj->recentSQLString());
+		details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").arg(obj->recentSQLString());
 	int serverResult;
 	TQString serverResultName;
 	if (obj->serverResult()!=0) {
@@ -179,7 +179,7 @@ int KexiDB::idForObjectName( Connection &conn, const TQString& objName, int objT
 {
 	RowData data;
 	if (true!=conn.querySingleRecord(TQString("select o_id from kexi__objects where lower(o_name)='%1' and o_type=%2")
-		.tqarg(objName.lower()).tqarg(objType), data))
+		.arg(objName.lower()).arg(objType), data))
 		return 0;
 	bool ok;
 	int id = data[0].toInt(&ok);
@@ -387,7 +387,7 @@ ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent,
 	KexiDB::MessageHandler& msgHandler)
  : KProgressDialog(parent, "testconn_dlg",
 	i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>")
-	.tqarg(data.serverInfoString(true)), true /*modal*/)
+	.arg(data.serverInfoString(true)), true /*modal*/)
  , m_thread(new ConnectionTestThread(this, data))
  , m_connData(data)
  , m_msgHandler(&msgHandler)
@@ -441,13 +441,13 @@ void ConnectionTestDialog::slotTimeout()
 		else if (notResponding) {
 			KMessageBox::sorry(0, 
 				i18n("<qt>Test connection to <b>%1</b> database server failed. The server is not responding.</qt>")
-					.tqarg(m_connData.serverInfoString(true)),
+					.arg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 		else {
 			KMessageBox::information(0, 
 				i18n("<qt>Test connection to <b>%1</b> database server established successfully.</qt>")
-					.tqarg(m_connData.serverInfoString(true)),
+					.arg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 //		slotCancel();
@@ -807,7 +807,7 @@ bool KexiDB::setFieldProperty( Field& field, const TQCString& propertyName, cons
 		else {
 			if (!field.table()) {
 				KexiDBWarn << TQString("KexiDB::setFieldProperty() Cannot set \"%1\" property - no table assinged for field!")
-					.tqarg(propertyName.data()) << endl;
+					.arg(propertyName.data()) << endl;
 			}
 			else {
 				LookupFieldSchema *lookup = field.table()->lookupFieldSchema(field);
@@ -1228,7 +1228,7 @@ void KexiDB::getLimitsForType(Field::Type type, int &minValue, int &maxValue)
 
 void KexiDB::debugRowData(const RowData& rowData)
 {
-	KexiDBDbg << TQString("ROW DATA (%1 columns):").tqarg(rowData.count()) << endl;
+	KexiDBDbg << TQString("ROW DATA (%1 columns):").arg(rowData.count()) << endl;
 	foreach(RowData::ConstIterator, it, rowData)
 		KexiDBDbg << "- " << (*it) << endl;
 }
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index dc1754ca..55fc4560 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -27,7 +27,7 @@ bool KexiUtils::isIdentifier(const TQString& s)
 {
 	uint i;
 	for (i=0; i<s.length(); i++) {
-		TQChar c = s.tqat(i).lower();
+		TQChar c = s.at(i).lower();
 		if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9'))
 			break;
 	}
@@ -87,8 +87,8 @@ TQString KexiUtils::string2Identifier(const TQString &s)
 
 TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const TQVariant& v)
 {
-	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").tqarg(valueName)
-		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").tqarg(v.toString())+"</p>";
+	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").arg(valueName)
+		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>";
 }
 
 //--------------------------------------------------------------------------------
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 729312de..fd6c4e87 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -254,7 +254,7 @@ void KexiUtils::simpleDecrypt(TQString& string)
 }
 
 void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, 
-	const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio)
+	const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio)
 {
 	if (pixmap.isNull())
 		return;
@@ -285,21 +285,21 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 			img = img.smoothScale(w, h, TQ_ScaleMin);
 			pos = rect.topLeft(); //0, 0);
 			if (img.width() < w) {
-				int hAlign = TQApplication::horizontalAlignment( tqalignment );
+				int hAlign = TQApplication::horizontalAlignment( alignment );
 				if ( hAlign & TQt::AlignRight )
 					pos.setX(pos.x() + w-img.width());
 				else if ( hAlign & TQt::AlignHCenter )
 					pos.setX(pos.x() + w/2-img.width()/2);
 			}
 			else if (img.height() < h) {
-				if ( tqalignment & TQt::AlignBottom )
+				if ( alignment & TQt::AlignBottom )
 					pos.setY(pos.y() + h-img.height());
-				else if ( tqalignment & TQt::AlignVCenter )
+				else if ( alignment & TQt::AlignVCenter )
 					pos.setY(pos.y() + h/2-img.height()/2);
 			}
 			pixmapBuffer.convertFromImage(img);
 			if (!fast) {
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 			}
 			else
 				target->drawPixmap(pos, pixmapBuffer);
@@ -307,7 +307,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else {
 			if (!fast) {
 				pixmapBuffer.resize(rect.size()-TQSize(lineWidth, lineWidth));
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 				p2.drawPixmap(TQRect(rect.x(), rect.y(), w, h), pixmap);
 			}
 			else
@@ -315,7 +315,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		}
 	}
 	else {
-		int hAlign = TQApplication::horizontalAlignment( tqalignment );
+		int hAlign = TQApplication::horizontalAlignment( alignment );
 		if ( hAlign & TQt::AlignRight )
 			pos.setX(pos.x() + w-pixmap.width());
 		else if ( hAlign & TQt::AlignHCenter )
@@ -323,9 +323,9 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else //left, etc.
 			pos.setX(pos.x());
 
-		if ( tqalignment & TQt::AlignBottom )
+		if ( alignment & TQt::AlignBottom )
 			pos.setY(pos.y() + h-pixmap.height());
-		else if ( tqalignment & TQt::AlignVCenter )
+		else if ( alignment & TQt::AlignVCenter )
 			pos.setY(pos.y() + h/2-pixmap.height()/2);
 		else //top, etc. 
 			pos.setY(pos.y());
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index d7bdbae8..ffa2a85d 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -212,7 +212,7 @@ namespace KexiUtils
 	//! Draws pixmap on painter \a p using predefined parameters.
 	//! Used in KexiDBImageBox and KexiBlobTableEdit.
 	KEXIUTILS_EXPORT void drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
-		const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio);
+		const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio);
 
 	//! @internal
 	KEXIUTILS_EXPORT TQString ptrToStringInternal(void* ptr, uint size);
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index bec7a1ec..919a3b61 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -36,7 +36,7 @@ Validator::Result Validator::check(const TQString &valueName, const TQVariant& v
 {
 	if (v.isNull() || v.type()==TQVariant::String && v.toString().isEmpty()) {
 		if (!m_acceptsEmptyValue) {
-			message = Validator::msgColumnNotEmpty().tqarg(valueName);
+			message = Validator::msgColumnNotEmpty().arg(valueName);
 			return Error;
 		}
 		return Ok;
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 0aa0cd35..b46eb20d 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -175,7 +175,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName)
 		index = d->lookInColumnNames.findIndex( columnName );
 		if (index == -1) {
 			kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list")
-				.tqarg(columnName) << endl;
+				.arg(columnName) << endl;
 			return;
 		}
 		index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/;
@@ -214,13 +214,13 @@ void KexiFindDialog::setObjectNameForCaption(const TQString& name)
 		if (name.isEmpty())
 			setCaption(i18n("Replace"));
 		else
-			setCaption(i18n("Replace in \"%1\"").tqarg(name));
+			setCaption(i18n("Replace in \"%1\"").arg(name));
 	}
 	else {
 		if (name.isEmpty())
 			setCaption(i18n("Find"));
 		else
-			setCaption(i18n("Find in \"%1\"").tqarg(name));
+			setCaption(i18n("Find in \"%1\"").arg(name));
 	}
 }
 
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 293271c5..dc7fc428 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -111,7 +111,7 @@
 # define KexiVDebug if (0) kdDebug()
 #endif
 
-//first fix the tqgeometry
+//first fix the geometry
 //#define KEXI_NO_CTXT_HELP 1
 
 #ifndef KEXI_NO_CTXT_HELP
@@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 		d->config->setGroup("MainWindow");
-		TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ),
-			d->config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+		TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+			d->config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 
@@ -277,7 +277,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		createShellGUI(true);
 	//}
 
-	d->statusBar = new KexiStatusBar(this, "status_bar");
+	d->statusBar = new KexitStatusBar(this, "status_bar");
 
 	d->origAppCaption = caption();
 
@@ -465,7 +465,7 @@ void KexiMainWindowImpl::switchToIDEAlMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to IDEAl at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::IDEAlMode;
 		}
@@ -492,7 +492,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage)
 		else {
 			KMessageBox::information(this,
 				i18n("User interface mode will be switched to Childframe at next %1 application startup.")
-				.tqarg(KEXI_APP_NAME));
+				.arg(KEXI_APP_NAME));
 			//delayed
 			d->mdiModeToSwitchAfterRestart = KMdi::ChildframeMode;
 		}
@@ -1281,7 +1281,7 @@ static TQString internalReason(KexiDB::Object *obj)
 	const TQString &s = obj->errorMsg();
 	if (s.isEmpty())
 		return s;
-	return TQString("<br>(%1) ").tqarg(i18n("reason:")+" <i>"+s+"</i>");
+	return TQString("<br>(%1) ").arg(i18n("reason:")+" <i>"+s+"</i>");
 }
 
 tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
@@ -1319,7 +1319,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 		if (incompatibleWithKexi) {
 			if (KMessageBox::Yes == KMessageBox::questionYesNo(this,
 				i18n("<qt>Database project %1 does not appear to have been created using Kexi.<br><br>"
-				"Do you want to import it as a new Kexi project?</qt>").tqarg(projectData.infoString()),
+				"Do you want to import it as a new Kexi project?</qt>").arg(projectData.infoString()),
 				0, KGuiItem(i18n("Import Database", "&Import..."), "database_import"),
 				KStdGuiItem::quit()))
 			{
@@ -1447,9 +1447,9 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 					not_found_msg += (TQString("\"") + info["name"] + "\" - ");
 				if (info["action"]=="new")
 					not_found_msg += i18n("cannot create object - unknown object type \"%1\"")
-						.tqarg(info["type"]);
+						.arg(info["type"]);
 				else
-					not_found_msg += i18n("unknown object type \"%1\"").tqarg(info["type"]);
+					not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]);
 				not_found_msg += internalReason(&Kexi::partManager())+"<br></li>";
 				continue;
 			}
@@ -1457,7 +1457,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 			if (info["action"]=="new") {
 				if (!newObject( i, openingCancelled) && !openingCancelled) {
 					not_found_msg += "<li>";
-					not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(info["type"])+
+					not_found_msg += (i18n("cannot create object of type \"%1\"").arg(info["type"])+
 						internalReason(d->prj)+"<br></li>");
 				}
 				else
@@ -1551,7 +1551,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	if (!not_found_msg.isEmpty())
 		showErrorMessage(i18n("You have requested selected objects to be automatically opened "
 			"or processed on startup. Several objects cannot be opened or processed."),
-			TQString("<ul>%1</ul>").tqarg(not_found_msg) );
+			TQString("<ul>%1</ul>").arg(not_found_msg) );
 
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
@@ -1864,7 +1864,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 }
 
 //! internal
-void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
+void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized)
 {
 	//js todo: allow to set custom "static" app caption
 
@@ -1877,13 +1877,13 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
 		//current dialog isn't attached! - find top level child
 		if (m_pMdi->topChild()) {
 			view = m_pMdi->topChild()->m_pClient;
-			tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
+			childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
 		}
 		else
 			view = 0;
 	}
 
-	if (tqchildrenMaximized && view) {
+	if (childrenMaximized && view) {
 		setCaption( d->curDialog->caption()
 			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) );
 	}
@@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings()
 		}*/
 
 		config->setGroup("MainWindow");
-	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ),
-              config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) );
+	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
+              config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 #endif
@@ -3006,10 +3006,10 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	}
 	if (!d->curDialog->supportsViewMode( viewMode )) {
 		showErrorMessage(i18n("Selected view is not supported for \"%1\" object.")
-			.tqarg(d->curDialog->partItem()->name()),
+			.arg(d->curDialog->partItem()->name()),
 		i18n("Selected view (%1) is not supported by this object type (%2).")
-			.tqarg(Kexi::nameForViewMode(viewMode))
-			.tqarg(d->curDialog->part()->instanceCaption()) );
+			.arg(Kexi::nameForViewMode(viewMode))
+			.arg(d->curDialog->part()->instanceCaption()) );
 		d->toggleLastCheckedMode();
 		return false;
 	}
@@ -3019,7 +3019,7 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	tristate res = d->curDialog->switchToViewMode( viewMode );
 	if (!res) {
 		updateCustomPropertyPanelTabs(0, Kexi::NoViewMode); //revert
-		showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(viewMode)),
+		showErrorMessage(i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(viewMode)),
 			d->curDialog);
 		d->toggleLastCheckedMode();
 		return false;
@@ -3118,7 +3118,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			if (allowOverwriting) {
 				int res = KMessageBox::warningYesNoCancel(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Do you want to replace it?")+"</p>", 0,
 					KGuiItem(i18n("&Replace"), "button_yes"),
 					KGuiItem(i18n("&Choose Other Name...")),
@@ -3135,11 +3135,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 			else {
 				KMessageBox::information(this,
 					"<p>"+part->i18nMessage("Object \"%1\" already exists.", 0)
-						.tqarg(d->nameDialog->widget()->nameText())
+						.arg(d->nameDialog->widget()->nameText())
 					+"</p><p>"+i18n("Please choose other name.")+"</p>");
 //				" For example: Table \"my_table\" already exists" ,
 //				"%1 \"%2\" already exists.\nPlease choose other name.")
-//				.tqarg(dlg->part()->instanceName()).tqarg(d->nameDialog->widget()->nameText()));
+//				.arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText()));
 				continue;
 			}
 		}
@@ -3160,7 +3160,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 		//data was saved in the past -just save again
 		res = dlg->storeData(dontAsk);
 		if (!res)
-			showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+			showErrorMessage(i18n("Saving \"%1\" object failed.").arg(dlg->partItem()->name()),
 				d->curDialog);
 		return res;
 	}
@@ -3177,7 +3177,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 	if (~res)
 		return cancelled;
 	if (!res) {
-		showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(dlg->partItem()->name()),
+		showErrorMessage(i18n("Saving new \"%1\" object failed.").arg(dlg->partItem()->name()),
 			d->curDialog);
 		return false;
 	}
@@ -3224,11 +3224,11 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 		saveChanges.setToolTip(i18n("Save changes"));
 		saveChanges.setWhatsThis(
 			i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 		KGuiItem discardChanges( KStdGuiItem::discard() );
 		discardChanges.setWhatsThis(
 			i18n( "Pressing this button will discard all recent changes made in \"%1\" object." )
-			.tqarg(dlg->partItem()->name()) );
+			.arg(dlg->partItem()->name()) );
 
 		//dialog's data is dirty:
 		//--adidional message, e.g. table designer will return 
@@ -3243,7 +3243,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar
 
 		const int questionRes = KMessageBox::warningYesNoCancel( this,
 			"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-			.tqarg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
+			.arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
 			+ additionalMessage /*may be empty*/,
 			TQString(),
 			saveChanges,
@@ -3380,9 +3380,9 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 	KMdiMainFrm::attachWindow(pWnd,true,bAutomaticResize);
 	//for dialogs in normal state: decrease dialog's height if it exceeds area contents
 	if (pWnd->mdiParent()->state() == KMdiChildFrm::Normal
-		&& pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
+		&& pWnd->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
 	{
-		TQRect r = pWnd->tqgeometry();
+		TQRect r = pWnd->geometry();
 		r.setBottom( pWnd->mdiParent()->mdiAreaContentsRect().bottom() - 5 );
 		pWnd->setGeometry( r );
 	}
@@ -3444,7 +3444,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		/* Fixes for popup menus behaviour:
 		 For hiding/showing: focus previously (d->focus_before_popup)
 		 focused window, if known, otherwise focus currently focused one.
-		 And: just tqinvalidate actions.
+		 And: just invalidate actions.
 		*/
 		if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) {
 			KexiVDebug << e->type() << endl;
@@ -3481,8 +3481,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 #ifdef KEXI_STATUSBAR_DEBUG
 		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
 		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3494,8 +3494,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 #ifdef KEXI_STATUSBAR_DEBUG
 		TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0;
 		d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4")
-			.tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "")
-			.tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "")
+			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
+			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
 			);
 #endif
 	}
@@ -3534,7 +3534,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		return true;
 	}
 
-	//remember currently focued window tqinvalidate act.
+	//remember currently focued window invalidate act.
 	if (e->type()==TQEvent::FocusOut) {
 		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
@@ -3605,7 +3605,7 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening
 	if (!openingAllowed(item, viewMode)) {
 		if (errorMessage)
 			*errorMessage = i18n("opening is not allowed in \"data view/design view/text view\" mode", 
-				"opening is not allowed in \"%1\" mode").tqarg(Kexi::nameForViewMode(viewMode));
+				"opening is not allowed in \"%1\" mode").arg(Kexi::nameForViewMode(viewMode));
 		openingCancelled = true;
 		return 0;
 	}
@@ -3790,7 +3790,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk )
 			"<p>"+i18n("Do you want to permanently delete:\n"
 			"%1\n"
 			"If you click \"Delete\", you will not be able to undo the deletion.")
-				.tqarg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
+				.arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
 			0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no()))
 			return cancelled;
 	}
@@ -3865,7 +3865,7 @@ void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const TQString& _ne
 	const bool res = d->prj->renameObject(this, *item, newName);
 	enableMessages(true);
 	if (!res) {
-		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) );
+		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").arg(newName) );
 		success = false;
 		return;
 	}
@@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 	if (onStartup && !d->showImportantInfoOnStartup)
 		return;
 
-	TQString key = TQString("showImportantInfo %1").tqarg(KEXI_VERSION_STRING);
+	TQString key = TQString("showImportantInfo %1").arg(KEXI_VERSION_STRING);
 	d->config->setGroup("Startup");
 	bool show = d->config->readBoolEntry(key,true);
 
@@ -4005,7 +4005,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 			ts.setCodec( KGlobal::locale()->codecForEncoding() );
 			TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser");
 			if (tb) {
-				tb->setText( TQString("<qt>%1</qt>").tqarg(ts.read()) );
+				tb->setText( TQString("<qt>%1</qt>").arg(ts.read()) );
 			}
 			f.close();
 		}
@@ -4062,7 +4062,7 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData)
 #if 0 //todo reenable; autoopen objects are handled elsewhere
 	KexiDB::TableSchema *sch = d->prj->dbConnection()->tableSchema("kexi__final");
 	TQString err_msg = i18n("Could not start project \"%1\" in Final Mode.")
-		.tqarg(static_cast<KexiDB::SchemaData*>(projectData)->name());
+		.arg(static_cast<KexiDB::SchemaData*>(projectData)->name());
 	if(!sch)
 	{
 		hide();
@@ -4184,7 +4184,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase()
 		if (!drv || !(drv->features() & KexiDB::Driver::CompactingDatabaseSupported)) {
 			KMessageBox::information(this, "<qt>"+
 				i18n("Compacting database file <nobr>\"%1\"</nobr> is not supported.")
-				.tqarg(TQDir::convertSeparators(cdata.fileName())));
+				.arg(TQDir::convertSeparators(cdata.fileName())));
 			return;
 		}
 		data = new KexiProjectData( cdata, cdata.fileName() );
@@ -4423,11 +4423,11 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 			saveChanges.setToolTip(i18n("Save changes"));
 			saveChanges.setWhatsThis(
 				i18n( "Pressing this button will save all recent changes made in \"%1\" object." )
-				.tqarg(item->name()) );
+				.arg(item->name()) );
 			KGuiItem doNotSave( KStdGuiItem::no() );
 			doNotSave.setWhatsThis(
 				i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." )
-				.tqarg(dlg->partItem()->name()) );
+				.arg(dlg->partItem()->name()) );
 
 			TQString question;
 			if (action == PrintItem)
@@ -4441,7 +4441,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 			const int questionRes = KMessageBox::warningYesNoCancel( this,
 				"<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg)
-				.tqarg(item->name()) + "</p><p>" + question + "</p>",
+				.arg(item->name()) + "</p><p>" + question + "</p>",
 				TQString(), 
 				saveChanges,
 				doNotSave);
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 5f3d887a..141cd475 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -346,7 +346,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		void slotPartLoaded(KexiPart::Part* p);
 
-		void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized);
+		void slotCaptionForCurrentMDIChild(bool childrenMaximized);
 		void slotNoMaximizedChildFrmLeft(KMdiChildFrm*);
 		void slotLastChildViewClosed();
 		void slotChildViewIsDetachedNow(TQWidget*);
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 98600c62..b3d60b89 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -219,8 +219,8 @@ void updatePropEditorDockWidthInfo() {
 
 	void showStartProcessMsg(const TQStringList& args)
 	{
-		wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME),
-			i18n("Command \"%1\" failed.").tqarg(args.join(" ")));
+		wnd->showErrorMessage(i18n("Could not start %1 application.").arg(KEXI_APP_NAME),
+			i18n("Command \"%1\" failed.").arg(args.join(" ")));
 	}
 
 	void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator)
@@ -411,7 +411,7 @@ void updatePropEditorDockWidthInfo() {
 	}
 
 		KexiMainWindowImpl *wnd;
-		KexiStatusBar *statusBar;
+		KexitStatusBar *statusBar;
 		KexiProject *prj;
 		KConfig *config;
 #ifndef KEXI_NO_CTXT_HELP
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 9beffbf5..1218df23 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -55,7 +55,7 @@ KexiNewStuff::install(const TQString &fileName)
 
 	KTar archive( fileName );
 	if ( !archive.open( IO_ReadOnly ) ) {
-		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl;
+		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").arg(fileName) << endl;
 		return false;
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 439c20b6..02778208 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -33,14 +33,14 @@
 #include <klocale.h>
 #include <kparts/part.h>
 
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
 #include <ktexteditor/viewcursorinterface.h>
 #include <ktexteditor/viewstatusmsginterface.h>
 #endif
 
-KexiStatusBar::KexiStatusBar(TQWidget *parent, const char *name)
+KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name)
     : KStatusBar(parent, name)
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
 	, m_cursorIface(0)
 #endif
 	, m_activePart(0)
@@ -61,17 +61,17 @@ KexiStatusBar::KexiStatusBar(TQWidget *parent, const char *name)
 }
 
 
-KexiStatusBar::~KexiStatusBar()
+KexitStatusBar::~KexitStatusBar()
 {
 }
 
-void KexiStatusBar::activePartChanged(KParts::Part *part)
+void KexitStatusBar::activePartChanged(KParts::Part *part)
 {
 	if ( m_activePart && m_activePart->widget() )
 		disconnect( m_activePart->widget(), 0, this, 0 );
 
 	m_activePart = part;
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
 	m_cursorIface = 0;
 	m_viewmsgIface = 0;
 // @todo
@@ -98,9 +98,9 @@ void KexiStatusBar::activePartChanged(KParts::Part *part)
 }
 
 
-void KexiStatusBar::cursorPositionChanged()
+void KexitStatusBar::cursorPositionChanged()
 {
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
   if (m_cursorIface)
   {
     uint line, col;
@@ -110,9 +110,9 @@ void KexiStatusBar::cursorPositionChanged()
 #endif
 }
 
-void KexiStatusBar::setStatus(const TQString &str)
+void KexitStatusBar::setStatus(const TQString &str)
 {
-	kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl;
+	kdDebug() << "KexitStatusBar::setStatus(" << str << ")" << endl;
 //	m_status->setText(str);
 	changeItem(str, m_msgID);
 
@@ -123,13 +123,13 @@ void KexiStatusBar::setStatus(const TQString &str)
 #endif
 }
 
-void KexiStatusBar::setCursorPosition(int line, int col)
+void KexitStatusBar::setCursorPosition(int line, int col)
 {
-//	m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col));
-	changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID);
+//	m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
+	changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID);
 }
 
-/*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
+/*void KexitStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
@@ -137,7 +137,7 @@ void KexiStatusBar::setCursorPosition(int line, int col)
 		setFixedHeight(widget->sizeHint().height() + 4);
 }*/
 
-void KexiStatusBar::setReadOnlyFlag(bool readOnly)
+void KexitStatusBar::setReadOnlyFlag(bool readOnly)
 {
 	changeItem(readOnly ? i18n("Read only") : TQString(), m_readOnlyID);
 }
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index e8c31d41..0d20e0a8 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -24,7 +24,7 @@
 #define KEXISTATUSBAR_H
 
 //temporary
-#define KexiStatusBar_KTEXTEDITOR_USED 0
+#define KexitStatusBar_KTEXTEDITOR_USED 0
 
 #include <tdeversion.h>
 #include <kstatusbar.h>
@@ -32,19 +32,19 @@
 
 class TQLabel;
 
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
 namespace KTextEditor { class ViewStatusMsgInterface; }
 namespace KTextEditor { class ViewCursorInterface; }
 #endif
 namespace KParts { class Part; }
 
-class KexiStatusBar : public KStatusBar
+class KexitStatusBar : public KStatusBar
 {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiStatusBar( TQWidget *parent=0, const char *name=0 );
-		virtual ~KexiStatusBar();
+		KexitStatusBar( TQWidget *parent=0, const char *name=0 );
+		virtual ~KexitStatusBar();
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
 	public slots:
@@ -60,7 +60,7 @@ class KexiStatusBar : public KStatusBar
 		int m_msgID, m_readOnlyID;
 //		TQLabel *m_status, *m_readOnlyStatus;
 
-#if KexiStatusBar_KTEXTEDITOR_USED
+#if KexitStatusBar_KTEXTEDITOR_USED
 	KTextEditor::ViewCursorInterface * m_cursorIface;
 	KTextEditor::ViewStatusMsgInterface * m_viewmsgIface;
 #endif
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index ac829ce1..3e6f8a97 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -326,9 +326,9 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		TQString pageNumString;
 		if (m_pagesCount>0)
 			pageNumString = i18n("Page (number) of (total)", "Page %1 of %2")
-				.tqarg(pageNumber+1).tqarg(m_pagesCount);
+				.arg(pageNumber+1).arg(m_pagesCount);
 		else
-			pageNumString = i18n("Page %1").tqarg(pageNumber+1);
+			pageNumString = i18n("Page %1").arg(pageNumber+1);
 		painter.drawText((int)m_leftMargin, 
 			(int)m_topMargin + m_pageHeight - m_mainLineSpacing, 
 			m_pageWidth, m_mainLineSpacing,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 476f924a..c536f676 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -356,7 +356,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 			m_contents->openDataLink->setText( i18n("Open This Query") );
 			m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>");
 		}
-		m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) );
+		m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) );
 	}
 	connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), 
 		this, TQT_SLOT(slotTitleTextChanged(const TQString&)));
@@ -442,8 +442,8 @@ void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo()
 	TQString s;
 	if (m_settings.pageLayout.format == PG_CUSTOM) {
 		s += TQString(" (%1 %2 x %3 %4)")
-			.tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit))
-			.tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit));
+			.arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit))
+			.arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit));
 	}
 	else
 		s += KoPageFormat::name(m_settings.pageLayout.format);
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index de57e97e..4bf6deec 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -45,7 +45,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>Page title:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index f07722d8..83d9cb06 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+	p.begin(TQT_TQPAINTDEVICE(&pm), this);
 //! @todo only for screen!
 	p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white));
 	if (m_window->currentPage()>=0)
@@ -135,7 +135,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
 	viewport()->setUpdatesEnabled(true);
 	resize(size()+TQSize(1,1)); //to update pos.
 	widget->enablePainting = true;
-	widget->tqrepaint();
+	widget->repaint();
 }
 
 void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
@@ -157,7 +157,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
  , m_pageNumber(-1)
  , m_pagesCount(-1)
 {
-	setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME));
+	setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME));
 	setIcon(DesktopIcon("filequickprint"));
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
@@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
 	m_pageNumber = pageNumber;
 	m_pagesCount = m_engine.pagesCount();
 
-	m_view->tqrepaint(); //this will automatically paint a new page
+	m_view->repaint(); //this will automatically paint a new page
 
 	m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0);
 	m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0);
 	static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText(
-		i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount()));
+		i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount()));
 }
 
 void KexiSimplePrintPreviewWindow::setFullWidth()
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a9a2a316..60e98852 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -350,9 +350,9 @@ bool KexiConnSelectorWidget::confirmOverwrites() const
 
 /*static TQString msgUnfinished() { 
 	return i18n("To define or change a connection, use command line options or click on .kexis file. "
-		"You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8!
+		"You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8!
 		+ "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */
-//		.tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
+//		.arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
 //}
 
 void KexiConnSelectorWidget::slotRemoteAddBtnClicked()
@@ -407,7 +407,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked()
 		return;
 	if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, 
 		i18n("Do you want to remove database connection \"%1\" from the list of available connections?")
-		.tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
+		.arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
 		KMessageBox::Notify|KMessageBox::Dangerous))
 		return;
 
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 4c371ed2..c55614e2 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -246,7 +246,7 @@
 &lt;p&gt;You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
@@ -268,7 +268,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 29e52812..122137e1 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -74,7 +74,7 @@
                 <string>Kexi will create a new database project. Select a storage method which will be used to store the new project.
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 625af34f..0e7f872a 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -301,7 +301,7 @@ void KexiNewProjectWizard::next()
 				return;
 			}
 			m_project_selector->label->setText(
-				d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
+				d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
 			m_server_db_name->le_caption->setFocus();
 
 		}
@@ -342,7 +342,7 @@ void KexiNewProjectWizard::accept()
 			if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "<qt>"
 				+i18n("<b>A project with database name \"%1\" already exists</b>"
 				"<p>Do you want to delete it and create a new one?")
-				.tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
+				.arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
 				TQString(), KMessageBox::Notify|KMessageBox::Dangerous ))
 			{
 				m_server_db_name->le_dbname->setFocus();
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index b822f0ff..2f778429 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -35,7 +35,7 @@
                 <string>&lt;b&gt;Select existing Kexi project file to open:&lt;/b&gt;
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -112,7 +112,7 @@
                     <property name="text">
                         <string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 9353e3a6..878e0273 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 	
 	m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:")
-		.tqarg(cdata->serverInfoString(false)) );
+		.arg(cdata->serverInfoString(false)) );
 }
 
 KexiProjectSelectorDialog::~KexiProjectSelectorDialog()
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 57aa28ad..5159d9bb 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -43,7 +43,7 @@
                 <string>&lt;b&gt;There are Kexi projects you have recently opened.&lt;/b&gt; Select one you wish to open:
 </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 1708efbc..17afbc7d 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	 + i18n("Please enter the password.") + "</p>";
 /*		msg += cdata.userName.isEmpty() ?
 			"<p>"+i18n("Please enter the password.")
-			: "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/
+			: "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/
 
 	TQString srv = cdata.serverInfoString(false);
 	if (srv.isEmpty() || srv.lower()=="localhost")
 		srv = i18n("local database server");
 
-	msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
+	msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
 		
 	TQString usr;
 	if (cdata.userName.isEmpty())
@@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
 	else
 		usr = cdata.userName;
 	
-	msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>");
+	msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>");
 
 	setPrompt( msg );
 	if (showDetailsButton) {
@@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			KMessageBox::sorry( 0, "<qt>"
 				+i18n("Could not read connection information from connection shortcut "
 				"file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.")
-				.tqarg(TQDir::convertSeparators(connectionShortcut.fileName())));
+				.arg(TQDir::convertSeparators(connectionShortcut.fileName())));
 			return false;
 		}
 	}
@@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) {
 		KMessageBox::sorry( 0, 
 			i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.")
-			.tqarg(fileType));
+			.arg(fileType));
 		return false;
 	}
 
@@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 			if (dropDB && !projectFileExists) {
 				KMessageBox::sorry(0, 
 					i18n("Could not remove project.\nThe file \"%1\" does not exist.")
-					.tqarg(TQDir::convertSeparators(cdata.dbFileName())));
+					.arg(TQDir::convertSeparators(cdata.dbFileName())));
 				return 0;
 			}
 		}
@@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					m_projectData = new KexiProjectData();
 					if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete m_projectData;
 						m_projectData = 0;
 						delete d->shortcutFile;
@@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 					d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName());
 					if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) {
 						KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".")
-							.tqarg(TQDir::convertSeparators(cdata.fileName())));
+							.arg(TQDir::convertSeparators(cdata.fileName())));
 						delete d->connShortcutFile;
 						d->connShortcutFile = 0;
 						return false;
@@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		if (!alsoOpenDB) {
 			if (ok) {
 				KMessageBox::information( 0, i18n("Project \"%1\" created successfully.")
-					.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+					.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 			}
 			return ok;
 		}
@@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/);
 		if (res==true)
 			KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.")
-				.tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+				.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
 		return res!=false;
 	}
 
@@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!(options & SkipMessages))
 			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
-				.tqarg(TQDir::convertSeparators(dbFileName))
+				.arg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
 				"and locked by another application."));
 		return false;
@@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if (!(options & SkipMessages))
 				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
-					.tqarg(TQDir::convertSeparators(dbFileName))
+					.arg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
 						"and locked by another application."));
 			return false;
@@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
 				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
+				.arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
 			{
 				return cancelled;
@@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile(
 			 "The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
 			 "while you have asked for \"%3\" database driver to be used.\n"
 			 "Do you want to use \"%4\" database driver?")
-			 .tqarg(TQDir::convertSeparators(dbFileName))
-			 .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName));
+			 .arg(TQDir::convertSeparators(dbFileName))
+			 .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName));
 		if (KMessageBox::Yes == res)
 			useDetectedDriver = true;
 		else if (KMessageBox::Cancel == res)
@@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
-			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
+			.arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) )
 	{
 //		SQLite2ToSQLite3Migration *migr = new 
 		SQLite2ToSQLite3Migration migr( finfo.absFilePath() );
@@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
-				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
+				.arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) );
 			//continue...
 		}
 		if (res==true)
@@ -878,12 +878,12 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!(options & SkipMessages))
 			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
-					.tqarg(TQDir::convertSeparators(dbFileName)),
+					.arg(TQDir::convertSeparators(dbFileName)),
 				TQString::fromLatin1("<p>")
 				+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
-					.tqarg(mimename)
+					.arg(mimename)
 				+(ptr.data()->comment().isEmpty() 
-					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").tqarg(ptr.data()->comment()))
+					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment()))
 				+TQString::fromLatin1("</p>")
 				+possibleProblemsInfoMsg);
 		return false;
@@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 		if (prjdlg.projectSet())
 			msgh.showErrorMessage(prjdlg.projectSet(), 
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
+				.arg(cdata->serverInfoString(true)));
 		else
 			msgh.showErrorMessage(
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.tqarg(cdata->serverInfoString(true)));
+				.arg(cdata->serverInfoString(true)));
 //		setStatus(i18n("Could not load list of available projects for database server \"%1\"")
-//		.tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
+//		.arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
 		return 0;
 	}
 	if (prjdlg.exec()!=TQDialog::Accepted) {
@@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges()
 
 	if (!ok) {
 		KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.")
-			.tqarg(TQDir::convertSeparators(d->shortcutFile->fileName())));
+			.arg(TQDir::convertSeparators(d->shortcutFile->fileName())));
 	}
 }
 
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 429499f4..d919463d 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -123,8 +123,8 @@ void TemplatesPage::itemClicked(TQIconViewItem *item) {
 		return;
 	}
 	TQString t = TQString("<h2>%1</h2><p>%2</p>")
-		.tqarg(static_cast<TemplateItem*>(item)->name)
-		.tqarg(static_cast<TemplateItem*>(item)->description);
+		.arg(static_cast<TemplateItem*>(item)->name)
+		.arg(static_cast<TemplateItem*>(item)->description);
 #ifndef DB_TEMPLATES
 	t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
 #endif
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 1e50a12d..72db4af2 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName()
 		if (mode() & KFile::ExistingOnly) {
 			if ( !fi.exists() ) {
 				KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." )
-					.tqarg( TQDir::convertSeparators(path) ) );
+					.arg( TQDir::convertSeparators(path) ) );
 				return false;
 			}
 			else if (mode() & KFile::File) {
@@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName()
 				}
 				else if (!fi.isReadable()) {
 					KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." )
-						.tqarg( TQDir::convertSeparators(path) ) );
+						.arg( TQDir::convertSeparators(path) ) );
 					return false;
 				}
 			}
@@ -329,7 +329,7 @@ bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget
 	if (!fi.exists())
 		return true;
 	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
-		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
+		"Do you want to overwrite it?").arg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
 		return true;
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 67a44ca6..36b8c527 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -120,27 +120,27 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 /*
     KURL u;
     u.setPath( TQDir::rootDirPath() );
-    TQString text = i18n("Root Directory: %1").tqarg( u.path() );
+    TQString text = i18n("Root Directory: %1").arg( u.path() );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
-    text = i18n("Home Directory: %1").tqarg( u.path( +1 ) );
+    text = i18n("Home Directory: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     KURL docPath;
     docPath.setPath( KGlobalSettings::documentPath() );
     if ( u.path(+1) != docPath.path(+1) ) {
-        text = i18n("Documents: %1").tqarg( docPath.path( +1 ) );
+        text = i18n("Documents: %1").arg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( u,
                                      KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                      text );
     }
 
     u.setPath( KGlobalSettings::desktopPath() );
-    text = i18n("Desktop: %1").tqarg( u.path( +1 ) );
+    text = i18n("Desktop: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
@@ -185,7 +185,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "up" )->plug( toolbar );
     coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
-                                            "button will take you to file:/home.</qt>").tqarg(getlogin()));
+                                            "button will take you to file:/home.</qt>").arg(getlogin()));
     coll->action( "back" )->plug( toolbar );
     coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history."));
     coll->action( "forward" )->plug( toolbar );
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index e8139e18..e959ccdc 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -73,7 +73,7 @@ tristate SQLite2ToSQLite3Migration::run()
 
 	m_dlg = new KProgressDialog(0, 0, TQString(), 
 		i18n("Saving \"%1\" project file to a new \"%2\" database format...")
-		.tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3")
+		.arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
 	);
 	m_dlg->setModal(true);
 	connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index e89d0932..24e9707e 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -60,7 +60,7 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
 		"<p>Database file \"%1\" appears to be created by a version of Microsoft Access older than 2000.</p>"
 		"<p>In order to properly import national characters, you may need to choose a proper text encoding "
 		"if the database was created on a computer with a different character set.</p>")
-		.tqarg(TQDir::convertSeparators(databaseFile)), plainPage());
+		.arg(TQDir::convertSeparators(databaseFile)), plainPage());
 	lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak );
 	lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 );
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 91de5f7f..6d42da24 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -153,14 +153,14 @@ void ImportWizard::setupIntro()
 	if (m_predefinedConnectionData) { //predefined import: server source
 		msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database "
 		"<nobr>(connection %2)</nobr> into a Kexi database.</qt>")
-			.tqarg(m_predefinedDatabaseName).tqarg(m_predefinedConnectionData->serverInfoString());
+			.arg(m_predefinedDatabaseName).arg(m_predefinedConnectionData->serverInfoString());
 	}
 	else if (!m_predefinedDatabaseName.isEmpty()) { //predefined import: file source
 //! @todo this message is currently ok for files only
 		KMimeType::Ptr mimeTypePtr = KMimeType::mimeType(m_predefinedMimeType);
 		msg = i18n("<qt>Database Importing wizard is about to import <nobr>\"%1\"</nobr> file "
 		"of type \"%2\" into a Kexi database.</qt>")
-			.tqarg(TQDir::convertSeparators(m_predefinedDatabaseName)).tqarg(mimeTypePtr->comment());
+			.arg(TQDir::convertSeparators(m_predefinedDatabaseName)).arg(mimeTypePtr->comment());
 	}
 	else {
 		msg = i18n("Database Importing wizard allows you to import an existing database "
@@ -572,7 +572,7 @@ void ImportWizard::arriveImportingPage() {
 void ImportWizard::arriveFinishPage() {
 //	backButton()->hide();
 //	cancelButton()->setEnabled(false);
-//	m_finishLbl->setText(	m_successText.tqarg(m_dstNewDBNameLineEdit->text()) );
+//	m_finishLbl->setText(	m_successText.arg(m_dstNewDBNameLineEdit->text()) );
 }
 
 bool ImportWizard::fileBasedSrcSelected() const
@@ -820,7 +820,7 @@ tristate ImportWizard::import()
 		if (KMessageBox::Yes != KMessageBox::warningYesNo(this,
 			"<qt>"+i18n("Database %1 already exists."
 			"<p>Do you want to replace it with a new one?")
-			.tqarg(sourceDriver->data()->destination->infoString()),
+			.arg(sourceDriver->data()->destination->infoString()),
 			0, KGuiItem(i18n("&Replace")), KGuiItem(i18n("No"))))
 		{
 			return cancelled;
@@ -861,7 +861,7 @@ tristate ImportWizard::import()
 		setTitle(m_finishPage, i18n("Failure"));
 		m_finishLbl->setText(	
 			i18n("<p>Import failed.</p>%1<p>%2</p><p>You can click \"Back\" button and try again.</p>")
-			.tqarg(msg).tqarg(details));
+			.arg(msg).arg(details));
 		return false;
 	}
 //	delete kexi_conn;
@@ -899,9 +899,9 @@ void ImportWizard::next()
 				dbname = m_srcConn->selectedConnectionData() 
 					? m_srcConn->selectedConnectionData()->serverInfoString() : TQString();
 				if (!dbname.isEmpty())
-					dbname = TQString(" \"%1\"").tqarg(dbname);
+					dbname = TQString(" \"%1\"").arg(dbname);
 			KMessageBox::error(this, i18n("Could not import database%1. This type is not supported.")
-				.tqarg(dbname));
+				.arg(dbname));
 			return;
 		}
 	}
@@ -922,7 +922,7 @@ void ImportWizard::next()
 			if (true == res) {
 				m_finishLbl->setText( 
 					i18n("Database has been imported into Kexi database project \"%1\".")
-					.tqarg(m_dstNewDBNameLineEdit->text()) );
+					.arg(m_dstNewDBNameLineEdit->text()) );
 				cancelButton()->setEnabled(false);
 				setBackEnabled(m_finishPage, false);
 				setFinishEnabled(m_finishPage, true);
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index 7b4944f2..1c3295b6 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -74,7 +74,7 @@ bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::Obje
 	if (!destDriver) {
 		result->setStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.tqarg(m_migrateData->destination->databaseName()));
+			.arg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -124,7 +124,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (!destDriver) {
 		result->setStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.tqarg(m_migrateData->destination->databaseName()));
+			.arg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -136,7 +136,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		kdDebug() << "Couldnt connect to database server" << endl;
 		if (result)
 			result->setStatus(i18n("Could not connect to data source \"%1\".")
-				.tqarg(m_migrateData->source->serverInfoString()), "");
+				.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -147,7 +147,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		if (result)
 			result->setStatus(
 				i18n("Could not get a list of table names for data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()), "");
+					.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -157,7 +157,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		if (result)
 			result->setStatus(
 				i18n("No tables to import found in data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()), "");
+					.arg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -173,7 +173,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (kexi__objects_exists) {
 		tristate res = drv_queryStringListFromSQL(
 			TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
-		.tqarg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
+		.arg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
 		if (res == true) {
 			// prepend KexiDB-compatible tables to 'tables' list, so we'll copy KexiDB-compatible tables first,
 			// to make sure existing IDs will not be in conflict with IDs newly generated for non-KexiDB tables
@@ -201,7 +201,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 			if (result)
 				result->setStatus(
 					i18n("Could not import project from data source \"%1\". Error reading table \"%2\".")
-					.tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), "");
+					.arg(m_migrateData->source->serverInfoString()).arg(tableName), "");
 			return false;
 		}
 		//yeah, got a table
@@ -230,7 +230,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 			if (result)
 				result->setStatus(destConn,
 					i18n("Could not create database \"%1\".")
-					.tqarg(m_migrateData->destination->databaseName()));
+					.arg(m_migrateData->destination->databaseName()));
 			//later destConn->dropDatabase(m_migrateData->destination->databaseName());
 			//don't delete prj, otherwise eror message will be deleted		delete prj;
 			//later return m_destPrj;
@@ -250,7 +250,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 			bool firstRecord = true;
 			if (true == drv_fetchRecordFromSQL(
 					TQString("SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects "
-					"WHERE o_name='%1' AND o_type=%1").tqarg(*it).tqarg((int)KexiDB::TableObjectType), 
+					"WHERE o_name='%1' AND o_type=%1").arg(*it).arg((int)KexiDB::TableObjectType), 
 					data, firstRecord)
 				&& destConn->setupObjectSchemaData( data, *t ))
 			{
@@ -260,7 +260,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 				TQString sql(
 					TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
 						"f_options, f_default, f_order, f_caption, f_help"
-						" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) );
+						" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->id()) );
 				while (ok) {
 					tristate res = drv_fetchRecordFromSQL(sql, data, firstRecord);
 					if (res != true) {
@@ -301,7 +301,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 				if (result)
 					result->setStatus(destConn,
 						i18n("Could not create database \"%1\".")
-						.tqarg(m_migrateData->destination->databaseName()));
+						.arg(m_migrateData->destination->databaseName()));
 				m_tableSchemas.remove(ts);
 				break;
 			}
@@ -331,7 +331,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 			if (result)
 				result->setStatus(m_destPrj,
 					i18n("Could not import project from data source \"%1\".")
-					.tqarg(m_migrateData->source->serverInfoString()));
+					.arg(m_migrateData->source->serverInfoString()));
 		}
 	}
 
@@ -381,7 +381,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 				kdDebug() << "Failed to copy table " << tname << endl;
 				if (result)
 					result->setStatus(destConn,
-						i18n("Could not copy table \"%1\" to destination database.").tqarg(tname));
+						i18n("Could not copy table \"%1\" to destination database.").arg(tname));
 				break;
 			}
 		}//for
@@ -406,7 +406,7 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (result && result->error())
 		result->setStatus(destConn,
 			i18n("Could not import data from data source \"%1\".")
-				.tqarg(m_migrateData->source->serverInfoString()));
+				.arg(m_migrateData->source->serverInfoString()));
 	if (destConn) {
 		destConn->debugError();
 		destConn->rollbackTransaction(trans);
@@ -512,7 +512,7 @@ KexiDB::Field::Type KexiMigrate::userType(const TQString& fname)
 	res = dlg->getItem( i18n("Field Type"),
 	                    i18n("The data type for %1 could not be determined. "
 				 "Please select one of the following data "
-				 "types").tqarg(fname),
+				 "types").arg(fname),
                       types, 0, false);
 
 //! @todo use TQMap<TQCString, KexiDB::Field::Type> here!
@@ -575,9 +575,9 @@ bool KexiMigrate::isValid()
 	{
 		setError(ERR_INCOMPAT_DRIVER_VERSION,
 		i18n("Incompatible migration driver's \"%1\" version: found version %2, expected version %3.")
-		.tqarg(name())
-		.tqarg(TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()))
-		.tqarg(TQString("%1.%2").tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor())));
+		.arg(name())
+		.arg(TQString("%1.%2").arg(versionMajor()).arg(versionMinor()))
+		.arg(TQString("%1.%2").arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor())));
 		return false;
 	}
 	return true;
@@ -588,8 +588,8 @@ bool KexiMigrate::drv_queryMaxNumber(const TQString& tableName,
 {
 	TQString string;
 	tristate r = drv_querySingleStringFromSQL(
-		TQString::fromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName))
-		.tqarg(drv_escapeIdentifier(tableName)), 0, string);
+		TQString::fromLatin1("SELECT MAX(%1) FROM %2").arg(drv_escapeIdentifier(columnName))
+		.arg(drv_escapeIdentifier(tableName)), 0, string);
 	if (r == false)
 		return false;
 	if (~r) {
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index d46b9e4d..945f084c 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -131,19 +131,19 @@ bool MigrateManagerInternal::lookupDrivers()
 			<< srv_name.lower() << "' driver's version -- skipping it!" << endl;
 			possibleProblems += TQString("\"%1\" migration driver has unrecognized version; "
 				"required driver version is \"%2.%3\"")
-				.tqarg(srv_name.lower())
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor());
+				.arg(srv_name.lower())
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
 			continue;
 		}
 		if (major_ver != KexiMigration::versionMajor() || minor_ver != KexiMigration::versionMinor()) {
 			KexiDBWarn << TQString("MigrateManagerInternal::lookupDrivers(): '%1' driver" 
 				" has version '%2' but required migration driver version is '%3.%4'\n"
-				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()) << endl;
+				" -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()) << endl;
 			possibleProblems += TQString("\"%1\" migration driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
-				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor());
+				.arg(srv_name.lower()).arg(srv_ver_str)
+				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
 			continue;
 		}
 //</COPIED>
@@ -188,7 +188,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name)
 		return drv; //cached
 
 	if (!m_services_lcase.contains(name.lower())) {
-		setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").arg(name) );
 		return 0;
 	}
 
@@ -201,7 +201,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name)
 
 	if (!drv) {
 		setError(ERR_DRIVERMANAGER, i18n("Could not load import/export database driver \"%1\".")
-				.tqarg(name) );
+				.arg(name) );
 		if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound";
 			m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
@@ -314,7 +314,7 @@ TQString MigrateManager::driverForMimeType(const TQString &mimeType)
 	
 	KService::Ptr ptr = d_int->m_services_by_mimetype[mimeType.lower()];
 	if (!ptr) {
-		kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").tqarg(mimeType) << endl;
+		kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").arg(mimeType) << endl;
 		return TQString();
 	}
 
@@ -325,7 +325,7 @@ KexiMigrate* MigrateManager::driver(const TQString& name)
 {
 	KexiMigrate *drv = d_int->driver(name);
 	if (d_int->error()) {
-		kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").tqarg(name).tqarg(d_int->errorMsg()) << endl;
+		kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").arg(name).arg(d_int->errorMsg()) << endl;
 		setError(d_int);
 	}
 	return drv;
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index b7f04351..904e0c92 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect()
     if (m_migrateData->source->port == 0)
         m_migrateData->source->port = 5432;
 
-    conninfo += TQString::fromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
+    conninfo += TQString::fromLatin1(" port='%1'").arg(m_migrateData->source->port);
 
-    conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
+    conninfo += TQString::fromLatin1(" dbname='%1'").arg(m_migrateData->sourceName);
 
     if (!m_migrateData->source->userName.isNull())
-        conninfo += TQString::fromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
+        conninfo += TQString::fromLatin1(" user='%1'").arg(m_migrateData->source->userName);
 
     if (!m_migrateData->source->password.isNull())
-        conninfo += TQString::fromLatin1(" password='%1'").tqarg(m_migrateData->source->password);
+        conninfo += TQString::fromLatin1(" password='%1'").arg(m_migrateData->source->password);
 
     try
     {
@@ -377,7 +377,7 @@ bool PqxxMigrate::primaryKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").tqarg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").arg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_pkey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -569,7 +569,7 @@ bool PqxxMigrate::uniqueKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").tqarg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").arg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_ukey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 921432b6..a20dbe21 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -352,12 +352,12 @@ public:
 			msg = TQString();
 		// hardcoded, but it's not that bad
 		else if (actionType=="macro")
-			msg = i18n("&Select macro to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select macro to be executed after clicking \"%1\" button:").arg(actionWidgetName);
 		else if (actionType=="script")
-			msg = i18n("&Select script to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select script to be executed after clicking \"%1\" button:").arg(actionWidgetName);
 		//default: table/query/form/report...
 		else
-			msg = i18n("&Select object to be opened after clicking \"%1\" button:").tqarg(actionWidgetName);
+			msg = i18n("&Select object to be opened after clicking \"%1\" button:").arg(actionWidgetName);
 		selectActionToBeExecutedLbl->setText(msg);
 	}
 
@@ -587,7 +587,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
 				d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin);
 				d->kactionListView->init();
-				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName),
+				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName),
 					d->kactionPageWidget);
 				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
@@ -613,7 +613,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 					d->currentFormActionsPageWidget, d->mainWin);
 				d->currentFormActionsListView->init();
 				TQLabel *lbl = new TQLabel(d->currentFormActionsListView, 
-					selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->currentFormActionsPageWidget);
+					selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->currentFormActionsPageWidget);
 				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
@@ -696,7 +696,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const
 			KexiPart::Info* partInfo = partItem ? Kexi::partManager().infoForMimeType( partItem->mimeType() ) : 0;
 			if (partInfo) {
 				// opening or executing: table:name, query:name, form:name, macro:name, script:name, etc.
-				data.string = TQString("%1:%2").tqarg(partInfo->objectName()).tqarg(partItem->name());
+				data.string = TQString("%1:%2").arg(partInfo->objectName()).arg(partItem->name());
 				data.option = actionToExecute->data;
 				return data;
 			}
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 8ae592d9..1a6df899 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -113,7 +113,7 @@ void KexiFormDataProvider::fillDataItems(KexiTableItem& row, bool cursorAtNewRow
 		kexipluginsdbg << "fill data of '" << itemIface->dataSource() <<  "' at idx=" << it.data() 
 			<< " data=" << value << (indexForVisibleLookupValue!=-1 
 				? TQString(" SPECIAL: indexForVisibleLookupValue=%1 visibleValue=%2")
-					.tqarg(indexForVisibleLookupValue).tqarg(visibleLookupValue.toString())
+					.arg(indexForVisibleLookupValue).arg(visibleLookupValue.toString())
 				: TQString())
 			<< endl;
 		const bool displayDefaultValue = cursorAtNewRow && (value.isNull() && visibleLookupValue.isNull())
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index e882c082..d87b31c5 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -462,7 +462,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 //! just inherited StdWidgetFactory::clearWidgetContent() should be called
 		KLineEdit *lineedit = static_cast<KLineEdit*>(w);
 		createEditor(classname, lineedit->text(), lineedit, container,
-			lineedit->tqgeometry(), lineedit->tqalignment(), true);
+			lineedit->geometry(), lineedit->alignment(), true);
 		return true;
 	}
 	if(classname == "KexiDBTextEdit")
@@ -471,7 +471,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 //! just inherited StdWidgetFactory::clearWidgetContent() should be called
 		KTextEdit *textedit = static_cast<KTextEdit*>(w);
 		createEditor(classname, textedit->text(), textedit, container,
-			textedit->tqgeometry(), textedit->tqalignment(), true, true);
+			textedit->geometry(), textedit->alignment(), true, true);
 		//copy a few properties
 		KTextEdit *ed = dynamic_cast<KTextEdit *>( editor(w) );
 		ed->setWrapPolicy(textedit->wrapPolicy());
@@ -502,8 +502,8 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 		else
 		{
 			createEditor(classname, label->text(), label, container,
-				label->tqgeometry(), label->tqalignment(), 
-				false, label->tqalignment() & TQt::WordBreak /*multiline*/);
+				label->geometry(), label->alignment(), 
+				false, label->alignment() & TQt::WordBreak /*multiline*/);
 		}
 		return true;
 	}
@@ -529,12 +529,12 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 		if(static_cast<KexiDBAutoField*>(w)->hasAutoCaption())
 			return false; // caption is auto, abort editing
 		TQLabel *label = static_cast<KexiDBAutoField*>(w)->label();
-		createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+		createEditor(classname, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	else if (classname == "KexiDBCheckBox") {
 		KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w);
-		TQRect r( cb->tqgeometry() );
+		TQRect r( cb->geometry() );
 		r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
 		createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto);
 		return true;
@@ -679,7 +679,7 @@ KexiDBFactory::changeText(const TQString &text)
 		changeProperty("caption", text, form);
 		return true;
 	}
-	//! \todo check field's tqgeometry
+	//! \todo check field's geometry
 	return false;
 }
 
@@ -690,7 +690,7 @@ KexiDBFactory::resizeEditor(TQWidget *editor, TQWidget *w, const TQCString &clas
 	//TQPoint p = widget->pos();
 
 	if(classname == "KexiDBAutoField")
-		editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->tqgeometry() );
+		editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->geometry() );
 }
 
 void
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
index 3c20510e..68dea85f 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
@@ -43,7 +43,7 @@ void KexiDBTextWidgetInterface::setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQ
 	}
 }
 
-void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int tqalignment, bool hasFocus )
+void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int alignment, bool hasFocus )
 {
 	KexiFormDataItemInterface *dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(w);
 	KexiDB::QueryColumnInfo *columnInfo = dataItemIface ? dataItemIface->columnInfo() : 0;
@@ -57,7 +57,7 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt
 			}
 			KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
 				2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, 
-				w->height() - margin*2 -2, tqalignment, hasFocus);
+				w->height() - margin*2 -2, alignment, hasFocus);
 		}
 	}
 }
@@ -66,6 +66,6 @@ void KexiDBTextWidgetInterface::event( TQEvent * e, TQWidget *w, bool textIsEmpt
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {
 		if (m_autonumberDisplayParameters && textIsEmpty)
-			w->tqrepaint();
+			w->repaint();
 	}
 }
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.h b/kexi/plugins/forms/kexidbtextwidgetinterface.h
index 6e0299c0..17382e31 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.h
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.h
@@ -40,7 +40,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextWidgetInterface
 		void setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQWidget *w);
 
 		//! Called from paintEvent( TQPaintEvent *pe ) method of the data aware widget.
-		void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int tqalignment, bool hasFocus );
+		void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int alignment, bool hasFocus );
 
 		//! Called from event( TQEvent * e ) method of the data aware widget.
 		void event( TQEvent * e, TQWidget *w, bool textIsEmpty );
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 4e066bd6..55e999db 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -56,7 +56,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 		return 0;
 	KexiPart::Info *info = 0;
 	if (_actionType!="kaction" && _actionType!="currentForm") {
-		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(_actionType) );
+		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) );
 		if (!info)
 			return 0;
 	}
@@ -85,7 +85,7 @@ void KexiFormEventAction::activate()
 	if (!project)
 		return;
 	KexiPart::Part* part = Kexi::partManager().partForMimeType( 
-		TQString("kexi/%1").tqarg(m_actionName) );
+		TQString("kexi/%1").arg(m_actionName) );
 	if (!part)
 		return;
 	KexiPart::Item* item = project->item( part->info(), m_objectName );
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 9674f4fe..8c0c66e7 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -112,7 +112,7 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString&
 		propValues.insert("dataSource", name);
 		propValues.insert("dataSourceMimeType", mime);
 		KFormDesigner::CommandGroup *group 
-			= new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").tqarg(name.data()), propertySet());
+			= new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").arg(name.data()), propertySet());
 		propertySet()->createPropertyCommandsInDesignMode(formWidget, propValues, group, true /*addToActiveForm*/);
 	}
 
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 84c50efd..9d8017d8 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -277,7 +277,7 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc)
 		TQDomElement lNameProperty = domDoc.createElement("property");
 		lNameProperty.setAttribute("name", "name");
 		TQDomElement lType = domDoc.createElement("cstring");
-		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").tqarg(list->field(i)->name()));
+		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").arg(list->field(i)->name()));
 		lType.appendChild(lClassN);
 		lNameProperty.appendChild(lType);
 		lclass.appendChild(lNameProperty);
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 790064e2..b4b58f70 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -150,9 +150,9 @@ void KexiFormScrollView::moveToFirstRecordRequested()
 	selectFirstRow();
 }
 
-void KexiFormScrollView::clearColumnsInternal(bool tqrepaint)
+void KexiFormScrollView::clearColumnsInternal(bool repaint)
 {
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
@@ -349,7 +349,7 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 }
 
 /*void KexiFormScrollView::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* result, bool tqrepaint)
+	KexiDB::ResultInfo* result, bool repaint)
 {
 	//! @todo
 }*/
@@ -359,18 +359,18 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 	//! @todo
 }*/
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool tqrepaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool repaint)
 {
 	Q_UNUSED( item );
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool repaint)
 {
 	Q_UNUSED( item );
 	Q_UNUSED( row );
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 	//! @todo
 }
 
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index d8326a57..7d2b9867 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -162,17 +162,17 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 		virtual void slotRowRepaintRequested(KexiTableItem& item);
 
 		//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
-		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
-		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
+		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
+		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
 
-		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 		virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
+		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & );
 
@@ -193,7 +193,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 
 	protected:
 		//! Implementation for KexiDataAwareObjectInterface
-		virtual void clearColumnsInternal(bool tqrepaint);
+		virtual void clearColumnsInternal(bool repaint);
 
 		//! Implementation for KexiDataAwareObjectInterface
 		virtual void addHeaderColumn(const TQString& caption, const TQString& description, 
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 3b7968de..36a64db7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -350,7 +350,7 @@ void KexiFormView::updateValuesForSubproperties()
 				if (meta) {
 					// Special case: the property value of type enum (set) but is saved as a string list,
 					// not as int, so we need to translate it to int. It's been created as such
-					// by FormIO::readPropertyValue(). Example: "tqalignment" property.
+					// by FormIO::readPropertyValue(). Example: "alignment" property.
 					if (meta->isSetType() && subpropIt.data().type()==TQVariant::StringList) {
 						TQStrList keys;
 						const TQStringList list( subpropIt.data().toStringList() );
@@ -1115,7 +1115,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 //		KFormDesigner::WidgetList* prevSelection = form()->selectedWidgets();
 	KFormDesigner::WidgetList widgetsToSelect;
 	KFormDesigner::CommandGroup *group = new KFormDesigner::CommandGroup(
-		fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").tqarg(fields.count()),
+		fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").arg(fields.count()),
 		KFormDesigner::FormManager::self()->propertySet()
 	);
 	
@@ -1191,10 +1191,10 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	}
 	if (widgetsToSelect.last()) {
 		//resize form if needed
-		TQRect oldFormRect( m_dbform->tqgeometry() );
+		TQRect oldFormRect( m_dbform->geometry() );
 		TQRect newFormRect( oldFormRect );
-		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->tqgeometry().right()+1));
-		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->tqgeometry().bottom()+1));
+		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->geometry().right()+1));
+		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->geometry().bottom()+1));
 		if (newFormRect != oldFormRect) {
 			//1. resize by hand
 			m_dbform->setGeometry( newFormRect );
@@ -1205,8 +1205,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 			group->addCommand(resizeFormCommand, true/*will be executed on CommandGroup::execute()*/);
 		}
 
-		//remember tqgeometry of the last inserted widget
-		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->tqgeometry();
+		//remember geometry of the last inserted widget
+		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->geometry();
 	}
 
 	//eventually, add entire command group to active form
@@ -1217,11 +1217,11 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	//enable proper REDO usage
 	group->resetAllowExecuteFlags();
 
-	m_scrollView->tqrepaint();
-	m_scrollView->viewport()->tqrepaint();
+	m_scrollView->repaint();
+	m_scrollView->viewport()->repaint();
 	m_scrollView->repaintContents();
 	m_scrollView->updateContents();
-	m_scrollView->clipper()->tqrepaint();
+	m_scrollView->clipper()->repaint();
 	m_scrollView->refreshContentsSize();
 
 	//select all inserted widgets, if multiple
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index 8bc1cb79..f269abf7 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -218,7 +218,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		TQGuardedPtr<TQWidget> m_setFocusInternalOnce;
 
 	
-		/*! Stores tqgeometry of widget recently inserted using insertAutoFields() method.
+		/*! Stores geometry of widget recently inserted using insertAutoFields() method.
 		 having this information, we'r eable to compute position for a newly 
 		 inserted widget in insertAutoFields() is such position has not been specified.
 		 (the position is specified when a widget is inserted with mouse drag & dropping
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 939d9b91..3a8e8453 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -232,7 +232,7 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 		m_subwidget->show();
 	//! \todo support right-to-left tqlayout where positions are inverted
 	if (position==Top || position==Left) {
-		int align = d->label->tqalignment();
+		int align = d->label->alignment();
 		if(position == Top) {
 			d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
 			align |= AlignVertical_Mask;
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 231003cf..db56b550 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -62,7 +62,7 @@ class KexiDBComboBox::Private
 	TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), 
 	                //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange()
 	KexiDB::QueryColumnInfo* visibleColumnInfo;
-	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false)
+	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its children (if isEditable is false)
 	bool isEditable : 1; //!< true is the combo box is editable
 	bool buttonPressed : 1;
 	bool mouseOver : 1;
@@ -259,7 +259,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 	    if ( arrowRect.contains( e->pos() ) ) {
 		d->arrowPressed = TRUE;
 		d->arrowDown    = TRUE;
-		tqrepaint( FALSE );
+		repaint( FALSE );
 	    }
 	} else {*/
 		showPopup();
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index dec6da1d..60ed78d1 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -111,7 +111,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		//! \return internal editor's tqgeometry
+		//! \return internal editor's geometry
 		TQRect editorGeometry() const;
 
 		//! Creates editor. Reimplemented, because if the combo box is not editable, 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index bcf28a58..17242953 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -125,13 +125,13 @@ KexiDBForm::~KexiDBForm()
 
 KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->dataAwareObject; }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		TQT_TQWIDGET(obj)->tqrepaint();
+		TQT_TQWIDGET(obj)->repaint();
 	}
 	delete list;
 }
@@ -148,7 +148,7 @@ void
 KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -192,7 +192,7 @@ void
 KexiDBForm::clearForm()
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -216,7 +216,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -313,18 +313,18 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 			if (it.current()->widget()->focusPolicy() & TQ_TabFocus) {
 				//this widget has tab focus:
 				it.current()->widget()->installEventFilter(this);
-				//also filter events for data-aware tqchildren of this widget (i.e. KexiDBAutoField's editors)
-				TQObjectList *tqchildren = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
-				for (TQObjectListIt tqchildrenIt(*tqchildren); tqchildrenIt.current(); ++tqchildrenIt) {
-	//				if (dynamic_cast<KexiFormDataItemInterface*>(tqchildrenIt.current())) {
+				//also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors)
+				TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
+				for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) {
+	//				if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) {
 						kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" 
-							<< tqchildrenIt.current()->className() << " " << tqchildrenIt.current()->name()  
+							<< childrenIt.current()->className() << " " << childrenIt.current()->name()  
 							<< "' child to filtered widgets" << endl;
-						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(tqchildrenIt.current()));
-						tqchildrenIt.current()->installEventFilter(this);
+						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
+						childrenIt.current()->installEventFilter(this);
 		//			}
 				}
-				delete tqchildren;
+				delete children;
 				if (fromWidget) {
 					kexipluginsdbg << "KexiDBForm::updateTabStopsOrder() tab order: " << fromWidget->name() 
 						<< " -> " << it.current()->widget()->name() << endl;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 3ff18406..5b8b2939 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -67,7 +67,7 @@ static TQPixmap* KexiDBImageBox_pmSmall = 0;
 KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name )
 	: KexiFrame( parent, name, TQt::WNoAutoErase )
 	, KexiFormDataItemInterface()
-	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
+	, m_alignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
 	, m_readOnly(false)
 	, m_scaledContents(false)
@@ -176,7 +176,7 @@ void KexiDBImageBox::setValueInternal( const TQVariant& add, bool removeOld, boo
 		m_valueMimeType = TQString();
 		m_pixmap = TQPixmap();
 	}
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setInvalidState( const TQString& displayText )
@@ -242,7 +242,7 @@ void KexiDBImageBox::setPixmapId(uint id)
 	if (m_insideSetData) //avoid recursion
 		return;
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*unstored*/false ));
-	tqrepaint();
+	repaint();
 }
 
 uint KexiDBImageBox::storedPixmapId() const
@@ -257,7 +257,7 @@ uint KexiDBImageBox::storedPixmapId() const
 void KexiDBImageBox::setStoredPixmapId(uint id)
 {
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*stored*/true ));
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBImageBox::hasScaledContents() const
@@ -276,14 +276,14 @@ void KexiDBImageBox::setScaledContents(bool set)
 {
 //todo	m_pixmapLabel->setScaledContents(set);
 	m_scaledContents = set;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setKeepAspectRatio(bool set)
 {
 	m_keepAspectRatio = set;
 	if (m_scaledContents)
-		tqrepaint();
+		repaint();
 }
 
 TQWidget* KexiDBImageBox::widget()
@@ -331,7 +331,7 @@ void KexiDBImageBox::handleInsertFromFileAction(const KURL& url)
 		if (!h)
 			return;
 		setData(h);
-		tqrepaint();
+		repaint();
 	}
 	else {
 		//db-aware
@@ -429,7 +429,7 @@ void KexiDBImageBox::handlePasteAction()
 		}
 	}
 	
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();
 		signalValueChanged();
@@ -455,7 +455,7 @@ void KexiDBImageBox::clear()
 	//! @todo emit signal for setting "dirty" flag within the design
 
 //	m_pixmap = TQPixmap(); //will be loaded on demand
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();//valueChanged(data());
 		signalValueChanged();
@@ -573,7 +573,7 @@ void KexiDBImageBox::updateActionStrings()
 				 (see doc/dev/settings.txt) */
 				beautifiedImageBoxName = beautifiedImageBoxName[0].upper() + beautifiedImageBoxName.mid(1);
 			}
-			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").tqarg(beautifiedImageBoxName));
+			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").arg(beautifiedImageBoxName));
 		}
 	}
 }
@@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (m_designMode && pixmap().isNull()) {
 		TQPixmap pm(size()-TQSize(m, m));
 		TQPainter p2;
-		p2.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+		p2.begin(TQT_TQPAINTDEVICE(&pm), this);
 		p2.fillRect(0,0,width(),height(), bg);
 
 		updatePixmap();
@@ -678,7 +678,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 		//clearing needed here because we may need to draw a pixmap with transparency
 		p.fillRect(0,0,width(),height(), bg);
 
-		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_tqalignment, 
+		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_alignment, 
 			m_scaledContents, m_keepAspectRatio );
 	}
 	KexiFrame::drawFrame( &p );
@@ -697,7 +697,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (oldPalette.active().background()!=palette().active().background()) {
 		delete KexiDBImageBox_pm;
 		KexiDBImageBox_pm = 0;
-		tqrepaint();
+		repaint();
 	}
 }*/
 
@@ -715,11 +715,11 @@ void KexiDBImageBox::updatePixmap()
 	}
 }
 
-void KexiDBImageBox::setAlignment(int tqalignment)
+void KexiDBImageBox::setAlignment(int alignment)
 {
-	m_tqalignment = tqalignment;
+	m_alignment = alignment;
 	if (!m_scaledContents || m_keepAspectRatio)
-		tqrepaint();
+		repaint();
 }
 
 void KexiDBImageBox::setData(const KexiBLOBBuffer::Handle& handle)
@@ -839,7 +839,7 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e )
 {
 	if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible
 		if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) {
-			update(); //to tqrepaint focus rect
+			update(); //to repaint focus rect
 		}
 	}
 	// hide popup menu as soon as it loses focus
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index a7adb3c8..860ee4c6 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -48,7 +48,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 	TQ_PROPERTY( uint storedPixmapId READ storedPixmapId WRITE setStoredPixmapId DESIGNABLE false STORED true )
 	TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
 	TQ_PROPERTY( bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio )
-	TQ_PROPERTY( int tqalignment READ tqalignment WRITE setAlignment )
+	TQ_PROPERTY( int alignment READ alignment WRITE setAlignment )
 //	TQ_PROPERTY( TQString originalFileName READ originalFileName WRITE setOriginalFileName DESIGNABLE false )
 //	TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
 	TQ_PROPERTY( bool dropDownButtonVisible READ dropDownButtonVisible WRITE setDropDownButtonVisible )
@@ -95,7 +95,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 //		bool designMode() const { return m_designMode; }
 
-		int tqalignment() const { return m_tqalignment; }
+		int alignment() const { return m_alignment; }
 
 		bool keepAspectRatio() const { return m_keepAspectRatio; }
 
@@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 		void setScaledContents(bool set);
 
-		void setAlignment(int tqalignment);
+		void setAlignment(int alignment);
 
 		void setKeepAspectRatio(bool set);
 
@@ -258,7 +258,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 //moved		KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction,
 //			*m_deleteAction, *m_propertiesAction;
 //		TQTimer m_clickTimer;
-		int m_tqalignment;
+		int m_alignment;
 		TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal()
 		bool m_designMode : 1;
 		bool m_readOnly : 1;
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 2f653f00..adb833fa 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -63,7 +63,7 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
 	: TQLabel( parent )
 	, m_parentLabel(parent)
 {
-	int a = tqalignment() | TQt::WordBreak;
+	int a = alignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
 	a |= TQt::AlignTop;
 	setAlignment( a );
@@ -426,7 +426,7 @@ void KexiDBLabel::init()
 	d->internalLabel->hide();
 	d->frameColor = tqpalette().active().foreground();
 
-	setAlignment( d->internalLabel->tqalignment() );
+	setAlignment( d->internalLabel->alignment() );
 }
 
 void KexiDBLabel::updatePixmapLater() {
@@ -453,7 +453,7 @@ void KexiDBLabel::updatePixmap() {
 	d->internalLabel->setText( text() );
 	d->internalLabel->setFixedSize( size() );
 	d->internalLabel->setPalette( palette() );
-	d->internalLabel->setAlignment( tqalignment() );
+	d->internalLabel->setAlignment( alignment() );
 //	d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap
 	KPixmap shadowPixmap = d->internalLabel->getShadowPixmap();
 	if (shadowPixmap.isNull())
@@ -461,7 +461,7 @@ void KexiDBLabel::updatePixmap() {
 	d->shadowPixmap = shadowPixmap;
 	d->shadowPosition = d->internalLabel->m_shadowRect.topLeft();
 	d->pixmapDirty = false;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::paintEvent( TQPaintEvent* e )
@@ -491,7 +491,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e )
 			p.drawPixmap( d->internalLabel->m_shadowRect.topLeft(), d->shadowPixmap, clipRect );
 		}
 	}
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), false );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), false );
 	TQLabel::paintEvent( e );
 }
 
@@ -577,7 +577,7 @@ void KexiDBLabel::setShadowEnabled( bool state ) {
 	d->pixmapDirty = true;
 	if (state)
 		d->internalLabel->updateFrame();
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::resizeEvent( TQResizeEvent* e ) {
@@ -636,7 +636,7 @@ void KexiDBLabel::setText( const TQString& text ) {
 	TQLabel::setText( text );
 	//This is necessary for KexiFormDataItemInterface
 	valueChanged();
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBLabel::shadowEnabled() const
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5bb74e22..815adca9 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -331,14 +331,14 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo)
 /*todo
 void KexiDBLineEdit::paint( TQPainter *p )
 {
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }*/
 
 void KexiDBLineEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KLineEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 bool KexiDBLineEdit::event( TQEvent * e )
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index c4cbe4d0..b6ab6b03 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -145,7 +145,7 @@ void KexiDBTextEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KTextEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 TQPopupMenu * KexiDBTextEdit::createPopupMenu(const TQPoint & pos)
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index 2f6ca562..ce51766c 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 			GroupBoxPanel = TQFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style
 		};
 		Shape frameShape() const;
-		void setFrameShape( KexiFrame::Shape tqshape );
+		void setFrameShape( KexiFrame::Shape shape );
 		Shadow frameShadow() const;
 		void setFrameShadow( KexiFrame::Shadow shadow );
 #endif
diff --git a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
index 7adfbaa8..22a71001 100644
--- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
+++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
@@ -69,9 +69,9 @@ ClassName::Shape ClassName::frameShape() const
 	return d->frameShape;
 }
 
-void ClassName::setFrameShape( ClassName::Shape tqshape )
+void ClassName::setFrameShape( ClassName::Shape shape )
 {
-	d->frameShape = tqshape;
+	d->frameShape = shape;
 	update();
 }
 
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index e89f6a65..94642d38 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -255,9 +255,9 @@ void KexiCSVExportWizard::showPage ( TQWidget * page )
 		int columns = KexiDB::fieldCount(*m_tableOrQuery);
 		text += "\n";
 		if (m_rowCount>0)
-			text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns);
+			text += i18n("(rows: %1, columns: %2)").arg(m_rowCount).arg(columns);
 		else
-			text += i18n("(columns: %1)").tqarg(columns);
+			text += i18n("(columns: %1)").arg(columns);
 		m_infoLblFrom->setLabelText(text);
 		TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
 		m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() );
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 5dd04ed9..69942a79 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -352,7 +352,7 @@ if ( m_mode == Clipboard )
 	if (m_mode == File) {
 		m_loadingProgressDlg = new KProgressDialog(
 			this, "m_loadingProgressDlg", i18n("Loading CSV Data"), i18n("Loading CSV Data from \"%1\"...")
-			.tqarg(TQDir::convertSeparators(m_fname)), true);
+			.arg(TQDir::convertSeparators(m_fname)), true);
 		m_loadingProgressDlg->progressBar()->setTotalSteps( m_maximumRowsForPreview+1 );
 		m_loadingProgressDlg->show();
 	}
@@ -440,7 +440,7 @@ bool KexiCSVImportDialog::openData()
 		delete m_file;
 		m_file = 0;
 		KMessageBox::sorry( this, i18n("Cannot open input file <nobr>\"%1\"</nobr>.")
-			.tqarg(TQDir::convertSeparators(m_fname)) );
+			.arg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
 		if (parentWidget())
@@ -458,7 +458,7 @@ bool KexiCSVImportDialog::cancelled() const
 void KexiCSVImportDialog::fillTable()
 {
 	KexiUtils::WaitCursor wc(true);
-	tqrepaint();
+	repaint();
 	m_blockUserEvents = true;
 	TQPushButton *pb = actionButton(KDialogBase::Cancel);
 	if (pb)
@@ -530,16 +530,16 @@ void KexiCSVImportDialog::fillTable()
 		m_startAtLineSpinBox->setMaxValue(count);
 		m_startAtLineSpinBox->setValue(m_startline+1);
 	}
-	m_startAtLineLabel->setText(i18n( "Start at line%1:").tqarg(
-			m_allRowsLoadedInPreview ? TQString(" (1-%1)").tqarg(count)
+	m_startAtLineLabel->setText(i18n( "Start at line%1:").arg(
+			m_allRowsLoadedInPreview ? TQString(" (1-%1)").arg(count)
 			: TQString() //we do not know what's real count
 	));
 	updateRowCountInfo();
 
 	m_blockUserEvents = false;
-	tqrepaint();
-	m_table->verticalScrollBar()->tqrepaint();//avoid missing tqrepaint
-	m_table->horizontalScrollBar()->tqrepaint();//avoid missing tqrepaint
+	repaint();
+	m_table->verticalScrollBar()->repaint();//avoid missing repaint
+	m_table->horizontalScrollBar()->repaint();//avoid missing repaint
 }
 
 TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextStream& inputStream)
@@ -548,7 +548,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 
 	// try to detect delimiter
 	// \t has priority, then ; then ,
-	const TQIODevice::Offset origOffset = inputStream.tqdevice()->at();
+	const TQIODevice::Offset origOffset = inputStream.device()->at();
 	TQChar c, prevChar=0;
 	int detectedDelimiter = 0;
 	bool insideQuote = false;
@@ -601,7 +601,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 		prevChar = c;
 	}
 
-	inputStream.tqdevice()->at(origOffset); //restore orig. offset
+	inputStream.device()->at(origOffset); //restore orig. offset
 
 	//now, try to find a delimiter character that exists the same number of times in all the checked lines
 	//this detection method has priority over others
@@ -882,7 +882,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 			m_1stRowForFieldNames->setChecked(true); //this will reload table
 			//slot1stRowForFieldNamesChanged(1);
 			m_blockUserEvents = false;
-			tqrepaint();
+			repaint();
 			return false;
 		}
 
@@ -926,7 +926,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 	if (col<(int)m_columnNames.count() && (m_1stRowForFieldNames->isChecked() || m_changedColumnNames[col]))
 		colName = m_columnNames[ col ];
 	if (colName.isEmpty()) {
-		colName = i18n("Column %1").tqarg(col+1); //will be changed to a valid identifier on import
+		colName = i18n("Column %1").arg(col+1); //will be changed to a valid identifier on import
 		m_changedColumnNames[ col ] = false;
 	}
 	int detectedType = m_detectedTypes[col];
@@ -937,7 +937,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 		detectedType=_TEXT_TYPE;
 	}
 	m_table->horizontalHeader()->setLabel(col, 
-		i18n("Column %1").tqarg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
+		i18n("Column %1").arg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
 	m_table->setText(0, col, colName);
 	m_table->horizontalHeader()->adjustHeaderSize();
 
@@ -1108,8 +1108,8 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i
 			TQCString t(text.latin1());
 			const int textLen = t.length();
 			for (int i=0; i<textLen; i++) {
-				if (t.tqat(i)==',') {
-					t.tqat(i) = '.';
+				if (t.at(i)==',') {
+					t.at(i) = '.';
 					break;
 				}
 			}
@@ -1295,7 +1295,7 @@ void KexiCSVImportDialog::currentCellChanged(int, int col)
 		type=_NUMBER_TYPE; //we're simplifying that for now
 
 	m_formatCombo->setCurrentItem( type );
-	m_formatLabel->setText( m_formatComboText.tqarg(col+1) );
+	m_formatLabel->setText( m_formatComboText.arg(col+1) );
 	m_primaryKeyField->setEnabled( _NUMBER_TYPE == m_detectedTypes[col]);
 	m_primaryKeyField->blockSignals(true); //block to disable executing slotPrimaryKeyFieldToggled()
 	 m_primaryKeyField->setChecked( m_primaryKeyColumn == col );
@@ -1522,7 +1522,7 @@ void KexiCSVImportDialog::accept()
 		}
 		m_importingProgressDlg->setLabel(
 			i18n("Importing CSV Data from <nobr>\"%1\"</nobr> into \"%2\" table...")
-			.tqarg(TQDir::convertSeparators(m_fname)).tqarg(m_destinationTableSchema->name()) );
+			.arg(TQDir::convertSeparators(m_fname)).arg(m_destinationTableSchema->name()) );
 		m_importingProgressDlg->progressBar()->setTotalSteps( TQFileInfo(*m_file).size() );
 		m_importingProgressDlg->show();
 	}
@@ -1569,7 +1569,7 @@ void KexiCSVImportDialog::accept()
 
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
-		.tqarg(m_destinationTableSchema->name()));
+		.arg(m_destinationTableSchema->name()));
 	parentWidget()->raise();
 	m_conn = 0;
 }
@@ -1651,12 +1651,12 @@ void KexiCSVImportDialog::updateRowCountInfo()
 	m_infoLbl->setFileName( m_fname );
 	if (m_allRowsLoadedInPreview) {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::remove( m_infoLbl );
 	}
 	else {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: more than %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: more than %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::add( m_infoLbl->commentLabel(), i18n("Not all rows are visible on this preview") );
 	}
 }
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index d2eb1df1..19922122 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -148,10 +148,10 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 	TQString identifier;
 	if(! partitem.isEmpty()) {
 		TQStringList parts = TQStringList::split(".", partitem);
-		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) );
+		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(parts[0]) );
 		KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0;
 		if(! item)
-			throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(partitem));
+			throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem));
 		identifier = TQString::number(item->identifier());
 	}
 
@@ -178,7 +178,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 		delete dlg;
 	}
 	else {
-		throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method));
+		throw KoMacro::Exception(i18n("No such method \"%1\"").arg(method));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index ccad645c..564b03c8 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -77,17 +77,17 @@ void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context)
 		return;
 	}
 
-	const TQString mimetype = TQString("kexi/%1").tqarg( context->variable("object")->variant().toString() );
+	const TQString mimetype = TQString("kexi/%1").arg( context->variable("object")->variant().toString() );
 	const TQString name = context->variable("name")->variant().toString();
 
 	KexiPart::Part* part = Kexi::partManager().partForMimeType(mimetype);
 	if(! part) {
-		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").tqarg(mimetype));
+		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").arg(mimetype));
 	}
 
 	KexiPart::Item* item = mainWin()->project()->item(part->info(), name);
 	if(! item) {
-		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype));
+		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype));
 	}
 
 	part->execute(item);
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index bc573d10..815b8723 100644
--- a/kexi/plugins/macros/kexiactions/navigateaction.cpp
+++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp
@@ -111,13 +111,13 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	KexiViewBase* view = dialog->selectedView();
 	if(! view) {
-		throw KoMacro::Exception(i18n("No view selected for \"%1\".").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("No view selected for \"%1\".").arg(dialog->caption()));
 	}
 
 	KexiDataAwareView* dbview = dynamic_cast<KexiDataAwareView*>( view );
 	KexiDataAwareObjectInterface* dbobj = dbview ? dbview->dataAwareObject() : 0;
 	if(! dbview) {
-		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").arg(dialog->caption()));
 	}
 
 	const TQString record = context->variable("record")->variant().toString();
@@ -151,7 +151,7 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 		void sortAscending();
 		void sortDescending();
 		*/
-		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").tqarg(record).tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").arg(record).arg(dialog->caption()));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 419e2b00..1a0aabf8 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -49,7 +49,7 @@ namespace KexiMacro {
 					return;
 
 				TQStringList namelist;
-				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(info) {
 					KexiPart::ItemDict* items = actionimpl->mainWin()->project()->items(info);
 					if(items)
@@ -65,7 +65,7 @@ namespace KexiMacro {
 
 				this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );
 
-				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl;
+				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" children="<<namelist<<endl;
 			}
 
 			virtual ~ObjectNameVariable() {}
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index 83a7a471..c27f024b 100644
--- a/kexi/plugins/macros/kexiactions/objectvariable.h
+++ b/kexi/plugins/macros/kexiactions/objectvariable.h
@@ -72,8 +72,8 @@ namespace KexiMacro {
 
 				if(! objectname.isNull())
 					this->setVariant( objectname );
-				else if(this->tqchildren().count() > 0)
-					this->setVariant( this->tqchildren()[0]->variant() );
+				else if(this->children().count() > 0)
+					this->setVariant( this->children()[0]->variant() );
 				else
 					this->setVariant( TQString() );
 
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index 9cd2e664..d7c4e7aa 100644
--- a/kexi/plugins/macros/kexiactions/openaction.cpp
+++ b/kexi/plugins/macros/kexiactions/openaction.cpp
@@ -53,7 +53,7 @@ namespace KexiMacro {
 				: KexiVariable<ACTIONIMPL>(actionimpl, VIEW, i18n("View"))
 			{
 				TQStringList namelist;
-				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(part) {
 					int viewmodes = part->supportedViewModes();
 					if(viewmodes & Kexi::DataViewMode)
@@ -63,7 +63,7 @@ namespace KexiMacro {
 					if(viewmodes & Kexi::TextViewMode)
 						namelist << TEXTVIEW;
 					for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
-						this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
+						this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
 				}
 				const TQString n =
 					namelist.contains(viewname)
@@ -124,9 +124,9 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	const TQString objectname = context->variable(OBJECT)->variant().toString();
 	const TQString name = context->variable(NAME)->variant().toString();
-	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").tqarg(objectname).latin1(), name );
+	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").arg(objectname).latin1(), name );
 	if(! item) {
-		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").arg(objectname).arg(name));
 	}
 
 	// Determinate the viewmode.
@@ -139,14 +139,14 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 	else if(view == TEXTVIEW)
 		viewmode = Kexi::TextViewMode;
 	else {
-		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").tqarg(view).tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").arg(view).arg(objectname).arg(name));
 	}
 
 	// Try to open the object now.
 	bool openingCancelled;
 	if(! mainWin()->openObject(item, viewmode, openingCancelled)) {
 		if(! openingCancelled) {
-			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").tqarg(objectname).tqarg(name));
+			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").arg(objectname).arg(name));
 		}
 	}
 }
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index b7e89e9a..2f6ee825 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -461,10 +461,10 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
 
 		kdDebug() << "KexiMacroDesignView::propertyChanged() set existing property=" << *it << endl;
 		KoProperty::Property& p = set.property((*it).latin1());
-		KoMacro::Variable::List tqchildren = variable->tqchildren();
-		if(tqchildren.count() > 0) {
+		KoMacro::Variable::List children = variable->children();
+		if(children.count() > 0) {
 			TQStringList keys, names;
-			KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end());
+			KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
 			for(; childit != childend; ++childit) {
 				const TQString s = (*childit)->variant().toString();
 				keys << s;
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h
index 3529ea0c..520d1799 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.h
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h
@@ -91,7 +91,7 @@ class KexiMacroDesignView : public KexiMacroView
 		/**
 		* Called if a row got inserted.
 		*/
-		void rowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void rowInserted(KexiTableItem* item, uint row, bool repaint);
 
 		/**
 		* Called if a property in the \a KoProperty got changed.
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index f6422be9..25ec569f 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -53,14 +53,14 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont
 	KoMacro::Exception* exception = context->exception();
 
 	iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32));
-	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").tqarg( context->macro()->name() ).tqarg( exception->errorMessage() ));
+	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() ));
 
 	int i = 1;
 	KoMacro::MacroItem::List items = context->macro()->items();
 	for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++)
 	{
 		KListViewItem* listviewitem = new KListViewItem(errorlist);
-		listviewitem->setText(0,TQString("%1").tqarg(i++));
+		listviewitem->setText(0,TQString("%1").arg(i++));
 		listviewitem->setText(1,i18n("Action"));
 		KSharedPtr<KoMacro::MacroItem> macroitem = *mit;
 
@@ -107,7 +107,7 @@ void KexiMacroError::designbtnClicked()
 	const TQString name = macro->name();
 	KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name);
 	if(! item) {
-		kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").tqarg(name) << endl;
+		kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").arg(name) << endl;
 		return;
 	}
 
@@ -115,7 +115,7 @@ void KexiMacroError::designbtnClicked()
 	bool openingCancelled;
 	if(! d->mainwin->openObject(item, Kexi::DesignViewMode, openingCancelled)) {
 		if(! openingCancelled) {
-			kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").tqarg(name) << endl;
+			kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").arg(name) << endl;
 			return;
 		}
 	}
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 72c45001..26bd964d 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -65,7 +65,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -87,7 +87,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignVCenter</set>
                             </property>
                         </widget>
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index d5e576f9..e3599b22 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -86,7 +86,7 @@ void KexiMacroProperty::init()
 	}
 
 	//TESTCASE!!!!!!!!!!!!!!!!!!!!!!
-	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() );
+	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() );
 
 	Q_ASSERT(! d->name.isNull());
 	m_property->setName( d->name.latin1() );
@@ -389,45 +389,45 @@ class ListBox : public TQListBox
 			Q_ASSERT( m_edititem->widget() != 0 );
 
 			const TQString name = m_macroproperty->name();
-			KoMacro::Variable::List tqchildren;
+			KoMacro::Variable::List children;
 			{
-				KoMacro::Variable::List actiontqchildren;
+				KoMacro::Variable::List actionchildren;
 
 				KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
 				//kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl;
 				if(itemvar.data())
-					actiontqchildren = itemvar->tqchildren();
+					actionchildren = itemvar->children();
 
 				KSharedPtr<KoMacro::Action> action = m_edititem->action();
 				KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>();
 				//kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl;
 				if(actionvar.data())
-					actiontqchildren += actionvar->tqchildren();
+					actionchildren += actionvar->children();
 
-				KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd());
+				KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd());
 				for(; it != end; ++it) {
 					if(name == (*it)->name()) {
-						KoMacro::Variable::List list = (*it)->tqchildren();
+						KoMacro::Variable::List list = (*it)->children();
 						KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd());
 						for(; listit != listend; ++listit)
-							tqchildren.append( *listit );
+							children.append( *listit );
 					}
 				}
 
-				if(tqchildren.count() <= 0)
-					tqchildren = actiontqchildren;
+				if(children.count() <= 0)
+					children = actionchildren;
 			}
 
 			/*
-			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl;
-			KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd());
+			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl;
+			KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd());
 			for(; listit != listend; ++listit) {
-				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl;
+				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl;
 			}
 			*/
 
-			if(tqchildren.count() > 0) {
-				KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end());
+			if(children.count() > 0) {
+				KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
 				for(; childit != childend; ++childit) {
 					const TQString n = (*childit)->name();
 					//if(! n.startsWith("@")) continue;
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index e35ee5b2..d7f3801e 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -72,7 +72,7 @@ bool KexiMacroTextView::loadData()
 		return false;
 	}
 
-	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").tqarg(data) << endl;
+	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").arg(data) << endl;
 	//d->editor->blockSignals(true);
 	d->editor->setText(data);
 	//d->editor->blockSignals(false);
@@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData()
 
 tristate KexiMacroTextView::storeData(bool /*dontAsk*/)
 {
-	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()).arg(d->editor->text()) << endl;
 	return storeDataBlock( d->editor->text() );
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index e9f9cd33..19e789f0 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -115,7 +115,7 @@ bool KexiMacroView::loadData()
 		return false;
 	}
 
-	kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").tqarg(domdoc.toString()) << endl;
+	kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").arg(domdoc.toString()) << endl;
 	TQDomElement macroelem = domdoc.namedItem("macro").toElement();
 	if(macroelem.isNull()) {
 		kexipluginsdbg << "KexiMacroView::loadData() Macro domelement is null" << endl;
@@ -154,8 +154,8 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
 	TQDomElement macroelem = d->macro->toXML();
 	domdoc.appendChild(macroelem);
 	const TQString xml = domdoc.toString(2);
-	const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id());
-	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl;
+	const TQString name = TQString("%1 [%2]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id());
+	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl;
 	return storeDataBlock(xml);
 }
 
diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp
index 45c03d12..fc729b57 100644
--- a/kexi/plugins/macros/lib/action.cpp
+++ b/kexi/plugins/macros/lib/action.cpp
@@ -81,7 +81,7 @@ Action::Action(const TQString& name, const TQString& text)
 
 Action::~Action()
 {
-	//kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(name()) << endl;
+	//kdDebug() << TQString("Action::~Action() name=\"%1\"").arg(name()) << endl;
 
 	// destroy the private d-pointer instance.
 	delete d;
@@ -89,7 +89,7 @@ Action::~Action()
 
 const TQString Action::toString() const
 {
-	return TQString("Action:%1").tqarg(name());
+	return TQString("Action:%1").arg(name());
 }
 
 const TQString Action::name() const
diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp
index 7c0b6ee8..c0eea250 100644
--- a/kexi/plugins/macros/lib/context.cpp
+++ b/kexi/plugins/macros/lib/context.cpp
@@ -44,7 +44,7 @@ namespace KoMacro {
 			KSharedPtr<Macro> macro;
 
 			/**
-			* List of @a Action instances that are tqchildren of the
+			* List of @a Action instances that are children of the
 			* macro.
 			*/
 			TQValueList<KSharedPtr<MacroItem > > items;
@@ -70,7 +70,7 @@ namespace KoMacro {
 			/// Constructor.
 			explicit Private(KSharedPtr<Macro> m)
 				: macro(m) // remember the macro
-				, items(m->items()) // set d-pointer tqchildren to macro tqchildren
+				, items(m->items()) // set d-pointer children to macro children
 				, exception(0) // no exception yet.
 			{
 			}
@@ -119,7 +119,7 @@ KSharedPtr<Variable> Context::variable(const TQString& name) const
 		}
 	}
 	//none found throw exception
-	throw Exception(TQString("Variable name='%1' does not exist.").tqarg(name));
+	throw Exception(TQString("Variable name='%1' does not exist.").arg(name));
 }
 
 //return a map of our (d-pointer) variables
@@ -132,7 +132,7 @@ Variable::Map Context::variables() const
 void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable)
 {
 	//debuging infos
-	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(variable->toString()) << endl;
+	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl;
 	//Use TQMap?s replace to set/replace the variable named name
 	d->variables.replace(name, variable);
 }
@@ -198,14 +198,14 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
 			d->exception = new Exception(e);
 			//add new tracemessages
 			//the macro name
-			d->exception->addTraceMessage( TQString("macro=%1").tqarg(d->macro->name()) );
+			d->exception->addTraceMessage( TQString("macro=%1").arg(d->macro->name()) );
 			//the action name
-			d->exception->addTraceMessage( TQString("action=%1").tqarg(action->name()) );
+			d->exception->addTraceMessage( TQString("action=%1").arg(action->name()) );
 			//and all variables wich belong to the action/macro
 			TQStringList variables = action->variableNames();
 			for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) {
 				KSharedPtr<Variable> v = d->macroitem->variable(*vit, true);
-				d->exception->addTraceMessage( TQString("%1=%2").tqarg(*vit).tqarg(v->toString()) );
+				d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) );
 			}
 			return; // abort execution
 		}
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index 2bb1bef3..a7986167 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -35,7 +35,7 @@ namespace KoMacro {
 
 	/**
 	* The context of an execution. If a @a Macro got executed it creates
-	* an instance of this class and passes it around all it's tqchildren
+	* an instance of this class and passes it around all it's children
 	* as local execution context.
 	*/
 	class KOMACRO_EXPORT Context
diff --git a/kexi/plugins/macros/lib/exception.cpp b/kexi/plugins/macros/lib/exception.cpp
index 91cfa03c..b435f2f2 100644
--- a/kexi/plugins/macros/lib/exception.cpp
+++ b/kexi/plugins/macros/lib/exception.cpp
@@ -56,7 +56,7 @@ Exception::Exception(const TQString& errormessage)
 	: d( new Private(errormessage) ) // create the private d-pointer instance.
 {
 	//debuging infos
-	kdDebug() << TQString("Exception errormessage=\"%1\"").tqarg(errormessage) << endl;
+	kdDebug() << TQString("Exception errormessage=\"%1\"").arg(errormessage) << endl;
 }
 
 //copy constructor
diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp
index 6bcdc21d..808c4043 100644
--- a/kexi/plugins/macros/lib/macro.cpp
+++ b/kexi/plugins/macros/lib/macro.cpp
@@ -84,7 +84,7 @@ void Macro::setName(const TQString& name)
 //get an "extended" name
 const TQString Macro::toString() const
 {
-	return TQString("Macro:%1").tqarg(name());
+	return TQString("Macro:%1").arg(name());
 }
 
 //get (d-pointer) itemlist
diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h
index 86e0122a..5e5decf8 100644
--- a/kexi/plugins/macros/lib/macro.h
+++ b/kexi/plugins/macros/lib/macro.h
@@ -85,7 +85,7 @@ namespace KoMacro {
 
 			/**
 			* @return a list of @a MacroItem instances which
-			* are tqchildren of this @a Macro .
+			* are children of this @a Macro .
 			*/
 			TQValueList< KSharedPtr<MacroItem> >& items() const;
 
diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp
index 16b93803..05bd22c3 100644
--- a/kexi/plugins/macros/lib/metamethod.cpp
+++ b/kexi/plugins/macros/lib/metamethod.cpp
@@ -92,12 +92,12 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 	int startpos = d->signature.find("(");
 	int endpos = d->signature.findRev(")");
 	if(startpos < 0 || startpos > endpos) {
-		throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturetag = d->signature.left(startpos).stripWhiteSpace();
 	if(d->signaturetag.isEmpty()) {
-		throw Exception(TQString("Invalid tagname in signature \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("Invalid tagname in signature \"%1\"").arg(d->signature));
 	}
 
 	d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace();
@@ -108,7 +108,7 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje
 		if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) {
 			int endtemplatepos = d->signaturearguments.find(">", starttemplatepos);
 			if(endtemplatepos <= 0) {
-				throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature));
+				throw Exception(TQString("No closing template-definiton in signature \"%1\"").arg(d->signature));
 			}
 			commapos = d->signaturearguments.find(",", endtemplatepos);
 		}
@@ -170,7 +170,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 	uint argsize = d->arguments.size();
 
 	if(arguments.size() <= argsize) {
-		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").tqarg(d->signature));
+		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").arg(d->signature));
 	}
 
 	// The first item in the TQUObject-array is for the returnvalue
@@ -188,7 +188,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
 		}
 	
 		if(metaargument->type() != variable->type()) {
-			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").tqarg(d->signature).tqarg(metaargument->type()).tqarg(variable->type()));
+			throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").arg(d->signature).arg(metaargument->type()).arg(variable->type()));
 		}
 
 		switch(metaargument->type()) {
@@ -287,7 +287,7 @@ KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
 		return new Variable(v);
 	}
 
-	throw Exception(TQString("Invalid parameter '%1'").tqarg(desc));
+	throw Exception(TQString("Invalid parameter '%1'").arg(desc));
 }
 
 Variable::List MetaMethod::toVariableList(TQUObject* uo)
diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp
index 0916fe37..ee865c82 100644
--- a/kexi/plugins/macros/lib/metaobject.cpp
+++ b/kexi/plugins/macros/lib/metaobject.cpp
@@ -91,7 +91,7 @@ int MetaObject::indexOfSignal(const char* signal) const
 	TQMetaObject* metaobject = object()->metaObject();
 	int signalid = metaobject->findSignal(signal, false);
 	if(signalid < 0) {
-		throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal));
+		throw Exception(TQString("Invalid signal \"%1\"").arg(signal));
 	}
 	return signalid;
 }
@@ -101,7 +101,7 @@ int MetaObject::indexOfSlot(const char* slot) const
 	TQMetaObject* metaobject = object()->metaObject();
 	int slotid = metaobject->findSlot(slot, false);
 	if(slotid < 0) {
-		throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot));
+		throw Exception(TQString("Invalid slot \"%1\"").arg(slot));
 	}
 	return slotid;
 }
@@ -119,13 +119,13 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 
 		metadata = metaobject->signal(index, true);
 		if(! metadata) {
-			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name()));
+			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").arg(index).arg(obj->name()));
 		}
 		type = MetaMethod::Signal;
 	}
 
 	if(metadata->access != TQMetaData::Public) {
-		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(obj->name()));
+		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name()));
 	}
 
 	return new MetaMethod(metadata->name, type, this);
diff --git a/kexi/plugins/macros/lib/variable.cpp b/kexi/plugins/macros/lib/variable.cpp
index f64613b0..3661ef9a 100644
--- a/kexi/plugins/macros/lib/variable.cpp
+++ b/kexi/plugins/macros/lib/variable.cpp
@@ -58,10 +58,10 @@ namespace KoMacro {
 			const TQObject* object;
 
 			/**
-			* Optional list of tqchildren this @a Variable has.
+			* Optional list of children this @a Variable has.
 			*/
 			// TODO Dow we use this or is it for the future??
-			Variable::List tqchildren;
+			Variable::List children;
 
 			/**
 			* Defines if the variable is enabled or disabled.
@@ -199,7 +199,7 @@ const TQString Variable::toString() const
 			return variant().toString();
 		} break;
 		case KoMacro::MetaParameter::TypeObject: {
-			return TQString("[%1]").tqarg( object()->name() );
+			return TQString("[%1]").arg( object()->name() );
 		} break;
 		default: {
 			throw Exception("Type is undefined.");
@@ -213,24 +213,24 @@ int Variable::toInt() const
 	return variant().toInt();
 }
 
-Variable::List Variable::tqchildren() const
+Variable::List Variable::children() const
 {
-	return d->tqchildren;
+	return d->children;
 }
 
 void Variable::appendChild(KSharedPtr<Variable> variable)
 {
-	d->tqchildren.append(variable);
+	d->children.append(variable);
 }
 
 void Variable::clearChildren()
 {
-	d->tqchildren.clear();
+	d->children.clear();
 }
 
-void Variable::setChildren(const Variable::List& tqchildren)
+void Variable::setChildren(const Variable::List& children)
 {
-	d->tqchildren = tqchildren;
+	d->children = children;
 }
 
 /*
diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h
index 108a6005..14adf09c 100644
--- a/kexi/plugins/macros/lib/variable.h
+++ b/kexi/plugins/macros/lib/variable.h
@@ -173,29 +173,29 @@ namespace KoMacro {
 
 			/**
 			* @return the optional list of @a Variable instances
-			* that are tqchildren of this @a Variable .
+			* that are children of this @a Variable .
 			*
 			* @note that the list is returned call-by-reference. The
 			* list is accessed as getter/setter (read/write). So,
 			* don't set this method to const!
 			*/
-			List tqchildren() const;
+			List children() const;
 
 			/**
-			* Append a @a Variable to the list of tqchildren this
+			* Append a @a Variable to the list of children this
 			* @a Variable has.
 			*/
 			void appendChild(KSharedPtr<Variable> variable);
 
 			/**
-			* Clear the list of tqchildren this @a Variable has.
+			* Clear the list of children this @a Variable has.
 			*/
 			void clearChildren();
 
 			/**
-			* Set the tqchildren this @a Variable has.
+			* Set the children this @a Variable has.
 			*/
-			void setChildren(const List& tqchildren);
+			void setChildren(const List& children);
 
 #if 0
 			/**
diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp
index 4894c619..5b53d51b 100644
--- a/kexi/plugins/macros/lib/xmlhandler.cpp
+++ b/kexi/plugins/macros/lib/xmlhandler.cpp
@@ -75,7 +75,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// We expect a <macro> element. Do we really need to be such strict or
 	// would it be more wise to trust the application in that case?
 	if(element.tagName() != "macro") {
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").tqarg(element.tagName()) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").arg(element.tagName()) << endl;
 		return false;
 	}
 	
@@ -83,7 +83,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 	// If there is more than one version, parsing should update old macro-data, so that it
 	// could write out in the newer version in toXML().
 	if( element.attribute("xmlversion") != "1"){
-		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").tqarg(element.attribute("xmlversion")) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").arg(element.attribute("xmlversion")) << endl;
 		return false;
 	}
 
@@ -115,7 +115,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
 			// Set the comment
 			item->setComment( itemelem.attribute("comment") );
 
-			// Iterate through the tqchildren this item has and try
+			// Iterate through the children this item has and try
 			// to fill the list of variables our new MacroItem has.
 			for(TQDomNode childnode = itemnode.firstChild(); ! childnode.isNull(); childnode = childnode.nextSibling()) {
 				// The tagname should be "variable"
@@ -156,12 +156,12 @@ TQDomElement XMLHandler::toXML()
 	// redundancy at this point.
 	//macroelem.setAttribute("name",d->macro->name());
 
-	// The list of MacroItem-tqchildren a Macro provides.
+	// The list of MacroItem-children a Macro provides.
 	TQValueList<KSharedPtr<MacroItem > > items = d->macro->items();
 
 	// Create an iterator...
 	TQValueList<KSharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd());
-	// ...and iterate over the list of tqchildren the Macro provides.
+	// ...and iterate over the list of children the Macro provides.
 	for(;it != end; ++it) {
 		// We are iterating over MacroItem instances.
 		KSharedPtr<MacroItem> item = *it;
diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index 1086a340..bdc2e6ad 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -424,7 +424,7 @@ void CommonTests::testFunction()
 	domdocument.setContent(TQString(
 		"<function name=\"" + name + "\" text=\"" + text + "\" comment=\"" + comment + "\" receiver=\"" + receiver + "\" slot=\"myslot(const TQString &amp; , int)\">"
 			"<argument>" + argument1 + "</argument>"
-			"<argument>" + TQString("%1").tqarg(argument2) + "</argument>"
+			"<argument>" + TQString("%1").arg(argument2) + "</argument>"
 		"</function>"
 	));
 
@@ -677,7 +677,7 @@ void CommonTests::testMacro()
 //	KOMACROTEST_ASSERT( actionptr->comment(), TQString("") );
 /*
 	//fetch the second one
-	KSharedPtr<KoMacro::Action> myfuncptr = tqchildren[1];
+	KSharedPtr<KoMacro::Action> myfuncptr = children[1];
 	//cast it to function
 	
                                                                                     KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() );
@@ -712,8 +712,8 @@ void CommonTests::testMacro()
 	//KOMACROTEST_XASSERT((int) yanActionptr2.data(), 0);
 	//KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0);
 	
-	//create a list of the tqchildren from yanMacro
-	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->tqchildren();
+	//create a list of the children from yanMacro
+	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children();
 	//check that there are two
 	//KOMACROTEST_ASSERT(yanChildren.count(), uint(2));
 /*
@@ -722,9 +722,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro
 		yanMacro->addChild(yanActionptr2);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -735,9 +735,9 @@ void CommonTests::testMacro()
 		const int oldsize = yanChildren.count();
 		//add a new child to the macro		
 		yanMacro->addChild(yanActionptr3);
-		//get the tqchildren
-		yanChildren = yanMacro->tqchildren();
-		//get count of tqchildren
+		//get the children
+		yanChildren = yanMacro->children();
+		//get count of children
 		const int size = yanChildren.count();
 		//check count has changed
 		KOMACROTEST_XASSERT(size, oldsize);
@@ -859,12 +859,12 @@ void CommonTests::testVariables()
 		//check that it is not null
 	KOMACROTEST_XASSERT((int) macro, 0);
 		
-	//create a list of its tqchildren
-	TQValueList< KSharedPtr<KoMacro::Action> > tqchildren = macro->tqchildren();
-	//Check that there are two tqchildren. The first child is always the returnvalue.
-	KOMACROTEST_ASSERT( tqchildren.count(), uint(2) );
-	//fetch the tqchildren
-	KSharedPtr<KoMacro::Action> func1ptr = tqchildren[1];
+	//create a list of its children
+	TQValueList< KSharedPtr<KoMacro::Action> > children = macro->children();
+	//Check that there are two children. The first child is always the returnvalue.
+	KOMACROTEST_ASSERT( children.count(), uint(2) );
+	//fetch the children
+	KSharedPtr<KoMacro::Action> func1ptr = children[1];
 
 	//create new context
 	KSharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr);
diff --git a/kexi/plugins/macros/tests/komacrotestbase.h b/kexi/plugins/macros/tests/komacrotestbase.h
index e301730d..ee746991 100644
--- a/kexi/plugins/macros/tests/komacrotestbase.h
+++ b/kexi/plugins/macros/tests/komacrotestbase.h
@@ -27,7 +27,7 @@
 */
 #define KOMACROTEST_ASSERT(actual, expected) \
 	{ \
-		std::cout << TQString("Testing: %1 == %2").tqarg(#actual).tqarg(#expected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 == %2").arg(#actual).arg(#expected).latin1() << std::endl; \
 		check( __FILE__, __LINE__, #actual, actual, expected, false ); \
 		if(actual != expected) \
 		{ \
@@ -44,7 +44,7 @@
 */
 #define KOMACROTEST_XASSERT(actual, notexpected) \
 	{ \
-		std::cout << TQString("Testing: %1 != %2").tqarg(#actual).tqarg(#notexpected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 != %2").arg(#actual).arg(#notexpected).latin1() << std::endl; \
 		check( __FILE__, __LINE__, #actual, actual, notexpected, true ); \
 		if(actual == notexpected) \
 		{ \
diff --git a/kexi/plugins/macros/tests/testobject.cpp b/kexi/plugins/macros/tests/testobject.cpp
index e0db481e..2634d71a 100644
--- a/kexi/plugins/macros/tests/testobject.cpp
+++ b/kexi/plugins/macros/tests/testobject.cpp
@@ -94,7 +94,7 @@ int TestObject::myslot(const TQString&, int i)
 //TQString is returnvalue
 TQString TestObject::myslot(const TQString& s)
 {
-	TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").tqarg(s);
+	TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").arg(s);
 	//be loud
 	kdDebug() << t << endl;
 	//add some extra Debuginfos to TestResults
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp
index 29c53831..90454d35 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp
@@ -332,7 +332,7 @@ void XMLHandlerTests::testMaxNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX);
+				    "</macro>").arg(INT_MAX).arg(DBL_MAX);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -362,7 +362,7 @@ void XMLHandlerTests::testMaxNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1);
+				    "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -392,7 +392,7 @@ void XMLHandlerTests::testMinNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN);
+				    "</macro>").arg(INT_MIN).arg(DBL_MIN);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -422,7 +422,7 @@ void XMLHandlerTests::testMinNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1);
+				    "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
@@ -452,7 +452,7 @@ void XMLHandlerTests::testBigNumber()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %1 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(DBL_MAX+1);
+				    "</macro>").arg(DBL_MAX+1);
 	doomdocument.setContent(xml);
 	const TQDomElement elem = doomdocument.documentElement();
 	KOMACROTEST_ASSERT(macro->parseXML(elem),true);
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
index ac176f89..f32416c0 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
@@ -586,7 +586,7 @@ void XMLHandlerTests2::testMaxNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX);
+				    "</macro>").arg(INT_MAX).arg(DBL_MAX);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -674,7 +674,7 @@ void XMLHandlerTests2::testMaxNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1);
+				    "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -762,7 +762,7 @@ void XMLHandlerTests2::testMinNum()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN);
+				    "</macro>").arg(INT_MIN).arg(DBL_MIN);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
@@ -850,7 +850,7 @@ void XMLHandlerTests2::testMinNum2()
 						"<variable name=\"testbool\" >true</variable>"
 						"<variable name=\"testdouble\" > %2 </variable>"
 				      "</item>"
-				    "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1);
+				    "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1);
 	// Set the XML-document with the above string.
 	TQDomDocument doomdocument;
 	doomdocument.setContent(xml);
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index ed1864f6..080f8d08 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -50,7 +50,7 @@
                             <property name="text">
                                 <string>kexi_</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index c6708e7f..cfd38e3a 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 			d->dataTable->dataAwareObject()->setCursorPosition(i,0);
 			if (errMsg)
 				*errMsg = i18n("Select column for table \"%1\"")
-					.tqarg(it.current()->at(COLUMN_ID_TABLE).toString());
+					.arg(it.current()->at(COLUMN_ID_TABLE).toString());
 			return false;
 		}
 
@@ -410,7 +410,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 					true/*allowRelationalOperator*/);
 				if (!criteriaExpr) {//for sanity
 					if (errMsg)
-						*errMsg = i18n("Invalid criteria \"%1\"").tqarg(criteriaStr);
+						*errMsg = i18n("Invalid criteria \"%1\"").arg(criteriaStr);
 					delete whereExpr;
 					return false;
 				}
@@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 						false/*!allowRelationalOperator*/);
 					if (!columnExpr) {
 						if (errMsg)
-							*errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
+							*errMsg = i18n("Invalid expression \"%1\"").arg(fieldName);
 						return false;
 					}
 					temp->query()->addExpression(columnExpr, fieldVisible);
@@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			columnAlias = query->columnAlias(row_num);
 			if (field->isExpression()) {
 //				if (columnAlias.isEmpty()) {
-//					columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO
+//					columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO
 //				}
 //				if (columnAlias.isEmpty())
 //TODO: ok? perhaps do not allow to omit aliases?
@@ -1239,7 +1239,7 @@ void KexiQueryDesignerGuiEditor::slotNewItemAppendedForAfterDeletingInSpreadShee
 		item->at(COLUMN_ID_VISIBLE) = TQVariant(false, 0); //the same init as in initTableRows()
 }
 
-void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*tqrepaint*/)
+void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*repaint*/)
 {
 	if (d->droppedNewItem && d->droppedNewItem==item) {
 		createPropertySet( row, d->droppedNewTable, d->droppedNewField, true );
@@ -1449,7 +1449,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 						result->allowToDiscardChanges = true;
 						result->column = colnum;
 						result->msg = i18n("Entered column alias \"%1\" is not a valid identifier.")
-							.tqarg(alias.data());
+							.arg(alias.data());
 						result->desc = i18n("Identifiers should start with a letter or '_' character");
 						return;
 					}
@@ -1468,7 +1468,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 					result->success = false;
 					result->allowToDiscardChanges = true;
 					result->column = colnum;
-					result->msg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
+					result->msg = i18n("Invalid expression \"%1\"").arg(fieldName);
 					return;
 				}
 			}
@@ -1590,7 +1590,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->allowToDiscardChanges = true;
 			result->column = colnum;
 			result->msg = i18n("Could not set sorting for multiple columns (%1)")
-				.tqarg(table=="*" ? table : (table+".*"));
+				.arg(table=="*" ? table : (table+".*"));
 		}
 	}
 	else if (colnum==COLUMN_ID_CRITERIA) {
@@ -1612,7 +1612,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->column = colnum;
 			if (propertySet())
 				result->msg = i18n("Could not set criteria for \"%1\"")
-					.tqarg(table=="*" ? table : field);
+					.arg(table=="*" ? table : field);
 			else
 				result->msg = i18n("Could not set criteria for empty row");
 			//moved to result->allowToDiscardChanges handler //d->dataTable->dataAwareObject()->cancelEditor(); //prevents further editing of this cell
@@ -1638,7 +1638,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int
 			result->success = false;
 			result->allowToDiscardChanges = true;
 			result->column = colnum;
-			result->msg = i18n("Invalid criteria \"%1\"").tqarg(newValue.toString());
+			result->msg = i18n("Invalid criteria \"%1\"").arg(newValue.toString());
 		}
 	}
 }
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index d96fd987..1102b1d9 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -129,7 +129,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 		void slotBeforeCellChanged(KexiTableItem *item, int colnum,
 			TQVariant& newValue, KexiDB::ResultInfo* result);
 
-		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
 		void slotTablePositionChanged(KexiRelationViewTableContainer*);
 		void slotAboutConnectionRemove(KexiRelationViewConnection*);
 		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 503b432a..e53e876c 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -57,14 +57,14 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw,
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
 //		it->drawItem(p, visibleWidth());
-		if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics())))
+		if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics())))
 		{
 			p->saveWorldMatrix();
 			p->translate(0, y);
 			it->drawItem(p, visibleWidth(), colorGroup());
 			p->restoreWorldMatrix();
 		}
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 }
 
@@ -80,26 +80,26 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
 		{
 			//clear
 			it.current()->setSelected(false, colorGroup());
-			updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
+			updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
 		}
 
-		if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+		if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
 		{
 			popupHistory = it.current();
 			pos = y;
 		}
-		y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	//now do update
 	if (popupHistory) {
 			if (m_selected && m_selected != popupHistory) {
 				m_selected->setSelected(false, colorGroup());
-				updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+				updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			}
 			m_selected = popupHistory;
 			m_selected->setSelected(true, colorGroup());
-			updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
+			updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
 			if(e->button() == Qt::RightButton) {
 				m_popup->exec(e->globalPos());
 			}
@@ -121,7 +121,7 @@ KexiQueryDesignerSQLHistory::addEvent(const TQString& q, bool s, const TQString
 	if (he) {
 		if (he->statement()==q) {
 			he->updateTime(TQTime::currentTime());
-			tqrepaint();
+			repaint();
 			return;
 		}
 	}
@@ -137,7 +137,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 	int y = 0;
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
-		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	resizeContents(visibleWidth() - 1, y);
@@ -155,7 +155,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 	m_selected = e;
 	m_selected->setSelected(true, colorGroup());
 //	updateContents();
-	updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
+	updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
 }
 
 /*void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	}
 	else
 	{
-		text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement);
+		text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement);
 	}
 
 	TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b");
@@ -334,9 +334,9 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	text = text.replace(keywords, "<b>\\1</b>");
 
 	if(!m_error.isEmpty())
-//		text += ("<br>"+i18n("Error: %1").tqarg(m_error));
-//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
-		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").tqarg(m_error) + "</font>";
+//		text += ("<br>"+i18n("Error: %1").arg(m_error));
+//		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>";
+		text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>";
 
 	kdDebug() << "HistoryEntry::highlight() text:" << text << endl;
 //	m_formated = new TQSimpleRichText(text, TQFont("courier", 8));
@@ -352,7 +352,7 @@ HistoryEntry::setSelected(bool selected, const TQColorGroup &cg)
 }
 
 TQRect
-HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f)
+HistoryEntry::geometry(int y, int width, TQFontMetrics f)
 {
 	Q_UNUSED( f );
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index a6d55285..6c828c39 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -36,7 +36,7 @@ class HistoryEntry
 		HistoryEntry(bool success, const TQTime &time, const TQString &statement, /*int y,*/ const TQString &error = TQString());
 		~HistoryEntry();
 
-		TQRect	tqgeometry(int y, int width, TQFontMetrics f);
+		TQRect	geometry(int y, int width, TQFontMetrics f);
 		void	drawItem(TQPainter *p, int width, const TQColorGroup &cg);
 
 		void	setSelected(bool selected, const TQColorGroup &cg);
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index dfa8d0d0..7cf7dae9 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -139,7 +139,7 @@ KexiReportFactory::startEditing(const TQCString &c, TQWidget *w, KFormDesigner::
 			editText();
 		}
 		else
-			createEditor(c, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(c, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	return false;
@@ -153,7 +153,7 @@ KexiReportFactory::isPropertyVisibleInternal(const TQCString &classname, TQWidge
 			return false;
 	}
 	else if(classname == "PicLabel") {
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index b0731167..cacf40b7 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -40,13 +40,13 @@ KexiReportForm::~KexiReportForm()
 	kexipluginsdbg << "KexiReportForm::~KexiReportForm(): close" << endl;
 }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
index f64a089f..9d577ec1 100644
--- a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
@@ -102,7 +102,7 @@ const TQString KexiDBConnection::getClassName() const {
     if(! m_connection)
         throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection is NULL.")) );
     //if(m_connection->error())
-    //    throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").tqarg(m_connection->errorMsg())) );
+    //    throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").arg(m_connection->errorMsg())) );
     return m_connection;
 }
 
@@ -140,9 +140,9 @@ KexiDBCursor* KexiDBConnection::executeQueryString(const TQString& sqlquery) {
     // or e.g. a DROP TABLE operation. So, let's check for such dangerous operations right now.
     ::KexiDB::Parser parser( connection() );
     if(! parser.parse(sqlquery))
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").tqarg(parser.error().type()).tqarg(parser.error().error())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").arg(parser.error().type()).arg(parser.error().error())) );
     if( parser.query() == 0 || parser.operation() != ::KexiDB::Parser::OP_Select )
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").tqarg(parser.operationString()) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").arg(parser.operationString()) ) );
     ::KexiDB::Cursor* cursor = connection()->executeQuery(sqlquery);
     return cursor ? new KexiDBCursor(cursor) : 0;
 }
diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
index c2475276..74723bc3 100644
--- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
@@ -66,7 +66,7 @@ const TQString KexiDBDriverManager::getClassName() const {
 KexiDB::DriverManager& KexiDBDriverManager::driverManager()
 {
     if(m_drivermanager.error())
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").tqarg(m_drivermanager.errorMsg())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").arg(m_drivermanager.errorMsg())) );
     return m_drivermanager;
 }
 
@@ -77,7 +77,7 @@ const TQStringList KexiDBDriverManager::driverNames() {
 KexiDBDriver* KexiDBDriverManager::driver(const TQString& drivername) {
     TQGuardedPtr< ::KexiDB::Driver > driver = driverManager().driver(drivername); // caching is done by the DriverManager
     if(! driver) return 0;
-    if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").tqarg(drivername).tqarg(driver->errorMsg())) );
+    if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").arg(drivername).arg(driver->errorMsg())) );
     return new KexiDBDriver(driver);
 }
 
diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp
index 2ac40342..c45eedfc 100644
--- a/kexi/plugins/scripting/kexidb/kexidbschema.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbschema.cpp
@@ -179,11 +179,11 @@ bool KexiDBQuerySchema::setWhereExpression(const TQString& whereexpression) {
 
             ::KexiDB::Field* field = static_cast< ::KexiDB::QuerySchema* >(m_schema)->field(key);
             if(! field)
-                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").tqarg(key).tqarg(m_schema->name())) );
+                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").arg(key).arg(m_schema->name())) );
 
             TQVariant v(value);
             if(! v.cast(field->variantType()))
-                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").tqarg(key).tqarg(v.typeName()).tqarg(field->variantType())) );
+                throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").arg(key).arg(v.typeName()).arg(field->variantType())) );
 
             static_cast< ::KexiDB::QuerySchema* >(m_schema)->addToWhereExpression(field,v);
         }
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 421bc31f..ed3b99e2 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -191,7 +191,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope
 
     if(property.name() == "language") {
         TQString language = property.value().toString();
-        kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").tqarg(language) << endl;
+        kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").arg(language) << endl;
         d->scriptaction->setInterpreterName( language );
         // We assume Kross and the HighlightingInterface are using same
         // names for the support languages...
@@ -201,7 +201,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope
     else {
         bool ok = d->scriptaction->setOption( property.name(), property.value() );
         if(! ok) {
-            kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").tqarg(TQString(property.name())) << endl;
+            kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").arg(TQString(property.name())) << endl;
             return;
         }
     }
@@ -214,12 +214,12 @@ void KexiScriptDesignView::execute()
     d->statusbrowser->clear();
     TQTime time;
     time.start();
-    d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").tqarg(d->scriptaction->name()) );
+    d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").arg(d->scriptaction->name()) );
 
     d->scriptaction->activate();
     if( d->scriptaction->hadException() ) {
         TQString errormessage = d->scriptaction->getException()->getError();
-        d->statusbrowser->append(TQString("<b>%2</b><br>").tqarg(TQStyleSheet::escape(errormessage)) );
+        d->statusbrowser->append(TQString("<b>%2</b><br>").arg(TQStyleSheet::escape(errormessage)) );
 
         TQString tracedetails = d->scriptaction->getException()->getTrace();
         d->statusbrowser->append( TQStyleSheet::escape(tracedetails) );
@@ -229,7 +229,7 @@ void KexiScriptDesignView::execute()
             d->editor->setLineNo(lineno);
     }
     else {
-        d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").tqarg(time.elapsed()) );
+        d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").arg(time.elapsed()) );
     }
 }
 
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 8aec288b..08820522 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -76,7 +76,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction)
             "support in Kexi. The scripting API may change in details\n"
             "in the next Kexi version.\n"
             "For more information and documentation see\n%1"
-        ).tqarg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n";
+        ).arg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n";
     }
     KexiEditor::setText(code);
     // We assume Kross and the HighlightingInterface are using same
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index cb66734d..84fbe4ec 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -95,7 +95,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender)
 		bool exec = (dontask == "yes");
 		if( !exec && dontask != "no" ) {
 			exec = KMessageBox::warningContinueCancel(0,
-				i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").tqarg(scriptaction->text()),
+				i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").arg(scriptaction->text()),
 				i18n("Execute Script?"), KGuiItem(i18n("Execute"), "exec"),
 				dontAskAgainName, KMessageBox::Notify | KMessageBox::Dangerous
 			) == KMessageBox::Continue;
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index 298363c4..c5368b26 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -72,8 +72,8 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand()
 TQString ChangeFieldPropertyCommand::name() const
 {
 	return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString())
-		.tqarg(m_alterTableAction.newValue().toString());
+		.arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString())
+		.arg(m_alterTableAction.newValue().toString());
 }
 
 TQString ChangeFieldPropertyCommand::debugString()
@@ -81,15 +81,15 @@ TQString ChangeFieldPropertyCommand::debugString()
 	TQString s( name() );
 	if (m_oldListData || m_listData)
 		s += TQString("\nAnd list data from [%1]\n  to [%2]")
-			.tqarg( m_oldListData ? 
+			.arg( m_oldListData ? 
 				TQString("%1 -> %2")
-				.tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(","))
+				.arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(","))
 				: TQString("<NONE>"))
-			.tqarg( m_listData ?
+			.arg( m_listData ?
 				TQString("%1 -> %2")
-				.tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(","))
+				.arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(","))
 				: TQString("<NONE>"));
-	return s + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+	return s + TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 void ChangeFieldPropertyCommand::execute()
@@ -136,9 +136,9 @@ RemoveFieldCommand::~RemoveFieldCommand()
 TQString RemoveFieldCommand::name() const
 {
 	if (m_set)
-		return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName());
+		return i18n("Remove table field \"%1\"").arg(m_alterTableAction.fieldName());
 
-	return TQString("Remove empty row at position %1").tqarg(m_fieldIndex);
+	return TQString("Remove empty row at position %1").arg(m_fieldIndex);
 }
 
 void RemoveFieldCommand::execute()
@@ -161,7 +161,7 @@ TQString RemoveFieldCommand::debugString()
 
 	return name() + "\nAT ROW " + TQString::number(m_fieldIndex)
 		+ ", FIELD: " + (*m_set)["caption"].value().toString()
-		+ TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+		+ TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction()
@@ -192,7 +192,7 @@ InsertFieldCommand::~InsertFieldCommand()
 
 TQString InsertFieldCommand::name() const
 {
-	return i18n("Insert table field \"%1\"").tqarg(m_set["caption"].value().toString());
+	return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString());
 }
 
 void InsertFieldCommand::execute()
@@ -229,9 +229,9 @@ ChangePropertyVisibilityCommand::~ChangePropertyVisibilityCommand()
 TQString ChangePropertyVisibilityCommand::name() const
 {
 	return TQString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName())
-		.tqarg(m_oldVisibility ? "true" : "false")
-		.tqarg(m_alterTableAction.newValue().toBool() ? "true" : "false");
+		.arg(m_alterTableAction.propertyName())
+		.arg(m_oldVisibility ? "true" : "false")
+		.arg(m_alterTableAction.newValue().toBool() ? "true" : "false");
 }
 
 void ChangePropertyVisibilityCommand::execute()
@@ -265,7 +265,7 @@ InsertEmptyRowCommand::~InsertEmptyRowCommand()
 
 TQString InsertEmptyRowCommand::name() const
 {
-	return TQString("Insert empty row at position %1").tqarg(m_row);
+	return TQString("Insert empty row at position %1").arg(m_row);
 }
 
 void InsertEmptyRowCommand::execute()
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 190e9834..ea337d36 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -495,11 +495,11 @@ void KexiTableDesignerView::slotTogglePrimaryKey()
 /*	CommandGroup *setPrimaryKeyCommand;
 	if (isSet) {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Set primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	else {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Unset primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	switchPrimaryKey(set, isSet, false, setPrimaryKeyCommand);*/
 	//addHistoryCommand( setPrimaryKeyCommand, false /* !execute */ );
@@ -687,8 +687,8 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 				//remember this action containing 2 subactions
 				CommandGroup *changeCaptionAndNameCommand = new CommandGroup(
 					i18n("Change \"%1\" field's name to \"%2\" and caption from \"%3\" to \"%4\"")
-						.tqarg(oldName).tqarg(propertySetForItem->property("name").value().toString())
-						.tqarg(oldCaption).tqarg(newValue.toString() ));
+						.arg(oldName).arg(propertySetForItem->property("name").value().toString())
+						.arg(oldCaption).arg(newValue.toString() ));
 				changeCaptionAndNameCommand->addCommand( changeCaptionCommand );
 //					new ChangeFieldPropertyCommand( this, *propertySetForItem,
 	//						"caption", oldCaption, newValue)
@@ -759,7 +759,7 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 		// *** this action contains subactions ***
 		CommandGroup *changeDataTypeCommand = new CommandGroup(
 			i18n("Change data type for field \"%1\" to \"%2\"")
-				.tqarg(set["name"].value().toString()).tqarg( KexiDB::Field::typeName( fieldType ) ) );
+				.arg(set["name"].value().toString()).arg( KexiDB::Field::typeName( fieldType ) ) );
 
 //kexipluginsdbg << "++++++++++" << slist << nlist << endl;
 
@@ -968,13 +968,13 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 				//switchPrimaryKey(set, true);
 				// this will be toplevel command 
 				setAutonumberCommand = new CommandGroup(
-					i18n("Assign autonumber for field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Assign autonumber for field \"%1\"").arg(set["name"].value().toString()) );
 				toplevelCommand = setAutonumberCommand;
 				d->setPropertyValueIfNeeded( set, "autoIncrement", TQVariant(true,1), setAutonumberCommand );
 			}
 			else {
 				setAutonumberCommand = new CommandGroup(
-					i18n("Remove autonumber from field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Remove autonumber from field \"%1\"").arg(set["name"].value().toString()) );
 				//d->slotPropertyChanged_enabled = false;
 //					set["autoIncrement"].setValue( TQVariant(false,1), false/*don't save old*/);
 //					d->slotPropertyChanged_enabled = true;
@@ -995,7 +995,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 		setPrimaryKey = false;
 		// this will be toplevel command 
 		CommandGroup *unsetIndexedOrUniquOrNotNullCommand = new CommandGroup(
-			i18n("Set \"%1\" property for field \"%2\"").tqarg(property.caption()).tqarg(set["name"].value().toString()) );
+			i18n("Set \"%1\" property for field \"%2\"").arg(property.caption()).arg(set["name"].value().toString()) );
 		toplevelCommand = unsetIndexedOrUniquOrNotNullCommand;
 		d->setPropertyValueIfNeeded( set, pname, TQVariant(false,1), unsetIndexedOrUniquOrNotNullCommand );
 		if (pname=="notNull") {
@@ -1040,8 +1040,8 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 //		kdDebug() << set["type"].value() << endl;
 //		if (KexiDB::Field::typeGroup( set["type"].value().toInt() ) == (int)KexiDB::Field::TextGroup) {
 		CommandGroup* changeFieldTypeCommand = new CommandGroup(
-			i18n("Change type for field \"%1\" to \"%2\"").tqarg(set["name"].value().toString())
-			.tqarg(typeName) );
+			i18n("Change type for field \"%1\" to \"%2\"").arg(set["name"].value().toString())
+			.arg(typeName) );
 		d->setPropertyValueIfNeeded( set, "subType", property.value(), property.oldValue(),
 			changeFieldTypeCommand );
 
@@ -1085,7 +1085,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//this action contains subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Set primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1111,7 +1111,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//remember this action containing 2 subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Unset primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1147,10 +1147,10 @@ void KexiTableDesignerView::slotRowInserted()
 }
 
 void KexiTableDesignerView::slotAboutToDeleteRow(
-	KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
+	KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
 {
 	Q_UNUSED(result)
-	Q_UNUSED(tqrepaint)
+	Q_UNUSED(repaint)
 	if (item[COLUMN_ID_ICON].toString()=="key")
 		d->primaryKeyExists = false;
 
@@ -1213,7 +1213,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				"for creating relations between database tables. "
 				"Do you want to add primary key automatically now?</p>"
 				"<p>If you want to add a primary key by hand, press \"Cancel\" "
-				"to cancel saving table design.</p>").tqarg(schema.name()),
+				"to cancel saving table design.</p>").arg(schema.name()),
 				TQString(), KGuiItem(i18n("&Add Primary Key"), "key"), KStdGuiItem::no(),
 					"autogeneratePrimaryKeysOnTableDesignSaving");
 			if (questionRes==KMessageBox::Cancel) {
@@ -1229,9 +1229,9 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					KoProperty::Set *set = d->sets->at(i);
 					if (set) {
 						if ((*set)["name"].value().toString()
-							== pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex))
+							== pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex))
 						|| (*set)["caption"].value().toString()
-							== pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex)))
+							== pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex)))
 						{
 							//try next id index
 							i = 0;
@@ -1241,8 +1241,8 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					}
 					i++;
 				}
-				pkFieldName = pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
-				pkFieldCaption = pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldName = pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldCaption = pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex));
 				//ok, add PK with such unique name
 				d->view->insertEmptyRow(0);
 				d->view->setCursorPosition(0, COLUMN_ID_CAPTION);
@@ -1273,7 +1273,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				if (beSilent) {
 					kexipluginswarn << 
 						TQString("KexiTableDesignerView::buildSchema(): no field caption entered at row %1...")
-						.tqarg(i+1) << endl;
+						.arg(i+1) << endl;
 				}
 				else {
 					d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1304,7 +1304,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 		if (beSilent) {
 			kexipluginswarn << 
 				TQString("KexiTableDesignerView::buildSchema(): duplicated field name '%1'")
-				.tqarg((*b)["name"].value().toString()) << endl;
+				.arg((*b)["name"].value().toString()) << endl;
 		}
 		else {
 			d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1313,7 +1313,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 			KMessageBox::sorry(this,
 				i18n("You have added \"%1\" field name twice.\nField names cannot be repeated. "
 				"Correct name of the field.")
-				.tqarg((*b)["name"].value().toString()) );
+				.arg((*b)["name"].value().toString()) );
 		}
 		res = cancelled;
 	}
@@ -1457,7 +1457,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 			this, *conn, *tempData()->table,
 			i18n("You are about to change the design of table \"%1\" "
 			"but following objects using this table are opened:")
-			.tqarg(tempData()->table->name()));
+			.arg(tempData()->table->name()));
 	}
 
 	if (res == true) {
@@ -1659,7 +1659,7 @@ void KexiTableDesignerView::slotAboutToShowContextMenu()
 		if (captionOrName.isEmpty())
 			captionOrName = set["name"].value().toString();
 //! @todo show "field" icon
-		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").tqarg(captionOrName) );
+		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").arg(captionOrName) );
 	}
 	else {
 		d->contextMenuTitle->setTitle( i18n("Empty table row", "Empty Row") );
diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h
index 13ce495d..5b9d0215 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -146,10 +146,10 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 
 		//! Called before row inserting in tableview.
 		void slotRowInserted();
-//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool tqrepaint);
+//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool repaint);
 
 		//! Called before row deleting in tableview.
-		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 		/*! Called after any property has been changed in the current property set,
 		 to perform some actions (like updating other dependent properties) */
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 4efd237a..55c8be5d 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -137,7 +137,7 @@ bool KexiTablePart::remove(KexiMainWindow *win, KexiPart::Item &item)
 		tristate res = KexiTablePart::askForClosingObjectsUsingTableSchema(
 			win, *conn, *sch, 
 			i18n("You are about to remove table \"%1\" but following objects using this table are opened:")
-			.tqarg(sch->name()));
+			.arg(sch->name()));
 		return true == conn->dropTable( sch );
 	}
 	//last chance: just remove item
@@ -182,7 +182,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K
 	TQString openedObjectsStr = "<ul>";
 	for (TQPtrListIterator<KexiDB::Connection::TableSchemaChangeListenerInterface> it(*listeners);
 		it.current(); ++it)	{
-			openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString);
+			openedObjectsStr += TQString("<li>%1</li>").arg(it.current()->listenerInfoString);
 	}
 	openedObjectsStr += "</ul>";
 	int r = KMessageBox::questionYesNo(parent, 
diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi
index 8c13ad39..5a1b4ebd 100644
--- a/kexi/tests/altertable/1.kexi
+++ b/kexi/tests/altertable/1.kexi
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 6155eb63..0155ed87 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -56,7 +56,7 @@ KexiProject* prj = 0;
 void showError(const TQString& msg)
 {
 	TQString msg_(msg);
-	msg_.prepend(TQString("Error at line %1: ").tqarg(testLineNumber));
+	msg_.prepend(TQString("Error at line %1: ").arg(testLineNumber));
 	kdDebug() << msg_ << endl;
 }
 
@@ -119,7 +119,7 @@ tristate readLineFromTestFile(const TQString& expectedCommandName = TQString())
 	}
 	if (!expectedCommandName.isEmpty() && testFileLine[0]!=expectedCommandName) {
 		showError( TQString("Invalid command '%1', expected '%2'")
-			.tqarg(testFileLine[0]).tqarg(expectedCommandName));
+			.arg(testFileLine[0]).arg(expectedCommandName));
 		return false;
 	}
 	if (quoted) {
@@ -136,9 +136,9 @@ bool checkItemsNumber(int expectedNumberOfItems, int optionalNumberOfItems = -1)
 		ok = ok || optionalNumberOfItems==(int)testFileLine.count();
 	if (!ok) {
 		TQString msg = TQString("Invalid number of args (%1) for command '%2', expected: %3")
-			.tqarg(testFileLine.count()).tqarg(testFileLine[0]).tqarg(expectedNumberOfItems);
+			.arg(testFileLine.count()).arg(testFileLine[0]).arg(expectedNumberOfItems);
 		if (optionalNumberOfItems>0)
-			msg.append( TQString(" or %1").tqarg(optionalNumberOfItems) );
+			msg.append( TQString(" or %1").arg(optionalNumberOfItems) );
 		showError( msg );
 		return false;
 	}
@@ -167,7 +167,7 @@ TQVariant::Type typeNameToTQVariantType(const TQCString& name_)
 	if (name=="longlong")
 		return TQVariant::LongLong;
 //todo more types
-	showError(TQString("Invalid type '%1'").tqarg(name_));
+	showError(TQString("Invalid type '%1'").arg(name_));
 	return TQVariant::Invalid;
 }
 
@@ -202,7 +202,7 @@ static int getNumber(const TQString& argument, bool& ok)
 	else {
 		result = argument.toInt(&ok);
 		if (!ok) {
-			showError(TQString("Invalid value '%1'").tqarg(argument));
+			showError(TQString("Invalid value '%1'").arg(argument));
 			return -1;
 		}
 	}
@@ -248,7 +248,7 @@ bool AlterTableTester::changeFieldProperty(KexiTableDesignerInterface* designerI
 	else {
 		if (!castStringToTQVariant(propertyValueString, propertyType, newValue)) {
 			showError( TQString("Could not set property '%1' value '%2' of type '%3'")
-				.tqarg(propertyName).tqarg(propertyValueString).tqarg(propertyType) );
+				.arg(propertyName).arg(propertyValueString).arg(propertyType) );
 			return false;
 		}
 	}
@@ -283,7 +283,7 @@ bool AlterTableTester::getSchemaDump(KexiDialogBase* dlg, TQString& schemaDebugS
 	schemaDebugString = designerIface->debugStringForCurrentTableSchema(result);
 	if (true!=result) {
 		showError( TQString("Loading modified schema failed. Result: %1")
-			.tqarg(~result ? "cancelled" : "false") );
+			.arg(~result ? "cancelled" : "false") );
 		return false;
 	}
 	schemaDebugString.remove(TQRegExp(",$")); //no need to have "," at the end of lines
@@ -298,7 +298,7 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard)
 	if (copyToClipboard)
 		TQApplication::tqclipboard()->setText( schemaDebugString );
 	else
-		kdDebug() << TQString("Schema for '%1' table:\n").tqarg(dlg->partItem()->name())
+		kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name())
 			+ schemaDebugString + "\nendSchema" << endl;
 	return true;
 }
@@ -354,8 +354,8 @@ bool AlterTableTester::checkSchema(KexiDialogBase* dlg)
 	if (!getSchemaDump(dlg, schemaDebugString))
 		return false;
 	bool result = checkInternal(dlg, schemaDebugString, "endSchema", true /*skipColonsAndStripWhiteSpace*/);
-	kdDebug() << TQString("Schema check for table '%1': %2").tqarg(dlg->partItem()->name())
-		.tqarg(result ? "OK" : "Failed") << endl;
+	kdDebug() << TQString("Schema check for table '%1': %2").arg(dlg->partItem()->name())
+		.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -367,7 +367,7 @@ bool AlterTableTester::getActionsDump(KexiDialogBase* dlg, TQString& actionsDebu
 		return false;
 	tristate result = designerIface->simulateAlterTableExecution(&actionsDebugString);
 	if (true!=result) {
-		showError( TQString("Computing simplified actions for table '%1'  failed.").tqarg(dlg->partItem()->name()) );
+		showError( TQString("Computing simplified actions for table '%1'  failed.").arg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -381,7 +381,7 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard)
 	if (copyToClipboard)
 		TQApplication::tqclipboard()->setText( actionsDebugString );
 	else
-		kdDebug() << TQString("Simplified actions for altering table '%1':\n").tqarg(dlg->partItem()->name())
+		kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name())
 			+ actionsDebugString+"\n" << endl;
 	return true;
 }
@@ -392,8 +392,8 @@ bool AlterTableTester::checkActions(KexiDialogBase* dlg)
 	if (!getActionsDump(dlg, actionsDebugString))
 		return false;
 	bool result = checkInternal(dlg, actionsDebugString, "endActions", true /*skipColonsAndStripWhiteSpace*/);
-		kdDebug() << TQString("Actions check for table '%1': %2").tqarg(dlg->partItem()->name())
-		.tqarg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Actions check for table '%1': %2").arg(dlg->partItem()->name())
+		.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -405,7 +405,7 @@ bool AlterTableTester::saveTableDesign(KexiDialogBase* dlg)
 		return false;
 	tristate result = designerIface->executeRealAlterTable();
 	if (true!=result) {
-		showError( TQString("Saving design of table '%1' failed.").tqarg(dlg->partItem()->name()) );
+		showError( TQString("Saving design of table '%1' failed.").arg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -441,7 +441,7 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard)
 	if (copyToClipboard)
 		TQApplication::tqclipboard()->setText( dataString );
 	else
-		kdDebug() << TQString("Contents of table '%1':\n").tqarg(dlg->partItem()->name())+dataString+"\n" << endl;
+		kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl;
 	return true;
 }
 
@@ -451,8 +451,8 @@ bool AlterTableTester::checkTableData(KexiDialogBase* dlg)
 	if (!getTableDataDump(dlg, dataString))
 		return false;
 	bool result = checkInternal(dlg, dataString, "endTableData", false /*!skipColonsAndStripWhiteSpace*/);
-		kdDebug() << TQString("Table '%1' contents: %2").tqarg(dlg->partItem()->name())
-			.tqarg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Table '%1' contents: %2").arg(dlg->partItem()->name())
+			.arg(result ? "OK" : "Failed") << endl;
 	return result;
 }
 
@@ -462,8 +462,8 @@ bool AlterTableTester::closeWindow(KexiDialogBase* dlg)
 		return true;
 	TQString name = dlg->partItem()->name();
 	tristate result = true == win->closeDialog(dlg, true/*layoutTaskBar*/, true/*doNotSaveChanges*/);
-	kdDebug() << TQString("Closing window for table '%1': %2").tqarg(name)
-		.tqarg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
+	kdDebug() << TQString("Closing window for table '%1': %2").arg(name)
+		.arg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
 	return result == true;
 }
 
@@ -492,13 +492,13 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 	TQString tableName(testFileLine[1]);
 	KexiPart::Item *item = prj->itemForMimeType("kexi/table", tableName);
 	if (!item) {
-		showError(TQString("No such table '%1'").tqarg(tableName));
+		showError(TQString("No such table '%1'").arg(tableName));
 		return false;
 	}
 	bool openingCancelled;
 	KexiDialogBase* dlg = win->openObject(item, Kexi::DesignViewMode, openingCancelled);
 	if (!dlg) {
-		showError(TQString("Could not open table '%1'").tqarg(item->name()));
+		showError(TQString("Could not open table '%1'").arg(item->name()));
 		return false;
 	}
 	KexiTableDesignerInterface* designerIface 
@@ -570,7 +570,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 				bool ok;
 				variableI = command.mid(2).toInt(&ok);
 				if (!ok) {
-					showError(TQString("Invalid variable initialization '%1'").tqarg(command));
+					showError(TQString("Invalid variable initialization '%1'").arg(command));
 					return false;
 				}
 				continue;
@@ -622,7 +622,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 		if (command=="stop") {
 			if (!checkItemsNumber(1))
 				return false;
-			kdDebug() << TQString("Test STOPPED at line %1.").tqarg(testLineNumber) << endl;
+			kdDebug() << TQString("Test STOPPED at line %1.").arg(testLineNumber) << endl;
 			break;
 		}
 		else if (command=="closeWindow") {
@@ -640,7 +640,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 			break;
 		}
 		else {
-			showError( TQString("No such command '%1'").tqarg(command) );
+			showError( TQString("No such command '%1'").arg(command) );
 			return false;
 		}
 	}
@@ -674,7 +674,7 @@ int main(int argc, char *argv[])
 	testFilename = argv[argc-1];
 	testFile.setName(testFilename);
 	if (!testFile.open(IO_ReadOnly)) {
-		kdWarning() << TQString("Opening test file %1 failed.").tqarg(testFilename) << endl;
+		kdWarning() << TQString("Opening test file %1 failed.").arg(testFilename) << endl;
 		return quit(1);
 	}
 	//load db name
@@ -704,10 +704,10 @@ int main(int argc, char *argv[])
 	res = tester.run(closeAppRequested);
 	if (true != res) {
 		if (false == res)
-			kdWarning() << TQString("Running test for file '%1' failed.").tqarg(testFilename) << endl;
+			kdWarning() << TQString("Running test for file '%1' failed.").arg(testFilename) << endl;
 		return quit(res==false ? 1 : 0);
 	}
-	kdDebug() << TQString("Tests from file '%1': OK").tqarg(testFilename) << endl;
+	kdDebug() << TQString("Tests from file '%1': OK").arg(testFilename) << endl;
 	result = (closeOnFinish || closeAppRequested) ? 0 : tqApp->exec();
 	quit(result);
 	return result;
diff --git a/kexi/tests/newapi/dr_prop_test.h b/kexi/tests/newapi/dr_prop_test.h
index d7bfd5b3..2cbee8b2 100644
--- a/kexi/tests/newapi/dr_prop_test.h
+++ b/kexi/tests/newapi/dr_prop_test.h
@@ -23,7 +23,7 @@
 int drPropTest()
 {
 	TQValueList<TQCString> names = driver->propertyNames();
-	kdDebug() << TQString("%1 properties found:").tqarg(names.count()) << endl;
+	kdDebug() << TQString("%1 properties found:").arg(names.count()) << endl;
 	for (TQValueList<TQCString>::ConstIterator it = names.constBegin(); it!=names.constEnd(); ++it) {
 		kdDebug() << " - " << (*it) << ":" 
 			<< " caption=\"" << driver->propertyCaption(*it) << "\""
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index d02dbc9b..9eaff2ab 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -137,7 +137,7 @@ int main(int argc, char** argv)
 	}
 	test_name = args->getOption("test");
 	if (!tests.contains(test_name)) {
-		kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(test_name.data()) << endl;
+		kdDebug() << TQString("No such test \"%1\". Use --help.").arg(test_name.data()) << endl;
 		RETURN(1);
 	}
 	
@@ -152,7 +152,7 @@ int main(int argc, char** argv)
 		db_name_required = false;
 	}
 	if ((int)args->count()<minargs) {
-		kdDebug() << TQString("Not enough args (%1 required). Use --help.").tqarg(minargs) << endl;
+		kdDebug() << TQString("Not enough args (%1 required). Use --help.").arg(minargs) << endl;
 		RETURN(1);
 	}
 	
diff --git a/kexi/tests/newapi/parser_test.h b/kexi/tests/newapi/parser_test.h
index 90c25d7c..d02017ec 100644
--- a/kexi/tests/newapi/parser_test.h
+++ b/kexi/tests/newapi/parser_test.h
@@ -42,8 +42,8 @@ int parserTest(const char *st, const TQStringList& params)
 	}
 	else {
 		KexiDB::ParserError	err = parser.error();
-		kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").tqarg(err.error())
-			.tqarg(err.type()).tqarg(err.at()) << endl;
+		kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").arg(err.error())
+			.arg(err.type()).arg(err.at()) << endl;
 		r = 1;
 	}
 	delete q;
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 4c279382..af893ddf 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -435,7 +435,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ
 		pm->changeTitle(m_partPopupTitle_id, *bit->pixmap(0), title_text);
 /*		KexiPart::Part* part = Kexi::partManager().part(bit->info());
 		if (part)
-			m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceName() ));
+			m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceName() ));
 		else
 			m_newObjectAction->setText(i18n("&Create Object..."));
 		m_newObjectAction->setIconSet( SmallIconSet(bit->info()->itemIcon()) );*/
@@ -523,14 +523,14 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i)
 		m_prevSelectedPart = part;
 		if (part) {
 			if (m_newObjectAction) {
-				m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceCaption() ));
+				m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceCaption() ));
 				m_newObjectAction->setIcon( part->info()->createItemIcon() );
 				if (m_features & Toolbar) {
 					m_newObjectToolButton->setIconSet( part->info()->createItemIcon() );
 					TQToolTip::add(m_newObjectToolButton, 
-						i18n("Create object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Create object: %1").arg( part->instanceCaption().lower() ));
 					TQWhatsThis::add(m_newObjectToolButton, 
-						i18n("Creates a new object: %1").tqarg( part->instanceCaption().lower() ));
+						i18n("Creates a new object: %1").arg( part->instanceCaption().lower() ));
 				}
 			}
 		} else {
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index de6254b7..84038dcd 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
 	if (!defaultEncodingDescriptiveName.isEmpty()) {
 		m_defaultEncodingAdded = true;
 		TQString desc = i18n("Text encoding: Default", "Default: %1")
-			.tqarg(defaultEncodingDescriptiveName);
+			.arg(defaultEncodingDescriptiveName);
 		insertItem( desc, 0 );
 		if (_selectedEncoding==defaultEncoding) {
 			setCurrentItem(0);
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index e06b084b..2cdd0bfc 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -101,7 +101,7 @@ void KexiIdentifierPropertyEdit::setValue(const TQVariant &value, bool emitChang
 	TQString identifier( KexiUtils::string2Identifier(string) );
 	if (identifier!=string)
 		kdDebug() << TQString("KexiIdentifierPropertyEdit::setValue(): "
-			"String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl;
+			"String \"%1\" converted to identifier \"%2\".").arg(string).arg(identifier) << endl;
 	StringEdit::setValue( identifier, emitChange );
 }
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index c6eb39d3..29bd06d0 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -241,7 +241,7 @@ void KexiDataAwareView::slotCellSelected(int /*col*/, int row)
 
 void KexiDataAwareView::deleteAllRows()
 {
-	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*tqrepaint*/);
+	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*repaint*/);
 }
 
 void KexiDataAwareView::deleteCurrentRow()
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 09680b14..0be99a4a 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -42,10 +42,10 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiTableView *view;
 	if (dbAware)
 		view = new KexiDataTableView(this, 
-			TQString("%1_datatableview").tqarg(name ? name : "KexiDataTableView").latin1());
+			TQString("%1_datatableview").arg(name ? name : "KexiDataTableView").latin1());
 	else
 		view = new KexiTableView(0, this, 
-			TQString("%1_tableview").tqarg(name ? name : "KexiTableView").latin1());
+			TQString("%1_tableview").arg(name ? name : "KexiTableView").latin1());
 
 	KexiDataAwareView::init( view, view, view );
 }
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index 463d8797..02fe2853 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -337,7 +337,7 @@
                     <property name="text">
                         <string>&amp;Title (optional):</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index b9c64635..d41d93a2 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -182,7 +182,7 @@ void KexiFieldComboBox::setFieldOrExpression(int index)
 	index++; //skip 1st empty item
 	if (index>=count()) {
 		kexiwarn << TQString("KexiFieldComboBox::setFieldOrExpression(int index): index %1 "
-			"out of range (0..%2)").tqarg(index).tqarg(count()-1) << endl;
+			"out of range (0..%2)").arg(index).arg(count()-1) << endl;
 		index = -1;
 	}
 	if (index<=0) {
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index 059bf080..c6ff117a 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -88,7 +88,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -110,7 +110,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 122d9514..e2a5ac31 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -76,7 +76,7 @@ void KexiObjectInfoLabel::updateName()
 	if (txt.isEmpty())
 		txt = m_objectName;
 	else if (!m_objectName.isEmpty())
-		txt += TQString(" \"%1\"").tqarg(m_objectName);
+		txt += TQString(" \"%1\"").arg(m_objectName);
 	m_objectNameLabel->setText(txt);
 }
 
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 7bdfd12e..04beace6 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize()
 			change = true;
 		}
 		if (change) {
-	tqrepaint();
-	viewport()->tqrepaint();
+	repaint();
+	viewport()->repaint();
 	repaintContents();
 	updateContents(0, 0, 2000,2000);
-	clipper()->tqrepaint();
+	clipper()->repaint();
 
 			resizeContents(w, h);
 		}
@@ -257,8 +257,8 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev)
 		for(TQObject *o = list->first(); o; o = list->next())
 		{
 			TQWidget *w = (TQWidget*)o;
-			tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10));
-			tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10));
+			tmpx = TQMAX(tmpx, (w->geometry().right() + 10));
+			tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10));
 		}
 		delete list;
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 19875521..cee4f360 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -232,7 +232,7 @@ TQString LoadIconDialog::iconName()
 /// Pixmap Collection Editor Dialog
 PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent)
 : KDialogBase(parent, "pixcollection_dialog", true,
-	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
+	i18n("Edit Pixmap Collection: %1").arg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
 	TQFrame *frame = makeMainWidget();
@@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem()
 
 	int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+
 		i18n("Do you want to remove item \"%1\" from collection \"%2\"?")
-		.tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>");
+		.arg(item->text()).arg(m_collection->collectionName()) + "</qt>");
 	if(confirm == KMessageBox::No)
 		return;
 
@@ -373,7 +373,7 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 
 //// A Dialog to choose a pixmap from the PixmapCollection
 PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent)
-: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
+: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").arg(collection->collectionName()),
    User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection...")))
 {
 	m_collection = collection;
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 404fbcbe..33d988b9 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -78,7 +78,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 		TablesDict* tables() { return &m_tables; }
 
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget tqgeometry will be initialized.
+		 If \a rect is valid, table widget geometry will be initialized.
 		 \return added table container or 0 on failure.
 		 */
 		KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index ea1682f7..b40b9761 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus()
 	m_tableView->setPalette(p);*/
 
 	raise();
-	tqrepaint();
+	repaint();
 	emit gotFocus();
 }
 
@@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus()
 	m_tableView->setPalette(p);*/
 	
 	clearFocus();
-	tqrepaint();
+	repaint();
 }
 
 
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 713ce8fc..6899a434 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -76,7 +76,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 	
 	public slots:
 		/*! Adds a table \a t to the area. This changes only visual representation.
-		 If \a rect is valid, table widget rtqgeometry will be initialized.
+		 If \a rect is valid, table widget rgeometry will be initialized.
 		 */
 		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());
 
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 37ababa5..f45eb0e2 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -350,8 +350,8 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
 	if (!column()->isReadOnly() && e->type()==TQEvent::MouseButtonPress && m_scrollView) {
 		TQPoint gp = TQT_TQMOUSEEVENT(e)->globalPos() 
 			+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
-		TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), 
-			d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
+		TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()), 
+			d->button->mapToGlobal(d->button->geometry().bottomRight()));
 		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
 			m_mouseBtnPressedWhenPopupVisible = true;
 		}
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 721cb2d8..ce0b7695 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -539,8 +539,8 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 
 	if ( forceSet || m_curRow != newrow || m_curCol != newcol )
 	{
-		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").tqarg(m_curCol)
-			.tqarg(m_curRow).tqarg(newcol).tqarg(newrow) << endl;
+		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").arg(m_curCol)
+			.arg(m_curRow).arg(newcol).arg(newrow) << endl;
 		
 		// cursor moved: get rid of editor
 		if (m_editor) {
@@ -645,7 +645,7 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo
 			}
 			else {
 				kdDebug(44021) << TQString("NOW item at %1 (%2) is current")
-					.tqarg(m_curRow).tqarg((ulong)itemAt(m_curRow)) << endl;
+					.arg(m_curRow).arg((ulong)itemAt(m_curRow)) << endl;
 	//NOT EFFECTIVE!!!!!!!!!!!
 				//set item iterator
 				if (!newRowInserted && isInsertingEnabled() && m_currentItem == m_insertItem && m_curRow == (rows()-1)) {
@@ -838,7 +838,7 @@ bool KexiDataAwareObjectInterface::cancelRowEdit()
 //			viewport()->width(), d->rowHeight*3 + (m_navPanel ? m_navPanel->height() : 0)*3 );
 //		updateContents(); //js: above did not work well so we do that dirty
 		updateWidgetContents();
-//TODO: still doesn't tqrepaint properly!!
+//TODO: still doesn't repaint properly!!
 //		TQSize s(tableSize());
 //		resizeContents(s.width(), s.height());
 		updateWidgetContentsSize();
@@ -940,7 +940,7 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (!m_errorMessagePopup) {
 //					m_errorMessagePopup->close();
 					m_errorMessagePopup = new KexiArrowTip(
-						i18n("Error: %1").tqarg(m_editor->columnInfo()->field->typeName())+"?", 
+						i18n("Error: %1").arg(m_editor->columnInfo()->field->typeName())+"?", 
 						dynamic_cast<TQWidget*>(this));
 					m_errorMessagePopup->move( 
 						par->mapToGlobal(edit->pos()) + TQPoint(6, edit->height() + 0) );
@@ -954,8 +954,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 			if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 				kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NULL NOT ALLOWED!" << endl;
 				res = Validator::Error;
-//				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//				msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+				msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 					+ "\n\n" + Kexi::msgYouCanImproveData();
 				desc = i18n("The column's constraint is declared as NOT NULL.");
 				editCurrentCellAgain = true;
@@ -976,8 +976,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotEmpty() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): EMPTY NOT ALLOWED!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY.");
 					editCurrentCellAgain = true;
@@ -994,8 +994,8 @@ bool KexiDataAwareObjectInterface::acceptEditor()
 				if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) {
 					kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NEITHER NULL NOR EMPTY VALUE CAN BE SET!" << endl;
 					res = Validator::Error;
-//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
 						+ "\n\n" + Kexi::msgYouCanImproveData();
 					desc = i18n("The column's constraint is declared as NOT EMPTY and NOT NULL.");
 					editCurrentCellAgain = true;
@@ -1251,7 +1251,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 		m_curRow++;
 	}
 
-	m_data->insertRow(*newItem, row, true /*tqrepaint*/);
+	m_data->insertRow(*newItem, row, true /*repaint*/);
 
 	if (changeCurrentRow) {
 		//update iter...
@@ -1281,15 +1281,15 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 	*/
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool repaint)
 {
 	int row = m_data->findRef(item);
-	slotRowInserted( item, row, tqrepaint );
+	slotRowInserted( item, row, repaint );
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool tqrepaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool repaint)
 {
-	if (tqrepaint && (int)row<rows()) {
+	if (repaint && (int)row<rows()) {
 		updateWidgetContentsSize();
 
 /* updateAllVisibleRowsBelow() used instead
@@ -1317,7 +1317,7 @@ void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uin
 	}
 }
 
-tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
+tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 {
 	if (!hasData())
 		return true;
@@ -1331,7 +1331,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 			tableName.append("\"");
 		}
 		if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(this),
-				i18n("Do you want to clear the contents of table %1?").tqarg(tableName),
+				i18n("Do you want to clear the contents of table %1?").arg(tableName),
 				0, KGuiItem(i18n("&Clear Contents")) ))
 			return cancelled;
 	}
@@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 	cancelRowEdit();
 //	acceptRowEdit();
 //	m_verticalHeader->clear();
-	const bool repaintLater = tqrepaint && m_spreadSheetMode;
+	const bool repaintLater = repaint && m_spreadSheetMode;
 	const int oldRows = rows();
 
-	bool res = m_data->deleteAllRows(tqrepaint && !repaintLater);
+	bool res = m_data->deleteAllRows(repaint && !repaintLater);
 
 	if (res) {
 		if (m_spreadSheetMode) {
@@ -1359,21 +1359,21 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 //	m_verticalHeader->setCurrentRow(-1);
 
 //	d->pUpdateTimer->start(1,true);
-//	if (tqrepaint)
-//		viewport()->tqrepaint();
+//	if (repaint)
+//		viewport()->repaint();
 	return res;
 }
 
-void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
+void KexiDataAwareObjectInterface::clearColumns(bool repaint)
 {
 	cancelRowEdit();
 	m_data->clearInternal();
 
-	clearColumnsInternal(tqrepaint);
+	clearColumnsInternal(repaint);
 	updateIndicesForVisibleValues();
 
-	if (tqrepaint)
-//		viewport()->tqrepaint();
+	if (repaint)
+//		viewport()->repaint();
 //OK?
 		updateWidgetContents();
 
@@ -1393,7 +1393,7 @@ void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
 
 	m_verticalHeader->setCurrentRow(-1);
 
-	viewport()->tqrepaint();
+	viewport()->repaint();
 
 //	d->pColumnTypes.resize(0);
 //	d->pColumnModes.resize(0);
@@ -1490,9 +1490,9 @@ void KexiDataAwareObjectInterface::setEmptyRowInsertingEnabled(bool set)
 }
 
 void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* /*result*/, bool tqrepaint)
+	KexiDB::ResultInfo* /*result*/, bool repaint)
 {
-	if (tqrepaint) {
+	if (repaint) {
 		m_rowWillBeDeleted = m_data->findRef(&item);
 	}
 }
@@ -1534,7 +1534,7 @@ bool KexiDataAwareObjectInterface::deleteItem(KexiTableItem *item)/*, bool moveC
 	const bool lastRowDeleted = m_spreadSheetMode && m_data->last() == item; //we need to know this so we
 	                                                                         //can return to the last row 
 	                                                                         //after reinserting it
-	if (!m_data->deleteRow(*item, true /*tqrepaint*/)) {
+	if (!m_data->deleteRow(*item, true /*repaint*/)) {
 		/*const int button =*/ 
 		showErrorMessageForResult( m_data->result() );
 //		if (KMessageBox::No == button) {
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 389c1c74..0fed82b6 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -267,14 +267,14 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		 Does not clear columns information.
 		 Does not destroy KexiTableViewData object (if present) but only clears its contents.
 		 Displays confirmation dialog if \a ask is true (the default is false).
-		 Repaints widget if \a tqrepaint is true (the default). 
+		 Repaints widget if \a repaint is true (the default). 
 		 For empty tables, true is returned immediately.
 		 If isDeleteEnabled() is false, false is returned.
 		 For spreadsheet mode all current rows are just replaced by empty rows.
 		 \return true on success, false on failure, and cancelled if user cancelled deletion 
 		 (only possible if \a ask is true).
 		 */
-		tristate deleteAllRows(bool ask = false, bool tqrepaint = true);
+		tristate deleteAllRows(bool ask = false, bool repaint = true);
 
 		/*! \return maximum number of rows that can be displayed per one "page" 
 		 for current view's size. */
@@ -537,12 +537,12 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void initDataContents();
 
 		/*! Clears columns information and thus all internal table data 
-		 and its visible representation. Repaints widget if \a tqrepaint is true. */
-		virtual void clearColumns(bool tqrepaint = true);
+		 and its visible representation. Repaints widget if \a repaint is true. */
+		virtual void clearColumns(bool repaint = true);
 
 		/*! Called by clearColumns() to clear internals of the object.
 		 For example, KexiTableView removes contents of it's horizontal header. */
-		virtual void clearColumnsInternal(bool tqrepaint) = 0;
+		virtual void clearColumnsInternal(bool repaint) = 0;
 
 		/*! @internal for implementation
 		 This should append another section within horizontal header or any sort of caption
@@ -654,16 +654,16 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 
 		//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
 		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, 
-			bool tqrepaint);
+			bool repaint);
 
-		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 		virtual void slotRowDeleted();
 
-		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
+		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & ) {}
 
@@ -675,7 +675,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void selectCellInternal() {}
 
 		/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-		 to tqrepaint tow \a row and all visible below. 
+		 to repaint tow \a row and all visible below. 
 		 Implemented if there is more than one row displayed, i.e. currently for KexiTableView. */
 		virtual void updateAllVisibleRowsBelow(int row) { Q_UNUSED( row ); }
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index dde99b31..3b9fe3af 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows )
 }
 
 //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/)
-void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/)
+void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/)
 {
 	m_view->setDirty();
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index b2c66f96..8db82ba2 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -127,7 +127,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 		void slotRowsDeleted( const TQValueList<int> &rows );
 
 		//! Called on \a row insertion in a tableview.
-		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
 
 		//! Called on selecting another cell in a tableview.
 		void slotCellSelected(int, int row);
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index b68b4787..49bb8a0d 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -163,7 +163,7 @@ void
 KexiDateTableEdit::slotDateChanged(TQDate date)
 {
 	m_edit->setDate(date);
-	tqrepaint();
+	repaint();
 }
 
 void
diff --git a/kexi/widget/tableview/kexitableitem.cpp b/kexi/widget/tableview/kexitableitem.cpp
index 659e341e..d398dabb 100644
--- a/kexi/widget/tableview/kexitableitem.cpp
+++ b/kexi/widget/tableview/kexitableitem.cpp
@@ -55,7 +55,7 @@ KexiTableItem::clearValues()
 void
 KexiTableItem::debug() const
 {
-	TQString s = TQString("KexiTableItem (%1 items)").tqarg(size());
+	TQString s = TQString("KexiTableItem (%1 items)").arg(size());
 	for (uint i = 0; i < size(); i++)
 		s.append( TQString::number(i)+":"+at(i).toString()+" " );
 	kexidbg << s << endl;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 35ad2369..da1c2f20 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -366,7 +366,7 @@ void KexiTableView::updateWidgetContentsSize()
 
 void KexiTableView::slotRowsDeleted( const TQValueList<int> &rows )
 {
-	viewport()->tqrepaint();
+	viewport()->repaint();
 	updateWidgetContentsSize();
 	setCursorPosition(TQMAX(0, (int)m_curRow - (int)rows.count()), -1, true);
 }
@@ -384,7 +384,7 @@ void KexiTableView::setFont( const TQFont &font )
 	updateFonts(true);
 }
 
-void KexiTableView::updateFonts(bool tqrepaint)
+void KexiTableView::updateFonts(bool repaint)
 {
 #ifdef TQ_WS_WIN
 	d->rowHeight = fontMetrics().lineSpacing() + 4;
@@ -407,7 +407,7 @@ void KexiTableView::updateFonts(bool tqrepaint)
 	KexiDisplayUtils::initDisplayForAutonumberSign(d->autonumberSignDisplayParameters, this);
 	KexiDisplayUtils::initDisplayForDefaultValue(d->defaultValueDisplayParameters, this);
 
-	if (tqrepaint)
+	if (repaint)
 		updateContents();
 }
 
@@ -425,7 +425,7 @@ void KexiTableView::updateAllVisibleRowsBelow(int row)
 		clipper()->width(), clipper()->height() - (rowPos(row) - contentsY()) );
 }
 
-void KexiTableView::clearColumnsInternal(bool /*tqrepaint*/)
+void KexiTableView::clearColumnsInternal(bool /*repaint*/)
 {
 	while(m_horizontalHeader->count()>0)
 		m_horizontalHeader->removeLabel(0);
@@ -614,7 +614,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	bool paintOnlyInsertRow = false;
 
 /*	kdDebug(44021) << TQString(" KexiTableView::drawContents(cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;*/
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;*/
 
 	if (rowlast == -1) {
 		rowlast = rows() - 1;
@@ -931,9 +931,9 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 //	ts.setWidth( TQMIN( ts.width(), visibleWidth() ) );
 //	ts.setHeight( TQMIN( ts.height() - (m_navPanel ? m_navPanel->height() : 0), visibleHeight()) );
 /*	kdDebug(44021) << TQString(" (cx:%1 cy:%2 cw:%3 ch:%4)")
-			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;
+			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;
 	kdDebug(44021) << TQString(" (w:%3 h:%4)")
-			.tqarg(ts.width()).tqarg(ts.height()) << endl;*/
+			.arg(ts.width()).arg(ts.height()) << endl;*/
 	
 	// Region of the rect we should draw, calculated in viewport
 	// coordinates, as a region can't handle bigger coordinates
@@ -959,12 +959,12 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) );
 
 	// And draw the rectangles (transformed inc contents coordinates as needed)
-	TQMemArray<TQRect> r = reg.tqrects();
+	TQMemArray<TQRect> r = reg.rects();
 	for ( int i = 0; i < (int)r.count(); i++ ) {
 		TQRect rect( viewportToContents2(r[i].topLeft()), r[i].size() );
 /*		kdDebug(44021) << TQString("- pEA: p->fillRect(x:%1 y:%2 w:%3 h:%4)")
-			.tqarg(rect.x()).tqarg(rect.y())
-			.tqarg(rect.width()).tqarg(rect.height()) << endl;*/
+			.arg(rect.x()).arg(rect.y())
+			.arg(rect.width()).arg(rect.height()) << endl;*/
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), d->emptyAreaColor );
 		p->fillRect( rect, d->appearance.emptyAreaColor );
 //		p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), viewport()->backgroundBrush() );
@@ -1425,7 +1425,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 			else {
 				kexidbg << "KexiTableView::KeyPressEvent(): default" << endl;
 				if (e->text().isEmpty() || !e->text().isEmpty() && !e->text()[0].isPrint() ) {
-					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").tqarg(k,0,16) <<endl;
+					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").arg(k,0,16) <<endl;
 	//				e->ignore();
 					TQScrollView::keyPressEvent(e);
 					return;
@@ -1450,7 +1450,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	m_vScrollBarValueChanged_enabled=false;
 
-	// if focus cell changes, tqrepaint
+	// if focus cell changes, repaint
 	setCursorPosition(curRow, curCol);
 
 	m_vScrollBarValueChanged_enabled=true;
@@ -1630,7 +1630,7 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
 		slotUpdate();
 		triggerUpdate();
 	}
-//	d->pTopHeader->tqrepaint();
+//	d->pTopHeader->repaint();
 
 
 /*		m_navPanel->setGeometry(
@@ -1645,14 +1645,14 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
 //		m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(),
 	//		m_navPanel->width(), horizontalScrollBar()->height());
 //	updateContents(0,0,2000,2000);//js
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::viewportResizeEvent( TQResizeEvent *e )
 {
 	TQScrollView::viewportResizeEvent( e );
 	updateGeometries();
-//	erase(); tqrepaint();
+//	erase(); repaint();
 }
 
 void KexiTableView::showEvent(TQShowEvent *e)
@@ -1818,7 +1818,7 @@ void KexiTableView::slotColumnWidthChanged( int, int, int )
 	else {
 	//	updateContents( columnPos(col), 0, contentsWidth(), contentsHeight() );
 		updateContents(contentsX(), 0, viewport()->width(), contentsHeight());
-	//	viewport()->tqrepaint();
+	//	viewport()->repaint();
 	}
 
 //	updateContents(0, 0, d->pBufferPm->width(), d->pBufferPm->height());
@@ -2481,7 +2481,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
 		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
 		if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) {
 			//accept row editing if focus is moved to foreign widget 
-			//(not a child, like eg. editor) from one of our table view's tqchildren
+			//(not a child, like eg. editor) from one of our table view's children
 			//or from table view itself
 			if (!acceptRowEdit()) {
 				static_cast<TQWidget*>(o)->setFocus();
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index daabe0f9..fc488c83 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -263,7 +263,7 @@ public slots:
 	virtual void setData( KexiTableViewData *data, bool owner = true )
 		{ KexiDataAwareObjectInterface::setData( data, owner ); }
 
-	virtual void clearColumnsInternal(bool tqrepaint);
+	virtual void clearColumnsInternal(bool repaint);
 
 	/*! Adjusts \a colNum column's width to its (current) contents. 
 	 If \a colNum == -1, all columns' width is adjusted. */
@@ -432,19 +432,19 @@ protected slots:
 	virtual void slotRowRepaintRequested(KexiTableItem& item);
 
 	//! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted().
-	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
+	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
+	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
 
-	//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
+	//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
 	virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-	//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
-	virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, tqrepaint); }
+	//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
+	virtual void slotRowInserted(KexiTableItem *item, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, repaint); }
 
 	//! Like above, not db-aware version
-	virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, tqrepaint); }
+	virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, repaint); }
 
 	/*! Handles verticalScrollBar()'s valueChanged(int) signal. 
 	 Called when vscrollbar's value has been changed. */
@@ -588,7 +588,7 @@ protected:
 	virtual void removeEditor();
 
 	//! Internal: updated sched fonts for painting.
-	void updateFonts(bool tqrepaint = false);
+	void updateFonts(bool repaint = false);
 
 	/*! @internal Changes bottom margin settings, in pixels. 
 	 At this time, it's used by KexiComboBoxPopup to decrease margin for popup's table. */
@@ -614,7 +614,7 @@ protected:
 	virtual void paste();
 
 	/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-	 to tqrepaint tow \a row and all visible below. */
+	 to repaint tow \a row and all visible below. */
 	virtual void updateAllVisibleRowsBelow(int row);
 
 	void updateAfterCancelRowEdit();
@@ -626,7 +626,7 @@ protected:
 	bool getVisibleLookupValue(TQVariant& cellValue, KexiTableEdit *edit, 
 		KexiTableItem *item, KexiTableViewColumn *tvcol) const;
 
-//	//! Called to tqrepaint contents after a row is deleted.
+//	//! Called to repaint contents after a row is deleted.
 //	void repaintAfterDelete();
 
 	KexiTableViewPrivate *d;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index ad670e3e..6a15b0db 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item,
 	}
 
 //! @todo if there're multiple views for this data, we need multiple buffers!
-bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint)
+bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 {
 	if (!m_pRowEditBuffer)
 		return true; //nothing to do
@@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (val->isNull() && !f->isAutoIncrement()) {
 				//NOT NULL violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT NULL.");
 				m_result.column = col;
 				return false;
@@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint
 			if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) {
 				//NOT EMPTY violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
 				m_result.desc = i18n("The column's constraint is declared as NOT EMPTY.");
 				m_result.column = col;
 				return false;
@@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB
 	
 	m_pRowEditBuffer->clear();
 
-	if (tqrepaint)
+	if (repaint)
 		emit rowRepaintRequested(item);
 	return true;
 }
 
-bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl;
 	m_result.clear();
@@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
 	if (!m_result.success)
 		return false;
 
-	if (saveRow(item, false /*update*/, tqrepaint)) {
+	if (saveRow(item, false /*update*/, repaint)) {
 		emit rowUpdated(&item);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint)
 {
 	kdDebug() << "KexiTableViewData::saveNewRow()..." << endl;
 	m_result.clear();
-	emit aboutToInsertRow(&item, &m_result, tqrepaint);
+	emit aboutToInsertRow(&item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 	
-	if (saveRow(item, true /*insert*/, tqrepaint)) {
-		emit rowInserted(&item, tqrepaint);
+	if (saveRow(item, true /*insert*/, repaint)) {
+		emit rowInserted(&item, repaint);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
+bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
 {
 	m_result.clear();
-	emit aboutToDeleteRow(item, &m_result, tqrepaint);
+	emit aboutToDeleteRow(item, &m_result, repaint);
 	if (!m_result.success)
 		return false;
 
@@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
 	return true;
 }
 
-void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint )
+void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint )
 {
-	Q_UNUSED( tqrepaint );
+	Q_UNUSED( repaint );
 
 	if (rowsToDelete.isEmpty())
 		return;
@@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool t
 	emit rowsDeleted( rowsToDelete );
 }
 
-void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint)
+void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint)
 {
 	if (!insert( index = TQMIN(index, count()), &item ))
 		return;
-	emit rowInserted(&item, index, tqrepaint);
+	emit rowInserted(&item, index, repaint);
 }
 
 void KexiTableViewData::clearInternal()
@@ -827,7 +827,7 @@ void KexiTableViewData::clearInternal()
 	}
 }
 
-bool KexiTableViewData::deleteAllRows(bool tqrepaint)
+bool KexiTableViewData::deleteAllRows(bool repaint)
 {
 	clearInternal();
 
@@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool tqrepaint)
 		res = m_cursor->deleteAllRows();
 	}
 
-	if (tqrepaint)
+	if (repaint)
 		emit reloadRequested();
 	return res;
 }
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 7263f3fe..eb3d20df 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -359,27 +359,27 @@ public:
 	/*! \return last operation's result information (always not null). */
 	inline KexiDB::ResultInfo* result() { return &m_result; }
 
-	bool saveRowChanges(KexiTableItem& item, bool tqrepaint = false);
+	bool saveRowChanges(KexiTableItem& item, bool repaint = false);
 
-	bool saveNewRow(KexiTableItem& item, bool tqrepaint = false);
+	bool saveNewRow(KexiTableItem& item, bool repaint = false);
 
-	bool deleteRow(KexiTableItem& item, bool tqrepaint = false);
+	bool deleteRow(KexiTableItem& item, bool repaint = false);
 
 	/*! Deletes rows (by number) passed with \a rowsToDelete. 
 	 Currently, this method is only for non data-aware tables. */
-	void deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint = false );
+	void deleteRows( const TQValueList<int> &rowsToDelete, bool repaint = false );
 
 	/*! Deletes all rows. Works either for db-aware and non db-aware tables.
 	 Column's definition is not changed.
 	 For db-aware version, all rows are removed from a database.
 	 Row-edit buffer is cleared.
 
-	 If \a tqrepaint is true, reloadRequested() signal 
+	 If \a repaint is true, reloadRequested() signal 
 	 is emitted after deleting (if at least one row was deleted), 
-	 so presenters can tqrepaint their contents. 
+	 so presenters can repaint their contents. 
 
 	 \return true on success. */
-	virtual bool deleteAllRows(bool tqrepaint = false);
+	virtual bool deleteAllRows(bool repaint = false);
 
 	/*! @internal method, used mostly by specialized classes like KexiTableView.
 	 Clears internal row structures. Row-edit buffer is cleared. 
@@ -390,7 +390,7 @@ public:
 	/*! Inserts new \a item at index \a index. 
 	 \a item will be owned by this data object.
 	 Note: Reasonable only for not not-db-aware version. */
-	void insertRow(KexiTableItem& item, uint index, bool tqrepaint = false);
+	void insertRow(KexiTableItem& item, uint index, bool repaint = false);
 
 /*TODO: add this as well? 
 	void insertRow(KexiTableItem& item, KexiTableItem& aboveItem); */
@@ -445,7 +445,7 @@ signals:
 	/*! Emited before inserting of a new, current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this inserting. You can also change columns in \a item row. */
-	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool repaint);
 
 	/*! Emited before changing of an edited, current row.
 	 Connect this signal to your slot and set \a result->success to false 
@@ -455,15 +455,15 @@ signals:
 
 	void rowUpdated(KexiTableItem*); //!< Current row has been updated
 
-	void rowInserted(KexiTableItem*, bool tqrepaint); //!< A row has been inserted
+	void rowInserted(KexiTableItem*, bool repaint); //!< A row has been inserted
 
 	//! A row has been inserted at \a index position (not db-aware data only)
-	void rowInserted(KexiTableItem*, uint index, bool tqrepaint);
+	void rowInserted(KexiTableItem*, uint index, bool repaint);
 
 	/*! Emited before deleting of a current row.
 	 Connect this signal to your slot and set \a result->success to false 
 	 to disallow this deleting. */
-	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 	//! Current row has been deleted
 	void rowDeleted(); 
@@ -497,7 +497,7 @@ protected:
 	int cmpBLOB(Item item1, Item item2);
 
 	//! internal: for saveRowChanges() and saveNewRow()
-	bool saveRow(KexiTableItem& item, bool insert, bool tqrepaint);
+	bool saveRow(KexiTableItem& item, bool insert, bool repaint);
 
 	//! (logical) sorted column number, set by setSorting()
 	//! can differ from m_realSortedColumn if there's lookup column used
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index f34864a9..aeeec86d 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -187,7 +187,7 @@ void KexiImageContextMenu::saveAs()
 	if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this, 
 		"<qt>"+i18n("File \"%1\" already exists."
 		"<p>Do you want to replace it with a new one?")
-		.tqarg(TQDir::convertSeparators(fileName))+"</qt>",0, 
+		.arg(TQDir::convertSeparators(fileName))+"</qt>",0, 
 		KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace"))))
 	{
 		return;
@@ -268,8 +268,8 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object
 /*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool]
  (see doc/dev/settings.txt) */
 	TQString realTitle( i18n("Object name : Object type", "%1 : %2")
-		.tqarg( objectName[0].upper() + objectName.mid(1) )
-		.tqarg( objectTypeName ));
+		.arg( objectName[0].upper() + objectName.mid(1) )
+		.arg( objectTypeName ));
 
 	if (iconName.isEmpty())
 		title->setTitle(realTitle);
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index b11961d2..298eda48 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -78,7 +78,7 @@ KexiDateFormatter::KexiDateFormatter()
 			m_order = TQDateEdit::YDM;
 //! @todo use TQRegExp (to replace %Y by %1, etc.) instead of hardcoded "%1%299%399" 
 //!       because df may contain also other characters
-			m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+			m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 			m_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat;
 			m_yearpos = 0;
 			m_daypos = yearMask.length()+separatorLen;
@@ -86,7 +86,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (daypos<monthpos && monthpos<yearpos) {
 			m_order = TQDateEdit::DMY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = dayDateFormat+m_separator+monthDateFormat+m_separator+yearDateFormat;
 			m_daypos = 0;
 			m_monthpos = 2+separatorLen;
@@ -94,7 +94,7 @@ KexiDateFormatter::KexiDateFormatter()
 		}
 		else if (monthpos<daypos && daypos<yearpos) {
 			m_order = TQDateEdit::MDY;
-			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask);
+			m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask);
 			m_qtFormat = monthDateFormat+m_separator+dayDateFormat+m_separator+yearDateFormat;
 			m_monthpos = 0;
 			m_daypos = 2+separatorLen;
@@ -104,7 +104,7 @@ KexiDateFormatter::KexiDateFormatter()
 			ok = false;
 	}
 	if (!ok || m_order == TQDateEdit::YMD) {//default: YMD
-		m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
+		m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator);
 		m_qtFormat = yearDateFormat+m_separator+monthDateFormat+m_separator+dayDateFormat;
 		m_yearpos = 0;
 		m_monthpos = yearMask.length()+separatorLen;
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index 50959770..f6868a5e 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -134,9 +134,9 @@ KexiFlowLayout::widgetList() const
 }
 
 void
-KexiFlowLayout::tqinvalidate()
+KexiFlowLayout::invalidate()
 {
-	TQLayout::tqinvalidate();
+	TQLayout::invalidate();
 	m_cached_sizeHint = TQSize();
 	m_cached_minSize = TQSize();
 	m_cached_width = 0;
@@ -468,7 +468,7 @@ int KexiFlowLayout::count() const {
     \reimp
 */
 TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
-	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).tqat(index)) : 0;
+	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).at(index)) : 0;
 }
 
 /*!
@@ -477,8 +477,8 @@ TQLayoutItem* KexiFlowLayout::itemAt(int index) const {
 TQLayoutItem* KexiFlowLayout::takeAt(int index) {
 	if (index < 0 || index >= m_list.count())
 		return 0;
-	TQLayoutItem *item = m_list.tqat(index);
-	m_list.remove(m_list.tqat(index));
+	TQLayoutItem *item = m_list.at(index);
+	m_list.remove(m_list.at(index));
 	delete item;
 	
 	invalidate();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index c4550fca..aec6c6c3 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -49,7 +49,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		virtual void addItem(TQLayoutItem *item);
 		virtual void addSpacing(int size);
 		virtual TQLayoutIterator iterator();
-		virtual void  tqinvalidate();
+		virtual void  invalidate();
 
 		virtual bool hasHeightForWidth() const;
 		virtual int heightForWidth(int width) const;
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 18d34447..d93b13ff 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -155,7 +155,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 	}
 
 	/**
-	All tqchildren need to have our background set.
+	All children need to have our background set.
 	*/
 	KPixmap partPixmap;
 	TQRect area;
@@ -180,7 +180,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 		under the current child-widget.
 		*/
 		if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-			area = childWidget->tqgeometry();
+			area = childWidget->geometry();
 		} else {
 			area.setTopLeft( childWidget->mapTo( this,
 				childWidget->clipRegion().boundingRect().topLeft() ) );
@@ -311,7 +311,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 
 	/**
 	Exclude widgtes that don't have a parent.
-	This happens when tqchildren are removed
+	This happens when children are removed
 	which are in the knownWidgets-list.
 	*/
 	if ( childWidget->parent() == 0L )
@@ -330,7 +330,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget )
 	under the current child-widget.
 	*/
 	if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) {
-		area = childWidget->tqgeometry();
+		area = childWidget->geometry();
 	} else {
 		area.setTopLeft( childWidget->mapTo( this,
 			childWidget->clipRegion().boundingRect().topLeft() ) );
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 3f9b894d..d11c4f04 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -184,11 +184,11 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 
 	private:
 		/*!
-		Builds a list of tqchildren of \a p.
+		Builds a list of children of \a p.
 		Only widgets that work correctly with KexiGradientWidget
 		will be in this list.
 		The results will be stored in \a list.
-		The method recursively calls itself until all tqchildren of \a p
+		The method recursively calls itself until all children of \a p
 		have been found and stored in the list.
 		*/
 		static void buildChildrenList( WidgetList& list, TQWidget* p );
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 9eae328b..6c666e78 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -87,7 +87,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame
 		/*! \return record count displayed for this navigator. */
 		uint recordCount() const;
 
-		/*! Sets horizontal bar's \a hbar (at the bottom) tqgeometry so this record navigator
+		/*! Sets horizontal bar's \a hbar (at the bottom) geometry so this record navigator
 		 is properly positioned together with horizontal scroll bar. This method is used 
 		 in TQScrollView::setHBarGeometry() implementations:
 		 see KexiTableView::setHBarGeometry() and KexiFormScrollView::setHBarGeometry()
diff --git a/kformula/DESIGN b/kformula/DESIGN
index 0e828043..eec70869 100644
--- a/kformula/DESIGN
+++ b/kformula/DESIGN
@@ -19,22 +19,22 @@ objects from it.
 Responsebilities
 (This goes for every derived element and therefore for each one.)
 
-- knows its tqchildren. Actually BasicElement doesn't have any. But it
-  already defines that tqchildren must be known by their parent.
-- knows its bounding rectangle (its size.) The tqchildren are included
+- knows its children. Actually BasicElement doesn't have any. But it
+  already defines that children must be known by their parent.
+- knows its bounding rectangle (its size.) The children are included
   in this rect. (Only width and height are needed. Positions are
   handled by the parent)
-//- knows its middle line. (for tqalignment)
-- knows it's zero point for midline (vertical tqalignment) and 
+//- knows its middle line. (for alignment)
+- knows it's zero point for midline (vertical alignment) and 
   keep open the possibility of negative positions (out of bounding rect)
-- draws itself (given a painter); tqchildren are drawn, too
+- draws itself (given a painter); children are drawn, too
 - knows all positions where the cursor is allowed to be. (see below)
 - knows its parent; The topmost element has no parent; there is a
   implicit garantie that the topmost element is always a
   SequenceElement.
 - can save and load itself. different formates. (see below)
-- all tqchildren must be a SequenceElement. Except for SequenceElement's
-  tqchildren that might be of any type.
+- all children must be a SequenceElement. Except for SequenceElement's
+  children that might be of any type.
 - might have its own color.
 - might have its own font size (see below).
 
@@ -42,14 +42,14 @@ Responsebilities
 SequenceElement from BasicElement
 ---------------
 
-Manages a list of tqchildren. The tqchildren are aligned horizontally at
+Manages a list of children. The children are aligned horizontally at
 one middle line. No gaps, no overlaps.
 
-Has no own look. It just draws all its tqchildren and is done. Except if
+Has no own look. It just draws all its children and is done. Except if
 its empty. It looks like an empty space then (i.e. a little square)
 
 Has n+1 valid cursor positions where n is the number of
-tqchildren. These are before, between and after the tqchildren.
+children. These are before, between and after the children.
 
 May contain any (type of) element as child 
 
@@ -74,20 +74,20 @@ FormulaElement we get a chance to pass messages to the outside world.
 RootElement from BasicElement
 -----------
 
-contains two tqchildren. content and index. index is optional.
+contains two children. content and index. index is optional.
 
 
 IndexElement from BasicElement
 ------------
 
-contains five tqchildren. content and four indexes. all indexes are
+contains five children. content and four indexes. all indexes are
 optional. If there is no index the element might be replaced by its content.
 
 
 TextElement from BasicElement
 -----------
 
-contains one char and no tqchildren at all.
+contains one char and no children at all.
 
 
 Might have its own font and size. But preferes to use a reasonalbe
@@ -105,7 +105,7 @@ choose with.
 FractionElement from BasicElement
 ---------------
 
-2 tqchildren: numerator, denominator
+2 children: numerator, denominator
 
 
 DecorationElement from BasicElement
@@ -122,7 +122,7 @@ the other side of the decoration.
 SumIntegralElement from BasicElement  //PrefixedElement
 ------------------
 
-draws all sorts of mathematical symbols with three tqchildren. Above,
+draws all sorts of mathematical symbols with three children. Above,
 below (or whereever the indices and limits go)and to the right.
 
 
@@ -143,7 +143,7 @@ typical of a math formula.
 MatrixElement from BasicElement
 -------------
 
-A matrix of tqchildren.
+A matrix of children.
 With all align stuff, internal borders etc, matrix dots handling (i.e.
 those dots or lines that complete the matrix, not well handled in TeX),
 etc..
@@ -151,7 +151,7 @@ etc..
 SpaceElement from BasicElement
 ------------
 
-No tqchildren at all. Provides the facility to insert horizontal spaces
+No children at all. Provides the facility to insert horizontal spaces
 in the formula. (therefore it is similar to TextElement.)
 
 
@@ -183,14 +183,14 @@ If the cursor points into an element this element is said to own the
 cursor. There are a few rules that describe how new cursor positions
 are calculated given the current key:
 
-- An elements cursor positions are its tqchildren. The element might not
-own the cursor except when it is owned by one of its tqchildren. The
+- An elements cursor positions are its children. The element might not
+own the cursor except when it is owned by one of its children. The
 only exception is SequenceElement which has valid cursor positions
-before, between and after its tqchildren, too.
+before, between and after its children, too.
 
 (Therefore the cursor is always owned by a SequenceElement.)
 
-- Each element's tqchildren are ordered. If the cursor leaves one child
+- Each element's children are ordered. If the cursor leaves one child
 the next child it. The direction depends on the key that moved the
 cursor. If there is child left the cursor is passed to the parent.
 
@@ -261,7 +261,7 @@ We want a formula to look different according to its
 surroundings. (Most obviosly according to the available height and/or width.)
 
 It would be great to get something like automatic operator
-tqalignment. So if you type some formulas each on its own line the
+alignment. So if you type some formulas each on its own line the
 assigment operators should be automatically in a column. (If the user
 turns this on.)
 
@@ -272,7 +272,7 @@ Fonts and font size (2 ideas)
 
 1)
 Each element know its font family (also if it is not a text element) so that it 
-can give this font to its tqchildren.
+can give this font to its children.
 
 The font size is calculated starting from a global scale factor and appling to it
 a local size modifier (like HTML -2, -1,+3,etc..), this also calculate the 
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc
index b22c8576..400fdd66 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cc
@@ -112,7 +112,7 @@ void FormulaString::helpButtonClicked()
 
 void FormulaString::cursorPositionChanged( int para, int pos )
 {
-    position->setText( TQString( "%1:%2" ).tqarg( para+1 ).tqarg( pos+1 ) );
+    position->setText( TQString( "%1:%2" ).arg( para+1 ).arg( pos+1 ) );
 }
 
 #include "formulastring.moc"
diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc
index 3d425a16..77a11819 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cc
@@ -447,7 +447,7 @@ TQDomDocument FormulaStringParser::parse()
     head = parseAssign();
     //head->output( cout );
     if ( !eol() ) {
-        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).arg( line ).arg( column ) );
     }
 
     TQDomDocument doc = KFormula::Document::createDomDocument();
@@ -556,7 +556,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                     nextToken();
                 }
             }
-            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
+            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
             node->setFunctionName( true );
             return new FunctionNode( node, args );
         }
@@ -571,7 +571,7 @@ ParserNode* FormulaStringParser::parsePrimary()
     case LP: {
         nextToken();
         ParserNode* node = parseExpr();
-        expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
+        expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
         return node;
     }
     case LB: {
@@ -582,7 +582,7 @@ ParserNode* FormulaStringParser::parsePrimary()
         m_newlineIsSpace = innerBrackets;
         while ( ( currentType != EOL ) && ( currentType != RB ) ) {
             if ( innerBrackets ) {
-                expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "[" ) );
+                expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "[" ) );
             }
             TQPtrList<ParserNode> row;
             row.setAutoDelete( false );
@@ -594,7 +594,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                 }
             }
             if ( innerBrackets ) {
-                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
+                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
                 if ( currentType == COMMA ) {
                     nextToken();
                 }
@@ -605,20 +605,20 @@ ParserNode* FormulaStringParser::parsePrimary()
                         nextToken();
                     }
                     else {
-                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ";" ) );
+                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ";" ) );
                     }
                 }
             }
             rows.append( new RowNode( row ) );
         }
         m_newlineIsSpace = true;
-        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
+        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
         MatrixNode* node = new MatrixNode( rows );
         if ( node->columns() == 0 ) {
-            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
         }
         if ( node->rows() == 0 ) {
-            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
         }
         return node;
     }
@@ -628,7 +628,7 @@ ParserNode* FormulaStringParser::parsePrimary()
         return node;
     }
     default:
-        error( TQString( i18n( "Unexpected token at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+        error( TQString( i18n( "Unexpected token at %1:%2" ) ).arg( line ).arg( column ) );
         return new PrimaryNode( "?" );
     }
 }
@@ -773,7 +773,7 @@ void FormulaStringParser::readNumber()
                 readDigits();
             }
             else if ( !digitsBeforeDot ) {
-                error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+                error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).arg( line ).arg( column ) );
                 return;
             }
         }
diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc
index e48e026d..c8d4a284 100644
--- a/kformula/kformulawidget.cc
+++ b/kformula/kformulawidget.cc
@@ -68,8 +68,8 @@ void KFormulaWidget::setReadOnly(bool ro)
 
 void KFormulaWidget::paintEvent(TQPaintEvent* event)
 {
-    // Always tqrepaint the buffer. This is not so much more work
-    // than it seems to be as each cursor movement requires a tqrepaint.
+    // Always repaint the buffer. This is not so much more work
+    // than it seems to be as each cursor movement requires a repaint.
     TQPainter p( &buffer );
     //p.translate( -fr.x(), -fr.y() );
     formulaView.draw( p, event->rect(), colorGroup() );
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 3bbc05a5..30ef3850 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -1115,7 +1115,7 @@ void KivioCanvas::startPasteMoving()
   beginUnclippedSpawnerPainter();
   drawSelectedStencilsXOR();
 
-  // Build the list of old tqgeometry
+  // Build the list of old geometry
   KoRect *pData;
   m_lstOldGeometry.clear();
   KivioStencil* pStencil = activePage()->selectedStencils()->first();
@@ -1245,7 +1245,7 @@ void KivioCanvas::endPasteMoving()
 
   endUnclippedSpawnerPainter();
 
-  // Clear the list of old tqgeometry
+  // Clear the list of old geometry
   m_lstOldGeometry.clear();
   m_pasteMoving = false;
 }
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index a7dee3d4..300488c6 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -119,7 +119,7 @@ KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* pa
   if ( !name )
   {
     TQString tmp( "Document%1" );	//lukas: FIXME
-    tmp = tmp.tqarg( s_docId++ );
+    tmp = tmp.arg( s_docId++ );
     setName( tmp.latin1() );
   }
 
@@ -627,7 +627,7 @@ bool KivioDoc::completeLoading( KoStore* )
 KivioPage* KivioDoc::createPage()
 {
   TQString s( i18n("Page%1") );
-  s = s.tqarg( m_iPageId++ );
+  s = s.arg( m_iPageId++ );
 
   KivioPage* t = new KivioPage(m_pMap, s);
   t->setPageName(s,true);
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 8d529449..340a5124 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -153,7 +153,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
 
   if(KStatusBar* sb = statusBar()) { // No statusbar in e.g. konqueror
     m_pageCountSLbl = new KStatusBarLabel(i18n("%1 current page, %2 total number of pages",
-                                          "Page %1/%2").tqarg(0).tqarg(0), PAGECOUNT_TEXT, sb);
+                                          "Page %1/%2").arg(0).arg(0), PAGECOUNT_TEXT, sb);
     addStatusBarItem(m_pageCountSLbl, 0, false);
 
     m_infoSLbl = new KStatusBarLabel("", INFO_TEXT, sb);
@@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
     TQString unit = KoUnit::unitName(m_pDoc->unit());
     KoPoint xy(0, 0);
     TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
-                        "X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
-                        .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
+                        "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
+                        .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
     m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
     addStatusBarItem(m_coordSLbl, 0, true);
   }
@@ -258,7 +258,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
   setFocusProxy( m_pCanvas );
 
   connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) );
-  connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
+  connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) );
 
   setInstance(KivioFactory::global());
   if ( !m_pDoc->isReadWrite() )
@@ -1134,13 +1134,13 @@ void KivioView::ungroupStencils()
 void KivioView::selectAllStencils()
 {
     m_pActivePage->selectAllStencils();
-    m_pCanvas->tqrepaint();
+    m_pCanvas->repaint();
 }
 
 void KivioView::unselectAllStencils()
 {
     m_pActivePage->unselectAllStencils();
-    m_pCanvas->tqrepaint();
+    m_pCanvas->repaint();
 }
 
 TQColor KivioView::fgColor() const
@@ -1733,7 +1733,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
     m_pActivePage->addStencil( pStencil );
     m_pActivePage->selectStencil( pStencil );
 
-    // Mark the page as modified and tqrepaint
+    // Mark the page as modified and repaint
     m_pDoc->updateView(m_pActivePage);
     pluginManager()->activateDefaultTool();
     m_pCanvas->updateAutoGuideLines();
@@ -1748,7 +1748,7 @@ void KivioView::alignStencilsDlg()
     m_pActivePage->alignStencils(dlg->align());
     m_pActivePage->distributeStencils(dlg->distribute());
 
-    m_pCanvas->tqrepaint();
+    m_pCanvas->repaint();
   }
 
   delete dlg;
@@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my )
     KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my));
     xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit()));
     xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit()));
-    TQString text = i18n("X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2))
-      .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit);
+    TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
+      .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
     m_coordSLbl->setText(text);
   }
 }
@@ -2191,7 +2191,7 @@ int KivioView::vTextAlign()
 
 void KivioView::updatePageStatusLabel()
 {
-  TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count());
+  TQString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count());
   m_pageCountSLbl->setText(text);
 }
 
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index c500f34a..dde3103a 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -29,18 +29,18 @@ ZoomAction::ZoomAction(TQObject* parent, const char* name)
 {
   setEditable(true);
   TQStringList lst;
-  lst << i18n("%1%").tqarg("33");
-  lst << i18n("%1%").tqarg("50");
-  lst << i18n("%1%").tqarg("75");
-  lst << i18n("%1%").tqarg("100");
-  lst << i18n("%1%").tqarg("125");
-  lst << i18n("%1%").tqarg("150");
-  lst << i18n("%1%").tqarg("200");
-  lst << i18n("%1%").tqarg("250");
-  lst << i18n("%1%").tqarg("350");
-  lst << i18n("%1%").tqarg("400");
-  lst << i18n("%1%").tqarg("450");
-  lst << i18n("%1%").tqarg("500");
+  lst << i18n("%1%").arg("33");
+  lst << i18n("%1%").arg("50");
+  lst << i18n("%1%").arg("75");
+  lst << i18n("%1%").arg("100");
+  lst << i18n("%1%").arg("125");
+  lst << i18n("%1%").arg("150");
+  lst << i18n("%1%").arg("200");
+  lst << i18n("%1%").arg("250");
+  lst << i18n("%1%").arg("350");
+  lst << i18n("%1%").arg("400");
+  lst << i18n("%1%").arg("450");
+  lst << i18n("%1%").arg("500");
   setItems(lst);
 }
 
@@ -84,14 +84,14 @@ void ZoomAction::insertItem( int zoom )
 
   TQStringList lst;
   for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-    lst.append( i18n("%1%").tqarg(*it) );
+    lst.append( i18n("%1%").arg(*it) );
   setItems(lst);
-  setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom)));
+  setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom)));
 }
 
 void ZoomAction::setEditZoom( int zoom )
 {
-  const TQString zt(i18n("%1%").tqarg(zoom));
+  const TQString zt(i18n("%1%").arg(zoom));
   setEditText(zt);
 }
 #include "kivio_zoomaction.moc"
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.cpp b/kivio/kiviopart/kiviosdk/diapathparser.cpp
index 1af85056..e071a8e6 100644
--- a/kivio/kiviopart/kiviosdk/diapathparser.cpp
+++ b/kivio/kiviopart/kiviosdk/diapathparser.cpp
@@ -48,8 +48,8 @@ void DiaPointFinder::svgClosePath()
 {
 
 }
-DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty) :
-	SVGPathParser(), m_doc(doc), m_tqshape(tqshape),
+DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty) :
+	SVGPathParser(), m_doc(doc), m_shape(shape),
 	m_xscale(xscale), m_yscale(yscale),
 	m_lowestx(lowestx), m_lowesty(lowesty)
 {
@@ -72,12 +72,12 @@ void DiaPathParser::svgLineTo( double x1, double y1, bool )
 	TQDomElement kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(lastX,true) * m_xscale));
 	kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale));
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(currentX,true) * m_xscale));
 	kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale));
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 	lastX = currentX;
 	lastY = currentY;
 }
@@ -99,7 +99,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2,
 	kivioPointElement.setAttribute("y",
 		TQString::number(diaPointToKivio(lastY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
@@ -107,7 +107,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2,
 	kivioPointElement.setAttribute("y",
 		TQString::number(diaPointToKivio(lastControlY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
@@ -115,7 +115,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2,
 	kivioPointElement.setAttribute("y",
 		TQString::number(diaPointToKivio(currentControlY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 
 	kivioPointElement = m_doc->createElement("KivioPoint");
 	kivioPointElement.setAttribute("x",
@@ -123,7 +123,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2,
 	kivioPointElement.setAttribute("y",
 		TQString::number(diaPointToKivio(currentY, false) * m_yscale));
 	kivioPointElement.setAttribute("type", "bezier");
-	m_tqshape->appendChild(kivioPointElement);
+	m_shape->appendChild(kivioPointElement);
 	lastX = currentX;
 	lastY = currentY;
 }
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.h b/kivio/kiviopart/kiviosdk/diapathparser.h
index 0a9439f6..5308c468 100644
--- a/kivio/kiviopart/kiviosdk/diapathparser.h
+++ b/kivio/kiviopart/kiviosdk/diapathparser.h
@@ -41,7 +41,7 @@ class DiaPointFinder : public SVGPathParser
 class DiaPathParser : public SVGPathParser
 {
 	public:
-		DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty);
+		DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty);
 
 		void svgMoveTo( double x1, double y1, bool abs = true );
 		void svgLineTo( double x1, double y1, bool abs = true );
@@ -52,7 +52,7 @@ class DiaPathParser : public SVGPathParser
 		float diaPointToKivio(float point, bool xpoint);
 
 		TQDomDocument *m_doc;
-		TQDomElement *m_tqshape;
+		TQDomElement *m_shape;
 		float lastX;
 		float lastY;
 		float m_xscale;
diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
index b42d650b..8162bcd2 100644
--- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h
@@ -124,7 +124,7 @@ public:
     virtual void customDrag( KivioCustomDragData * );
 
 
-    // tqgeometry management
+    // geometry management
     virtual void updateGeometry();
     virtual void updateConnectorPoints( KivioConnectorPoint *, double, double );
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
index f7e2dddb..1e0a76de 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h
@@ -100,7 +100,7 @@ public:
     virtual void customDrag( KivioCustomDragData * );
 
 
-    // tqgeometry management
+    // geometry management
     virtual void updateGeometry();
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
index e41f5788..b290fb62 100644
--- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp
@@ -501,7 +501,7 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil )
         pTgTarget = pStencil->m_pTargets->next();
     }
 
-    // Copy the tqgeometry
+    // Copy the geometry
     pStencil->m_x = m_x;
     pStencil->m_y = m_y;
     pStencil->m_w = m_w;
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp
index b67efc23..bb95c94a 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp
@@ -423,7 +423,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de
 
 void  XmlWriteRect( TQDomElement &e, const TQString &att, const KoRect &val )
 {
-    e.setAttribute( att, TQString("[%1,%2,%3,%4]").tqarg(val.x()).tqarg(val.y()).tqarg(val.width()).tqarg(val.height()) );
+    e.setAttribute( att, TQString("[%1,%2,%3,%4]").arg(val.x()).arg(val.y()).arg(val.width()).arg(val.height()) );
 }
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
index 0208f932..d408bee6 100644
--- a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
@@ -83,10 +83,10 @@ void KivioConnectorPoint::setTarget( KivioConnectorTarget *pTarget  )
  * Sets the x coordinate.
  *
  * @param newX The new value
- * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
  *
  * Sets the X coordinate to a new value, and optionally
- * updates the stencil's tqgeometry if updateStencil is true.
+ * updates the stencil's geometry if updateStencil is true.
  */
 void KivioConnectorPoint::setX( double newX, bool updateStencil )
 {
@@ -102,10 +102,10 @@ void KivioConnectorPoint::setX( double newX, bool updateStencil )
  * Sets the y coordinate.
  *
  * @param newY The new value
- * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
  *
  * Sets the Y coordinate to a new value, and optionally
- * updates the stencil's tqgeometry if updateStencil is true.
+ * updates the stencil's geometry if updateStencil is true.
  */
 void KivioConnectorPoint::setY( double newY, bool updateStencil )
 {
@@ -122,10 +122,10 @@ void KivioConnectorPoint::setY( double newY, bool updateStencil )
  *
  * @param newX The new x value
  * @param newY The new y value
- * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's geometry should be updated (def=true)
  *
  * Sets the X & Y coordinates to new values, and optionally
- * updates the stencil's tqgeometry if updateStencil is true.
+ * updates the stencil's geometry if updateStencil is true.
  */
  void KivioConnectorPoint::setPosition( double newX, double newY, bool updateStencil )
 {
diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index 7dac3244..ada33c4c 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -83,7 +83,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 		return false;
 	}
 	dia.setContent(&f);
-	TQDomNode diaMain = dia.namedItem("tqshape");
+	TQDomNode diaMain = dia.namedItem("shape");
 
 	// Set "creator" attribute
 	TQDomElement firstElement = kivio.createElement("KivioShapeStencil");
@@ -250,7 +250,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 	//}
 	//else
 	{
-		// scale the tqshape to be close to 30 by 30
+		// scale the shape to be close to 30 by 30
 		m_yscale = 30.0/(m_highesty - m_lowesty);
 		m_xscale = 30.0/(m_highestx - m_lowestx);
 	}
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
index cc8eb0e3..dd228934 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
@@ -63,7 +63,7 @@ KivioPyStencil::KivioPyStencil()
 
 
    vars = Py_BuildValue( "{s:d,s:d,s:d,s:d,s:d,s:d,s:{},s:[],s:[],s:{}}",
-                            "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","tqshapes");
+                            "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","shapes");
 
    resizeCode = "";
 }
@@ -406,45 +406,45 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
 {
   KoZoomHandler* zoomHandler = d->zoomHandler;
 
-  PyObject *tqshapes = PyDict_Values( PyDict_GetItemString( vars, "tqshapes" ) );
+  PyObject *shapes = PyDict_Values( PyDict_GetItemString( vars, "shapes" ) );
 
-  if ( !tqshapes ) {
+  if ( !shapes ) {
     return;
   }
 
-  int size = PyList_Size( tqshapes );
+  int size = PyList_Size( shapes );
 
   for ( int i=0; i<size; i++ ) {
-    PyObject *tqshape = PyList_GetItem( tqshapes, i );
-    if ( !PyDict_Check(tqshape) )
+    PyObject *shape = PyList_GetItem( shapes, i );
+    if ( !PyDict_Check(shape) )
       continue;
 
     int fill = KivioFillStyle::kcsNone;
 
-    // if style dosn't defined for tqshape, applay default for stencil
+    // if style dosn't defined for shape, applay default for stencil
     setStyle( d, PyDict_GetItemString( vars, "style" ) , fill );
-    setStyle( d, tqshape, fill );
+    setStyle( d, shape, fill );
 
     if ( isSelected() )
-      setStyle( d, PyDict_GetItemString( tqshape, "selected" ) , fill );
+      setStyle( d, PyDict_GetItemString( shape, "selected" ) , fill );
 
     if ( outlined )
         fill = KivioFillStyle::kcsNone;
 
-    TQString stype = getStringFromDict( tqshape, "type" );
+    TQString stype = getStringFromDict( shape, "type" );
     stype = stype.lower();
 
-    double x = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x"));
-    double y = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y"));
-    double w = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"w"));
-    double h = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"h"));
-    //double x2 = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x2"));
-    //double y2 = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y2"));
+    double x = zoomHandler->zoomItX(getDoubleFromDict(shape,"x"));
+    double y = zoomHandler->zoomItY(getDoubleFromDict(shape,"y"));
+    double w = zoomHandler->zoomItX(getDoubleFromDict(shape,"w"));
+    double h = zoomHandler->zoomItY(getDoubleFromDict(shape,"h"));
+    //double x2 = zoomHandler->zoomItX(getDoubleFromDict(shape,"x2"));
+    //double y2 = zoomHandler->zoomItY(getDoubleFromDict(shape,"y2"));
 
     // get points list
     TQPtrList<KivioPoint> points;
     points.setAutoDelete(true);
-    PyObject *pyPoints = PyDict_GetItemString( tqshape, "points" );
+    PyObject *pyPoints = PyDict_GetItemString( shape, "points" );
     if ( pyPoints && PyList_Check(pyPoints) ) {
       int size = PyList_Size(pyPoints);
       for ( int i=0; i<size; i++ ) {
@@ -470,7 +470,7 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
       f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0));
 
       d->painter->setFont( f );
-      TQString text = getStringFromDict(tqshape,"text");
+      TQString text = getStringFromDict(shape,"text");
 
       if ( !text.isEmpty() ) {
         d->painter->drawText( int( x ), int( y ), int( w ), int( h ), tf | TQt::WordBreak, text );
@@ -478,14 +478,14 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
     }
 
     if ( stype == "arc" ) {
-      double a1 = getDoubleFromDict(tqshape,"a1");
-      double a2 = getDoubleFromDict(tqshape,"a2");
+      double a1 = getDoubleFromDict(shape,"a1");
+      double a2 = getDoubleFromDict(shape,"a2");
       d->painter->drawArc(x,y,w,h,a1,a2);
     }
 
     if ( stype == "roundrect" ) {
-      double rx = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"rx"));
-      double ry = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"ry"));
+      double rx = zoomHandler->zoomItX(getDoubleFromDict(shape,"rx"));
+      double ry = zoomHandler->zoomItY(getDoubleFromDict(shape,"ry"));
 
       if (fill) {
         d->painter->fillRoundRect( x, y, w, h, rx, ry );
@@ -924,7 +924,7 @@ void KivioPyStencil::setLineWidth( double w )
 
 void KivioPyStencil::setText( const TQString &s )
 {
-   PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" );
+   PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" );
    if ( to )
       PyDict_SetItemString(to, "text", Py_BuildValue("s", s.latin1() ));
 }
@@ -932,7 +932,7 @@ void KivioPyStencil::setText( const TQString &s )
 
 TQString KivioPyStencil::text()
 {
-    PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" );
+    PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" );
     if ( to ) {
         return getStringFromDict(to, "text");
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.cpp b/kivio/kiviopart/kiviosdk/kivio_shape.cpp
index dad8459a..302c6547 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape.cpp
@@ -44,7 +44,7 @@ KivioShape::KivioShape()
  */
 KivioShape::KivioShape( const KivioShape &source )
 {
-    source.m_tqshapeData.copyInto( &m_tqshapeData );
+    source.m_shapeData.copyInto( &m_shapeData );
 }
 
 
@@ -68,7 +68,7 @@ void KivioShape::copyInto( KivioShape *pTarget ) const
     if( !pTarget )
         return;
 
-    m_tqshapeData.copyInto( &(pTarget->m_tqshapeData) );
+    m_shapeData.copyInto( &(pTarget->m_shapeData) );
 }
 
 
@@ -84,13 +84,13 @@ bool KivioShape::loadXML( const TQDomElement &e )
     TQDomNode node = e.firstChild();
 
     TQString name = XmlReadString( e, "name", "" );
-    m_tqshapeData.setName( name );
-    m_tqshapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "tqshapeType", -1 ));
+    m_shapeData.setName( name );
+    m_shapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "shapeType", -1 ));
 
-    if( m_tqshapeData.name().isEmpty() ||
-        m_tqshapeData.tqshapeType() == -1 )
+    if( m_shapeData.name().isEmpty() ||
+        m_shapeData.shapeType() == -1 )
     {
-       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown tqshape or bad name read. Shape load aborted." << endl;
+       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown shape or bad name read. Shape load aborted." << endl;
        return false;
     }
 
@@ -101,7 +101,7 @@ bool KivioShape::loadXML( const TQDomElement &e )
 
         if( nodeName == "KivioShapeData" )
         {
-            m_tqshapeData.loadXML( ele );
+            m_shapeData.loadXML( ele );
         }
 
         node = node.nextSibling();
@@ -120,17 +120,17 @@ TQDomElement KivioShape::saveXML( TQDomDocument &doc )
 {
     TQDomElement e = doc.createElement("KivioShape");
 
-    XmlWriteString( e, "name", m_tqshapeData.m_name );
-    XmlWriteInt( e, "tqshapeType", m_tqshapeData.m_tqshapeType );
+    XmlWriteString( e, "name", m_shapeData.m_name );
+    XmlWriteInt( e, "shapeType", m_shapeData.m_shapeType );
 
-    e.appendChild( m_tqshapeData.saveXML( doc ) );
+    e.appendChild( m_shapeData.saveXML( doc ) );
 
     return e;
 }
 
 
 /**
- * Loads a tqshape of type arc
+ * Loads a shape of type arc
  *
  * @param e The element to load from
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -144,7 +144,7 @@ KivioShape *KivioShape::loadShapeArc( const TQDomElement & )
 
 
 /**
- * Loads a tqshape of type closed-path.
+ * Loads a shape of type closed-path.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -157,12 +157,12 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstClosedPath;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstClosedPath;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -176,16 +176,16 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier);
             pPoint->loadXML( node.toElement() );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
     
         node = node.nextSibling();
@@ -196,7 +196,7 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type bezier
+ * Loads a shape of type bezier
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -209,12 +209,12 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstBezier;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstBezier;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -230,25 +230,25 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e )
             pPoint->loadXML( node.toElement() );
             if( pPoint->pointType() != KivioPoint::kptBezier )
             {
-	       kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found.  Aborting tqshape." << endl;
+	       kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found.  Aborting shape." << endl;
                 delete pPoint;
                 delete pShape;
                 return NULL;
             }
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
     }
     
-    if( pShape->m_tqshapeData.m_pOriginalPointList->count() != 4 )
+    if( pShape->m_shapeData.m_pOriginalPointList->count() != 4 )
     {
-       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, tqshape aborted" << endl;
+       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, shape aborted" << endl;
         delete pShape;
         return NULL;
     }
@@ -258,7 +258,7 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type ellipse.
+ * Loads a shape of type ellipse.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -270,15 +270,15 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstEllipse;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstEllipse;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) );
+    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) );
         
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -288,11 +288,11 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e )
         
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -303,7 +303,7 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type line-array.
+ * Loads a shape of type line-array.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -317,12 +317,12 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e )
     TQDomElement lineElement;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstLineArray;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstLineArray;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -337,14 +337,14 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e )
 
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint( XmlReadFloat( lineElement, "x1", 0.0f ), XmlReadFloat( lineElement, "y1", 0.0f ) );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = new KivioPoint( XmlReadFloat( lineElement, "x2", 0.0f ), XmlReadFloat( lineElement, "y2", 0.0f ) );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -355,7 +355,7 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type open-path.
+ * Loads a shape of type open-path.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -368,12 +368,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstOpenPath;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstOpenPath;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -387,12 +387,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier);
             pPoint->loadXML( node.toElement() );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -403,7 +403,7 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type pie.
+ * Loads a shape of type pie.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -417,7 +417,7 @@ KivioShape *KivioShape::loadShapePie( const TQDomElement & )
 
 
 /**
- * Loads a tqshape of type polygon.
+ * Loads a shape of type polygon.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -430,12 +430,12 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolygon;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolygon;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -449,16 +449,16 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint();
             pPoint->loadXML( node.toElement() );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -469,7 +469,7 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type polyline.
+ * Loads a shape of type polyline.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -482,12 +482,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolyline;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolyline;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -501,12 +501,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e )
             // Allocate a new point, load it, and store it in the list
             pPoint = new KivioPoint();
             pPoint->loadXML( node.toElement() );
-            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -517,7 +517,7 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type rectangle.
+ * Loads a shape of type rectangle.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -529,15 +529,15 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRectangle;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRectangle;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
+    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
     
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -548,11 +548,11 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e )
         // Read the fill style
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -564,7 +564,7 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type round rectangle.
+ * Loads a shape of type round rectangle.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -577,20 +577,20 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e )
     TQString nodeName;
     
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRoundRectangle;
-    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRoundRectangle;
+    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
 
-    pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
+    pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
+    pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
     
     // Read and store the radii of the curves
     pPoint = new KivioPoint(0.0f, 0.0f);
     pPoint->set( XmlReadFloat( e, "r1", 1.0f ), XmlReadFloat( e, "r2", 1.0f ) );
-    pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
+    pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
     
     // Iterate through the nodes loading the various items
     node = e.firstChild();
@@ -601,11 +601,11 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e )
         // Read the fill style
         if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -616,7 +616,7 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e )
 
 
 /**
- * Loads a tqshape of type textbox.
+ * Loads a shape of type textbox.
  *
  * @param e The element to load from.
  * @returns A newly allocated KivioShape, or NULL on error.
@@ -630,17 +630,17 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e )
     TQString name;
 
 
-    // Create the new tqshape to load into
+    // Create the new shape to load into
     pShape = new KivioShape();
 
     // Load the type and name
-    pShape->m_tqshapeData.setShapeType(KivioShapeData::kstTextBox);
-    pShape->m_tqshapeData.setName( XmlReadString( e, "name", "" ) );
-    pShape->m_tqshapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0)));
+    pShape->m_shapeData.setShapeType(KivioShapeData::kstTextBox);
+    pShape->m_shapeData.setName( XmlReadString( e, "name", "" ) );
+    pShape->m_shapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0)));
 
-    pShape->m_tqshapeData.m_position.set( 
+    pShape->m_shapeData.m_position.set( 
        XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_tqshapeData.m_dimensions.set( 
+    pShape->m_shapeData.m_dimensions.set( 
        XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) );
 
     // Now look for the KivioTextStyle
@@ -651,13 +651,13 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e )
        if( nodeName == "KivioTextStyle" )
        {
 	  ts.loadXML( node.toElement() );
-	  pShape->m_tqshapeData.setTextStyle( &ts );
+	  pShape->m_shapeData.setTextStyle( &ts );
        }
 
        node = node.nextSibling();
     }
 //    TQString text = XmlReadString( e, "text", "" );
-//    pShape->m_tqshapeData.setText( text );
+//    pShape->m_shapeData.setText( text );
 
 
     return pShape;
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.h b/kivio/kiviopart/kiviosdk/kivio_shape.h
index c83607d7..42adfed6 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape.h
@@ -26,7 +26,7 @@
 class KivioShape
 {
 protected:
-    KivioShapeData m_tqshapeData; // The data inside this tqshape
+    KivioShapeData m_shapeData; // The data inside this shape
 
 public:
     KivioShape();
@@ -39,9 +39,9 @@ public:
     bool loadXML( const TQDomElement & );
     TQDomElement saveXML( TQDomDocument & );
 
-    KivioShapeData::KivioShapeType tqshapeType() { return m_tqshapeData.tqshapeType(); }
+    KivioShapeData::KivioShapeType shapeType() { return m_shapeData.shapeType(); }
 
-    KivioShapeData *tqshapeData() { return &m_tqshapeData; }
+    KivioShapeData *shapeData() { return &m_shapeData; }
 
     static KivioShape *loadShapeArc( const TQDomElement & );
     static KivioShape *loadShapeClosedPath( const TQDomElement & );
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
index 5305fe13..431d7987 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 /*
- * Struct for holding information about a tqshape type
+ * Struct for holding information about a shape type
  */
 struct KivioShapeTypeInfo
 {
@@ -36,10 +36,10 @@ struct KivioShapeTypeInfo
 };
 
 /*
- * Array of tqshape info used for loading/saving.
+ * Array of shape info used for loading/saving.
  */
 static const int numShapeInfo = 12;
-static struct KivioShapeTypeInfo tqshapeInfo[] = {
+static struct KivioShapeTypeInfo shapeInfo[] = {
     { "Arc",        KivioShapeData::kstArc                  },
     { "Pie",        KivioShapeData::kstPie                  },
     { "LineArray",  KivioShapeData::kstLineArray            },
@@ -84,7 +84,7 @@ KivioShapeData::KivioShapeData()
     m_pLineStyle = new KivioLineStyle();
 //    m_fgColor = TQColor( 0, 0, 0 );
 
-    m_tqshapeType = kstNone;
+    m_shapeType = kstNone;
     m_name = "";
 //    m_lineWidth = 1.0f;
 
@@ -119,7 +119,7 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source )
     //m_fgColor = source.m_fgColor;
 
     // Copy the rest
-    m_tqshapeType = source.m_tqshapeType;
+    m_shapeType = source.m_shapeType;
     m_name      = TQString(source.m_name);
     //m_lineWidth = source.m_lineWidth;
 
@@ -127,8 +127,8 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source )
     source.m_position.copyInto( &m_position );
     source.m_dimensions.copyInto( &m_dimensions );
 
-    // If this is a text tqshape, allocate a text data struct and copy the info
-    if( m_tqshapeType == kstTextBox )
+    // If this is a text shape, allocate a text data struct and copy the info
+    if( m_shapeType == kstTextBox )
     {
         m_pTextData = new KivioTextStyle();
 
@@ -208,7 +208,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
     //pTarget->m_fgColor = m_fgColor;
 
     // Copy the rest
-    pTarget->m_tqshapeType = m_tqshapeType;
+    pTarget->m_shapeType = m_shapeType;
     pTarget->m_name = TQString(m_name);
     //pTarget->m_lineWidth = m_lineWidth;
 
@@ -217,7 +217,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const
 
 
     // If this is a textbox, allocate & copy
-    if( m_tqshapeType == kstTextBox )
+    if( m_shapeType == kstTextBox )
     {
         if( !pTarget->m_pTextData )
         {
@@ -283,7 +283,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e )
         {
 
             // First make sure we are a text box
-            if( m_tqshapeType == kstTextBox )
+            if( m_shapeType == kstTextBox )
             {
                 // If we don't have text data, allocate it
                 if( !m_pTextData )
@@ -291,12 +291,12 @@ bool KivioShapeData::loadXML( const TQDomElement &e )
 
                 m_pTextData->loadXML( ele );
 
-            } // end if m_tqshapeType==kstTextBox
+            } // end if m_shapeType==kstTextBox
         }
         else if( nodeName == "KivioText" )
         {
             // First make sure we are a text box
-            if( m_tqshapeType == kstTextBox )
+            if( m_shapeType == kstTextBox )
             {
                 KivioTextShapeData *pData = new KivioTextShapeData;
 
@@ -338,7 +338,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e )
                 m_pTextData->setFont( pData->m_textFont );
                 m_pTextData->setColor( pData->m_textColor );
 
-            } // end if m_tqshapeType==kstTextBox
+            } // end if m_shapeType==kstTextBox
             else
             {
 	       kdDebug(43000) << "KivioShapeData::loadXML() - Loading KivioText, but this is not a textbox!" << endl;
@@ -385,7 +385,7 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc )
 
 
     // Save if we are a text box etc...
-    if( m_tqshapeType == kstTextBox )
+    if( m_shapeType == kstTextBox )
     {
         if( m_pTextData )
         {
@@ -420,21 +420,21 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc )
     // The BGFillStyle
     e.appendChild( m_pFillStyle->saveXML( doc ) );
 
-    // Shape type & name are stored in the tqshape node
-    //XmlWriteInt( e, "tqshapeType", m_tqshapeType );
+    // Shape type & name are stored in the shape node
+    //XmlWriteInt( e, "shapeType", m_shapeType );
     //XmlWriteString( e, "name", m_name );
 
     return e;
 }
 
 
-KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQString &str )
+KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const TQString &str )
 {
 
     for( int i=0; i<numShapeInfo; i++ )
     {
-        if( str.compare( tqshapeInfo[i].name )==0 )
-            return tqshapeInfo[i].type;
+        if( str.compare( shapeInfo[i].name )==0 )
+            return shapeInfo[i].type;
     }
 
     return kstNone;
@@ -442,7 +442,7 @@ KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQSt
 
 void KivioShapeData::setShapeType( KivioShapeType st )
 {
-    m_tqshapeType = st;
+    m_shapeType = st;
 
     // If it is a text box, make sure we have text data
     if( st == kstTextBox )
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
index f97e5ec9..bd89dcc8 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
@@ -36,11 +36,11 @@ class KivioTextShapeData
 public:
     KivioTextShapeData();
 
-    TQString m_text;                                 // The text inside this tqshape
+    TQString m_text;                                 // The text inside this shape
     TQColor m_textColor;                             // The text color
     TQFont m_textFont;                               // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text alignment flags
 };
 
 /**
@@ -52,7 +52,7 @@ class KivioShapeData
 {
 public:
     /**
-     * The possible tqshape types.
+     * The possible shape types.
      */
     typedef enum {
         kstNone = 0,
@@ -75,7 +75,7 @@ protected:
 
     TQPtrList <KivioPoint> *m_pOriginalPointList;       // Original point list loaded from an SML file
 
-    KivioShapeType m_tqshapeType;                     // The tqshape type
+    KivioShapeType m_shapeType;                     // The shape type
     KivioPoint m_position, m_dimensions;            // The position and dimensions
     KivioFillStyle *m_pFillStyle;                   // The fill style
 
@@ -83,7 +83,7 @@ protected:
 //    float m_lineWidth;                              // The line width
     KivioLineStyle *m_pLineStyle;
 
-    TQString m_name;                                 // The name of this tqshape
+    TQString m_name;                                 // The name of this shape
 
     KivioTextStyle *m_pTextData;                    // A pointer to text data (if applicable, e.g. TextBox)
 
@@ -98,10 +98,10 @@ public:
     virtual TQDomElement saveXML( TQDomDocument & );
 
 
-    KivioShapeType tqshapeType() const { return m_tqshapeType; }
+    KivioShapeType shapeType() const { return m_shapeType; }
     void setShapeType( KivioShapeType st );
 
-    static KivioShapeType tqshapeTypeFromString( const TQString & );
+    static KivioShapeType shapeTypeFromString( const TQString & );
 
     TQPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
index fbdad979..f1ca2c8f 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
@@ -37,9 +37,9 @@ void KivioShapePainter::drawShape( KivioShape *pShape, float x, float y, float w
 
     m_pShape = pShape;
 
-    pShapeData = pShape->tqshapeData();
+    pShapeData = pShape->shapeData();
 
-    switch( pShapeData->tqshapeType() )
+    switch( pShapeData->shapeType() )
     {
     case KivioShapeData::kstArc:
         drawArc();
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
index 6f00df1a..dc6f2722 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
@@ -50,7 +50,7 @@
 /**
  * Default constructor
  *
- * Allocates a new tqshape list, connector targets, and original connector targets.
+ * Allocates a new shape list, connector targets, and original connector targets.
  */
 KivioSMLStencil::KivioSMLStencil()
     : KivioStencil(),
@@ -111,7 +111,7 @@ bool KivioSMLStencil::loadXML( const TQDomElement &e )
         }
         else if( nodeName == "KivioShape" )
         {
-            // Locate the tqshape we are supposed to load into
+            // Locate the shape we are supposed to load into
             KivioShape *pShape = locateShape( XmlReadString( ele, "name", "" ) );
 
             if(pShape) {
@@ -173,7 +173,7 @@ void KivioSMLStencil::loadConnectorTargetListXML( const TQDomElement &e )
 
 
 /**
- * Locates a tqshape in the tqshape list by name.
+ * Locates a shape in the shape list by name.
  */
 KivioShape *KivioSMLStencil::locateShape( const TQString &name )
 {
@@ -185,7 +185,7 @@ KivioShape *KivioSMLStencil::locateShape( const TQString &name )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->name() == name )
+        if( pShape->shapeData()->name() == name )
         {
             return pShape;
         }
@@ -233,7 +233,7 @@ TQDomElement KivioSMLStencil::saveXML( TQDomDocument &doc )
     }
     e.appendChild( clE );
 
-    // The tqshape list
+    // The shape list
     KivioShape *pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -268,7 +268,7 @@ KivioStencil *KivioSMLStencil::duplicate()
     pNewStencil->m_pSpawner = m_pSpawner;
 
 
-    // Copy the tqshape list
+    // Copy the shape list
     pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -313,9 +313,9 @@ void KivioSMLStencil::paintOutline( KivioIntraStencilData *pData )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShapeData = pShape->tqshapeData();
+        pShapeData = pShape->shapeData();
 
-        switch( pShapeData->tqshapeType() )
+        switch( pShapeData->shapeType() )
         {
             case KivioShapeData::kstArc:
                 drawOutlineArc( pShape, pData );
@@ -396,7 +396,7 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData
     KivioPoint *pPosition, *pDimensions;
     KivioPoint *pPoint;
 
-    pShapeData = pShape->tqshapeData();
+    pShapeData = pShape->shapeData();
     pPosition = pShapeData->position();
     pDimensions = pShapeData->dimensions();
 
@@ -420,14 +420,14 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData
 void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
   TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
@@ -456,7 +456,7 @@ void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilDa
 void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
@@ -487,7 +487,7 @@ void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencil
 void KivioSMLStencil::drawOutlineClosedPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
@@ -521,7 +521,7 @@ void KivioSMLStencil::drawOutlineEllipse( KivioShape *pShape, KivioIntraStencilD
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -546,7 +546,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -582,7 +582,7 @@ void KivioSMLStencil::drawOutlineRectangle( KivioShape *pShape, KivioIntraStenci
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -606,7 +606,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -643,7 +643,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -679,7 +679,7 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -714,7 +714,7 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
   int _x, _y, _w, _h;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPosition = pShapeData->position();
   KivioPoint *pDimensions = pShapeData->dimensions();
   KivioPainter *painter = pData->painter;
@@ -765,9 +765,9 @@ void KivioSMLStencil::paint( KivioIntraStencilData *pData )
   pShape = m_pShapeList->first();
   while( pShape )
   {
-    pShapeData = pShape->tqshapeData();
+    pShapeData = pShape->shapeData();
 
-    switch( pShapeData->tqshapeType() )
+    switch( pShapeData->shapeType() )
     {
       case KivioShapeData::kstArc:
         drawArc( pShape, pData );
@@ -873,7 +873,7 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -915,14 +915,14 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData
 void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4;
   TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
@@ -954,7 +954,7 @@ void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pDa
 void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
@@ -988,7 +988,7 @@ void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *p
 void KivioSMLStencil::drawClosedPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
   KivioPainter *painter;
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPoint, *pNewPoint;
 
   double defWidth = m_pSpawner->defWidth();
@@ -1046,7 +1046,7 @@ void KivioSMLStencil::drawEllipse( KivioShape *pShape, KivioIntraStencilData *pD
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1089,7 +1089,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData *
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1130,7 +1130,7 @@ void KivioSMLStencil::drawRectangle( KivioShape *pShape, KivioIntraStencilData *
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1174,7 +1174,7 @@ void KivioSMLStencil::drawRoundRectangle( KivioShape *pShape, KivioIntraStencilD
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1221,7 +1221,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1280,7 +1280,7 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -1317,7 +1317,7 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD
 {
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
-  KivioShapeData *pShapeData = pShape->tqshapeData();
+  KivioShapeData *pShapeData = pShape->shapeData();
   KivioPoint *pPosition = pShapeData->position();
   KivioPoint *pDimensions = pShapeData->dimensions();
   KivioPainter *painter = pData->painter;
@@ -1358,7 +1358,7 @@ void KivioSMLStencil::setFGColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->lineStyle()->setColor( c );
+        pShape->shapeData()->lineStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1375,7 +1375,7 @@ void KivioSMLStencil::setBGColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->fillStyle()->setColor( c );
+        pShape->shapeData()->fillStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) );
+        pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) );
 
         pShape = m_pShapeList->next();
     }
@@ -1405,7 +1405,7 @@ void KivioSMLStencil::setTextColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->setTextColor( c );
+        pShape->shapeData()->setTextColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const TQFont &f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->setTextFont( f );
+        pShape->shapeData()->setTextFont( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1439,7 +1439,7 @@ void KivioSMLStencil::setLineWidth( double f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->tqshapeData()->lineStyle()->setWidth( f );
+        pShape->shapeData()->lineStyle()->setWidth( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1451,7 +1451,7 @@ void KivioSMLStencil::setLinePattern(int p)
 
     while( pShape )
     {
-        pShape->tqshapeData()->lineStyle()->setStyle( p );
+        pShape->shapeData()->lineStyle()->setStyle( p );
         pShape = m_pShapeList->next();
     }
 }
@@ -1550,7 +1550,7 @@ KivioConnectorTarget *KivioSMLStencil::connectToTarget( KivioConnectorPoint *p,
 
 
 /**
- * Updates the tqgeometry of this stencil.
+ * Updates the geometry of this stencil.
  *
  * This function rearranges the KivioConnectorTargets to reflect
  * that of the width/height/position.
@@ -1590,9 +1590,9 @@ TQFont KivioSMLStencil::textFont()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->tqshapeData()->textFont();
+            return pShape->shapeData()->textFont();
         }
 
         pShape = m_pShapeList->next();
@@ -1609,9 +1609,9 @@ TQColor KivioSMLStencil::textColor()
   pShape = m_pShapeList->first();
   while( pShape )
   {
-    if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+    if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
     {
-      return pShape->tqshapeData()->textColor();
+      return pShape->shapeData()->textColor();
     }
 
     pShape = m_pShapeList->next();
@@ -1631,8 +1631,8 @@ void KivioSMLStencil::setHTextAlign(int i)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
-            pShape->tqshapeData()->setHTextAlign( i );
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+            pShape->shapeData()->setHTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1640,7 +1640,7 @@ void KivioSMLStencil::setHTextAlign(int i)
 
 
 /**
- * Set the vertical tqalignment of this stencil
+ * Set the vertical alignment of this stencil
  */
 void KivioSMLStencil::setVTextAlign(int i)
 {
@@ -1650,8 +1650,8 @@ void KivioSMLStencil::setVTextAlign(int i)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
-            pShape->tqshapeData()->setVTextAlign( i );
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+            pShape->shapeData()->setVTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1659,7 +1659,7 @@ void KivioSMLStencil::setVTextAlign(int i)
 
 
 /**
- * Get the horizontal tqalignment of this stencil.
+ * Get the horizontal alignment of this stencil.
  */
 int KivioSMLStencil::hTextAlign()
 {
@@ -1668,9 +1668,9 @@ int KivioSMLStencil::hTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->tqshapeData()->hTextAlign();
+            return pShape->shapeData()->hTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1681,7 +1681,7 @@ int KivioSMLStencil::hTextAlign()
 
 
 /**
- * Get the vertical text tqalignment of this stencil.
+ * Get the vertical text alignment of this stencil.
  */
 int KivioSMLStencil::vTextAlign()
 {
@@ -1690,9 +1690,9 @@ int KivioSMLStencil::vTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->tqshapeData()->vTextAlign();
+            return pShape->shapeData()->vTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1712,9 +1712,9 @@ TQString KivioSMLStencil::text()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->tqshapeData()->text();
+            return pShape->shapeData()->text();
         }
 
         pShape = m_pShapeList->next();
@@ -1734,9 +1734,9 @@ void KivioSMLStencil::setText( const TQString &t )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
         {
-            pShape->tqshapeData()->setText(t);
+            pShape->shapeData()->setText(t);
         }
 
         pShape = m_pShapeList->next();
@@ -1753,7 +1753,7 @@ double KivioSMLStencil::lineWidth()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->tqshapeData()->lineStyle()->width();
+        return pShape->shapeData()->lineStyle()->width();
 
     return 1.0f;
 }
@@ -1763,7 +1763,7 @@ int KivioSMLStencil::linePattern()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return pShape->tqshapeData()->lineStyle()->style();
+        return pShape->shapeData()->lineStyle()->style();
 
     return 1;
 }
@@ -1777,7 +1777,7 @@ TQColor KivioSMLStencil::fgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->tqshapeData()->lineStyle()->color();
+        return pShape->shapeData()->lineStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -1792,7 +1792,7 @@ TQColor KivioSMLStencil::bgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->tqshapeData()->fillStyle()->color();
+        return pShape->shapeData()->fillStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -1803,7 +1803,7 @@ int KivioSMLStencil::fillPattern()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->tqshapeData()->fillStyle()->brushStyle();
+        return pShape->shapeData()->fillStyle()->brushStyle();
 
     return 1;
 }
@@ -1923,7 +1923,7 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck
   TQPtrList<KivioPoint> *pList;
   KoPoint *pPoints;
 
-  pShapeData = pShape->tqshapeData();
+  pShapeData = pShape->shapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -2001,7 +2001,7 @@ KivioLineStyle KivioSMLStencil::lineStyle()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return *(pShape->tqshapeData()->lineStyle());
+        return *(pShape->shapeData()->lineStyle());
 
     return KivioLineStyle();
 }
@@ -2012,7 +2012,7 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls)
 
     while( pShape )
     {
-        pShape->tqshapeData()->setLineStyle(ls);;
+        pShape->shapeData()->setLineStyle(ls);;
         pShape = m_pShapeList->next();
     }
 }
@@ -2032,12 +2032,12 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   
   while(pShape)
   {
-    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox)
+    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox)
     {
-      double x = pShape->tqshapeData()->x();
-      double y = pShape->tqshapeData()->y();
-      double x2 = pShape->tqshapeData()->w() + x;
-      double y2 = pShape->tqshapeData()->h() + y;
+      double x = pShape->shapeData()->x();
+      double y = pShape->shapeData()->y();
+      double x2 = pShape->shapeData()->w() + x;
+      double y2 = pShape->shapeData()->h() + y;
       
       // Create the rotated rectangle
       KoPoint pPoints[4];
@@ -2051,7 +2051,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
       pPoints[3].setY(x * m.m12() + y2 * m.m22() + m.dy());
     
       if(PointInPoly(pPoints, 4, &pos)) {
-        return pShape->tqshapeData()->name();
+        return pShape->shapeData()->name();
       }
       
       if(!first) {
@@ -2063,7 +2063,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   }
   
   if(first) {
-    return first->tqshapeData()->name();
+    return first->shapeData()->name();
   }
   
   return TQString();
@@ -2075,9 +2075,9 @@ void KivioSMLStencil::setText(const TQString& text, const TQString& name)
   
   while(pShape)
   {
-    if(pShape->tqshapeData()->name() == name)
+    if(pShape->shapeData()->name() == name)
     {
-      pShape->tqshapeData()->setText(text);
+      pShape->shapeData()->setText(text);
       return;
     }
 
@@ -2091,9 +2091,9 @@ TQString KivioSMLStencil::text(const TQString& name)
   
   while(pShape)
   {
-    if(pShape->tqshapeData()->name() == name)
+    if(pShape->shapeData()->name() == name)
     {
-      return pShape->tqshapeData()->text();
+      return pShape->shapeData()->text();
     }
 
     pShape = m_pShapeList->next();
@@ -2128,7 +2128,7 @@ bool KivioSMLStencil::hasTextBox() const
 {
   KivioShape* pShape = m_pShapeList->first();
   while(pShape) {
-    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) {
+    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) {
       return true;
     }
 
@@ -2140,89 +2140,89 @@ bool KivioSMLStencil::hasTextBox() const
 
 TQColor KivioSMLStencil::textColor(const TQString& textBoxName)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape)
+  if(!shape)
     return textColor();
 
-  return tqshape->tqshapeData()->textColor();
+  return shape->shapeData()->textColor();
 }
 
 void KivioSMLStencil::setTextColor(const TQString& textBoxName, const TQColor& color)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  // If we didn't find the tqshape set the color stencil wide
-  if(!tqshape) {
+  // If we didn't find the shape set the color stencil wide
+  if(!shape) {
     setTextColor(color);
     return;
   }
 
-  tqshape->tqshapeData()->setTextColor(color);
+  shape->shapeData()->setTextColor(color);
 }
 
 TQFont KivioSMLStencil::textFont(const TQString& textBoxName)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape)
+  if(!shape)
     return textFont();
 
-  return tqshape->tqshapeData()->textFont();
+  return shape->shapeData()->textFont();
 }
 
 void KivioSMLStencil::setTextFont(const TQString& textBoxName, const TQFont& font)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape) {
+  if(!shape) {
     setTextFont(font);
     return;
   }
 
-  tqshape->tqshapeData()->setTextFont(font);
+  shape->shapeData()->setTextFont(font);
 }
 
 int KivioSMLStencil::hTextAlign(const TQString& textBoxName)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape)
+  if(!shape)
     return hTextAlign();
 
-  return tqshape->tqshapeData()->hTextAlign();
+  return shape->shapeData()->hTextAlign();
 }
 
 int KivioSMLStencil::vTextAlign(const TQString& textBoxName)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape)
+  if(!shape)
     return vTextAlign();
 
-  return tqshape->tqshapeData()->vTextAlign();
+  return shape->shapeData()->vTextAlign();
 }
 
 void KivioSMLStencil::setHTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape) {
+  if(!shape) {
     setHTextAlign(align);
     return;
   }
 
-  tqshape->tqshapeData()->setHTextAlign(align);
+  shape->shapeData()->setHTextAlign(align);
 }
 
 void KivioSMLStencil::setVTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* tqshape = locateShape(textBoxName);
+  KivioShape* shape = locateShape(textBoxName);
 
-  if(!tqshape) {
+  if(!shape) {
     setVTextAlign(align);
     return;
   }
 
-  tqshape->tqshapeData()->setVTextAlign(align);
+  shape->shapeData()->setVTextAlign(align);
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
index 30e53e93..c9ebcc6c 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
@@ -101,7 +101,7 @@ public:
     virtual bool loadXML( const TQDomElement & );
     virtual TQDomElement saveXML( TQDomDocument & );
 
-    virtual TQPtrList<KivioShape> *tqshapeList() { return m_pShapeList; }
+    virtual TQPtrList<KivioShape> *shapeList() { return m_pShapeList; }
     virtual KivioShape *subSelection() { return m_pSubSelection; }
 
     virtual void paintOutline( KivioIntraStencilData * );
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
index 588a468e..d18caae8 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp
@@ -164,15 +164,15 @@ bool KivioSMLStencilSpawner::loadXML( const TQString &file, TQDomDocument &d )
 
 
 /**
- * Loads a tqshape from an XML node.
+ * Loads a shape from an XML node.
  */
-void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode )
+void KivioSMLStencilSpawner::loadShape( TQDomNode &shapeNode )
 {
     KivioShapeData::KivioShapeType t;
     KivioShape *pShape = NULL;
-    TQDomElement tqshapeElement = tqshapeNode.toElement();
+    TQDomElement shapeElement = shapeNode.toElement();
 
-    t = KivioShapeData::tqshapeTypeFromString( XmlReadString( tqshapeElement, "type", "None" ) );
+    t = KivioShapeData::shapeTypeFromString( XmlReadString( shapeElement, "type", "None" ) );
 
     switch( t )
     {
@@ -180,51 +180,51 @@ void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode )
             break;
 
         case KivioShapeData::kstArc:
-            pShape = KivioShape::loadShapeArc( tqshapeElement );
+            pShape = KivioShape::loadShapeArc( shapeElement );
             break;
 
         case KivioShapeData::kstPie:
-            pShape = KivioShape::loadShapePie( tqshapeElement );
+            pShape = KivioShape::loadShapePie( shapeElement );
             break;
 
         case KivioShapeData::kstLineArray:
-            pShape = KivioShape::loadShapeLineArray( tqshapeElement );
+            pShape = KivioShape::loadShapeLineArray( shapeElement );
             break;
 
         case KivioShapeData::kstPolyline:
-            pShape = KivioShape::loadShapePolyline( tqshapeElement );
+            pShape = KivioShape::loadShapePolyline( shapeElement );
             break;
 
         case KivioShapeData::kstPolygon:
-            pShape = KivioShape::loadShapePolygon( tqshapeElement );
+            pShape = KivioShape::loadShapePolygon( shapeElement );
             break;
 
         case KivioShapeData::kstBezier:
-            pShape = KivioShape::loadShapeBezier( tqshapeElement );
+            pShape = KivioShape::loadShapeBezier( shapeElement );
             break;
 
         case KivioShapeData::kstRectangle:
-            pShape = KivioShape::loadShapeRectangle( tqshapeElement );
+            pShape = KivioShape::loadShapeRectangle( shapeElement );
             break;
 
         case KivioShapeData::kstRoundRectangle:
-            pShape = KivioShape::loadShapeRoundRectangle( tqshapeElement );
+            pShape = KivioShape::loadShapeRoundRectangle( shapeElement );
             break;
 
         case KivioShapeData::kstEllipse:
-            pShape = KivioShape::loadShapeEllipse( tqshapeElement );
+            pShape = KivioShape::loadShapeEllipse( shapeElement );
             break;
 
         case KivioShapeData::kstOpenPath:
-            pShape = KivioShape::loadShapeOpenPath( tqshapeElement );
+            pShape = KivioShape::loadShapeOpenPath( shapeElement );
             break;
 
         case KivioShapeData::kstClosedPath:
-            pShape = KivioShape::loadShapeClosedPath( tqshapeElement );
+            pShape = KivioShape::loadShapeClosedPath( shapeElement );
             break;
 
         case KivioShapeData::kstTextBox:
-            pShape = KivioShape::loadShapeTextBox( tqshapeElement );
+            pShape = KivioShape::loadShapeTextBox( shapeElement );
             break;
 
         default:
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index c2e54a58..0fdd2ac1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
@@ -104,7 +104,7 @@ bool KivioStencilSpawnerSet::loadDir( const TQString &dirName )
   m_name = readTitle( dirName );
   m_id = readId( dirName );
 
-  d.setNameFilter("*.so *.sml *.ksp *.spy *.tqshape");
+  d.setNameFilter("*.so *.sml *.ksp *.spy *.shape");
   m_files = d.entryList();
 
   return true;
@@ -134,7 +134,7 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName
     {
         pSpawner = new KivioPyStencilSpawner(this);
     }
-    else if( fileName.contains( ".tqshape", false ) )
+    else if( fileName.contains( ".shape", false ) )
     {
 	pSpawner = new KivioDiaStencilSpawner(this);
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h
index 2a8ecd62..73c13e0e 100644
--- a/kivio/kiviopart/kiviosdk/kivio_text_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h
@@ -14,11 +14,11 @@ class TQPainter;
 class KivioTextStyle
 {
 protected:
-    TQString m_text;                                 // The text inside this tqshape
+    TQString m_text;                                 // The text inside this shape
     TQColor m_color;                                 // The text color
     TQFont m_font;                                   // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text alignment flags
 
 public:
     KivioTextStyle();
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index e0d2b363..ffa65cd6 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -74,7 +74,7 @@ namespace Kivio {
     TQString tmpFile;
 
     if(!KIO::NetAccess::download(url, tmpFile, this)) {
-      KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").tqarg(url.prettyURL()));
+      KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL()));
       return;
     }
 
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index 4b5b4215..39fb22ef 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -231,7 +231,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev )
 
   if ( closeRect.contains(ev->pos())) {
     m_bClose = true;
-    tqrepaint();
+    repaint();
     return;
   }
 
@@ -243,7 +243,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev )
 {
   if ( m_bClose ) {
     m_bClose = false;
-    tqrepaint();
+    repaint();
     TQRect closeRect;
 
     if(m_orientation == Qt::Vertical) {
@@ -285,14 +285,14 @@ void DragBarButton::enterEvent( TQEvent* ev )
 {
   TQPushButton::enterEvent(ev);
   m_bMouseOn = true;
-  tqrepaint(false);
+  repaint(false);
 }
 
 void DragBarButton::leaveEvent( TQEvent* ev )
 {
   TQPushButton::leaveEvent(ev);
   m_bMouseOn = false;
-  tqrepaint();
+  repaint();
 }
 
 void DragBarButton::setOrientation(Qt::Orientation orientation)
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index 74ae5d2a..aa5c30c4 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -179,7 +179,7 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* )
   KivioStackBar* bar = (KivioStackBar*)sender();
   bar->removePage(dragWidget);
 
-  insertStencilSet(dragWidget,caption,dragPos,moveManager->tqgeometry(),m_destinationBar);
+  insertStencilSet(dragWidget,caption,dragPos,moveManager->geometry(),m_destinationBar);
 
   // remove KivioStackBar if no more pages
   if (!bar->visiblePage()) {
@@ -205,13 +205,13 @@ void StencilBarDockManager::slotMoving()
 
   // check existing bars
   for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) {
-    if ( bar->tqgeometry().contains(p) ) {
+    if ( bar->geometry().contains(p) ) {
       if(bar->place() == TQDockWindow::OutsideDock) {
         dragPos = OnTopLevelBar;
-        globalPos = bar->tqgeometry().topLeft();
+        globalPos = bar->geometry().topLeft();
       } else {
         dragPos = AutoSelect;
-        globalPos = bar->mapToGlobal(bar->tqgeometry().topLeft());
+        globalPos = bar->mapToGlobal(bar->geometry().topLeft());
       }
       
       m_destinationBar = bar;
@@ -631,7 +631,7 @@ bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change)
   return f1&&f2;
 }
 
-TQRect KoToolDockMoveManager::tqgeometry()
+TQRect KoToolDockMoveManager::geometry()
 {
   int x0 = xp;
   int y0 = yp;
diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h
index 8406e5f0..73d48301 100644
--- a/kivio/kiviopart/stencilbardockmanager.h
+++ b/kivio/kiviopart/stencilbardockmanager.h
@@ -114,7 +114,7 @@ class KoToolDockMoveManager: public TQObject
     void setGeometry( const TQRect& r );
     void setGeometry(int x, int y, int w, int h);
 
-    TQRect tqgeometry();
+    TQRect geometry();
 
     void resize( const TQSize& s ) { setGeometry(xp, yp, s.width(), s.height()); }
     void resize(int rw, int rh) { setGeometry(xp, yp, rw, rh); }
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
index 7d7cb3cb..8ff02c32 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 -->
   <icon>arrow-chevron.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
index b0e44553..6e1388fe 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Down Arrow</name>
   <icon>arrow-down.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
index d536a6b6..a4f20839 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Left Arrow</name>
   <icon>arrow-left-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
index d2579d6d..54babdd8 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right-Up Arrow</name>
   <icon>arrow-left-right-up.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
index b2e85882..03b7787c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left-Right Arrow</name>
   <icon>arrow-left-right.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
index e70c0d2a..e3c0c008 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Left-Up Arrow</name>
   <icon>arrow-left-up.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
index e2e513af..8eb15cd4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Left Arrow</name>
   <icon>arrow-left.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
index b99c3461..ef0f7f47 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 -->
   <icon>arrow-pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
index 1886293b..6351e8dd 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Quad Arrow</name>
   <icon>arrow-quad.png</icon>
@@ -57,4 +57,4 @@
     <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
index 8738ffea..17d670fc 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Notched Right Arrow</name>
   <icon>arrow-right-notched.png</icon>
@@ -40,4 +40,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
index be5bf79c..8e9fea1d 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Arrow</name>
   <icon>arrow-right.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
index 0549dbe8..8d418022 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down-Left Arrow</name>
   <icon>arrow-up-down-left.png</icon>
@@ -76,4 +76,4 @@
     <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
index f0f8623e..e94d2d17 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up-Down Arrow</name>
   <icon>arrow-up-down.png</icon>
@@ -48,4 +48,4 @@
     <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
index 83222aa8..791f8a78 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Up Arrow</name>
   <icon>arrow-up.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
index ae10097e..26647def 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Circle</name>
   <icon>circle.png</icon>
@@ -18,4 +18,4 @@
     <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
     <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
index 2b6a598c..2bc02249 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance -->
   <icon>cross-maltese.png</icon>
@@ -41,4 +41,4 @@
     <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
index 88d86baa..2aeef611 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Swiss Cross</name>
   <!-- Swiss flag has a white cross on red -->
@@ -59,4 +59,4 @@
     <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
index a031d369..88948942 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Diamond</name>
   <icon>diamond.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
index ecfac8e2..ea2c2400 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Heptagon</name>
   <icon>heptagon.png</icon>
@@ -36,4 +36,4 @@
     <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
index 71bedc8d..a21aa220 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Hexagon</name>
   <icon>hexagon.png</icon>
@@ -32,4 +32,4 @@
     <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
index 794cd4b8..c0dceb97 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Octagon</name>
   <icon>octagon.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
index b85fa737..1c37662b 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric -Qt::Horizontal Parallelogram</name>
   <icon>parallelogram-horizontal.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
index d5794080..0f344091 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric -Qt::Vertical Parallelogram</name>
   <icon>parallelogram-vertical.png</icon>
@@ -24,4 +24,4 @@
     <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
index a3941127..89db85e7 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Pentagon</name>
   <icon>pentagon.png</icon>
@@ -28,4 +28,4 @@
     <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
index e7be1a89..67d58bf4 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Perfect Square</name>
   <icon>square.png</icon>
@@ -26,4 +26,4 @@
     <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
index 5d66851c..d57432a9 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Four Point Star</name>
   <icon>star4.png</icon>
@@ -25,4 +25,4 @@
     <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
index 379b74c6..20d55b99 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Five Point Star</name>
   <!-- Eventually decided that it was better to get these done than worry about them being perfect -->
@@ -50,5 +50,5 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
   </svg:svg>
   <!-- Alan Horkan was here 2002 -->
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
index 2c2f5cac..bbaf2853 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Six Point Star</name><!-- aka Star of David -->
   <icon>star6.png</icon>
@@ -56,4 +56,4 @@
     <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
index adef753f..cb008f12 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Seven Point Star</name>
   <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical.  -->
@@ -65,4 +65,4 @@
     <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
index 80664b5f..b67bdb42 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Eight Point Star</name>
   <!-- The points all have Nintey Degree Angles -->
@@ -74,4 +74,4 @@
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
   </svg:svg>
   <!-- Alan Horkan, 2002, horkana@tcd.ie -->
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
index 1e97b53b..c68e257c 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Sharp Eight Point Star</name>
   <!-- Angles in this Star are much sharper, about Thirty degrees -->
@@ -73,5 +73,5 @@
     <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
index b638e315..48ae7b4e 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Assorted - Sun</name>
   <icon>sun.png</icon>
@@ -94,7 +94,7 @@
     <point x="1.25" y="5.5"/>
   </connections>
   <aspectratio type="fixed"/>
-  <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files 
+  <!-- I orignally used a nice warm gold colour #ffcc00, but shape files 
 have to use default if you want to allow the user to change the fill colour -->
   <svg:svg>
     <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
@@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour -->
     <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
index 474317f5..fb971a58 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Trapezoid</name>
   <icon>trapezoid.png</icon>
@@ -18,4 +18,4 @@
     <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
index 74245a0c..2708c5c0 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length -->
   <icon>triangle-isoceles.png</icon>
@@ -20,4 +20,4 @@
     <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
index 5d38874a..3d7097ac 100644
--- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
+++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
 <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
   <name>Geometric - Right Angle Triangle</name>
   <icon>triangle-rightangle.png</icon>
@@ -18,5 +18,5 @@
     <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/>
     <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
index d57fe166..d0636820 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - NPN Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="5,4 6,4 5.6154,3.0769" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
index 756cf865..f6e83ce1 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - Op Amp</name>
   <description>An operational amplifier</description>
@@ -22,5 +22,5 @@
     <svg:line x1="1.2" y1="1" x2="2" y2="1" />
     <svg:line x1="4.5" y1="0" x2="5.5" y2="0" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
index c89b7832..3e0e59ef 100644
--- a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
+++ b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Circuit - PNP Transistor</name>
   <!--
@@ -24,5 +24,5 @@
 
     <svg:polyline points="4,2 3,2 3.3846,2.9231" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
index 66f3b1ba..9032094b 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Right Arrow</name>
 
@@ -78,5 +78,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,0.5 1.5,0.5 2,0.5 2,0 3,1 2,2 2,1.5 0,1.5 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
index 2053db21..b1a15619 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Up Arrow</name>
 
@@ -76,5 +76,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0.5,3 0.5,1 0,1 1,0 1,0 2,1 1.5,1 1.5,3 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
index 5abe7185..9168966d 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Backflow Preventer</name>
 
@@ -55,5 +55,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0.2"
     y1="0.8" x2="0.8" y2="0.2" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
index 0d7c4231..ea4d47a9 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Basin</name>
 
@@ -74,5 +74,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: #000000"
     points="0,0 0.2,0 0.2,2.8 4.8,2.8 4.8,0 5,0 5,3 0,3 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
index 5add8f35..84a2002f 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Final-Settling Basin</name>
 
@@ -106,5 +106,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     style="stroke-width: 1; stroke: foreground; fill: background"
     points="0,0 0.3,0 0.3,1.9 1.4,3.7 1.6,3.7 2.7,1.9 2.7,0 3,0 3,2 1.8,4 1.2,4 0,2 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
index bdfcb107..ac143720 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Frequency Converter</name>
 
@@ -57,5 +57,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="0" y1="2"
     x2="3" y2="0" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
index bbe4d3dc..83d94349 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil -Qt::Horizontal Valve</name>
 
@@ -62,5 +62,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polygon style="stroke-width: 1; stroke: foreground"
     points="0,1 0,0 0.5,0.5 1,0 1,1 0.5,0.5 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
index beec8aa1..270628be 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Motor</name>
 
@@ -53,5 +53,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:polyline style="stroke-width: 1; stroke: #000000"
     points="0.3,0.7 0.3,0.3 0.5,0.5 0.7,0.3 0.7,0.7 " />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
index c78f62f0..36c4f89b 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Preliminary Clarification Tank</name>
 
@@ -257,5 +257,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.5; stroke: #000000" x1="3.4"
     y1="0.4" x2="5.8" y2="0.4" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
index a721ed0e..4f0f98df 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Rotor</name>
 
@@ -104,5 +104,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 1; stroke: #000000" x1="2.20711"
     y1="0.792893" x2="2.56066" y2="0.43934" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
index 03f859e5..a658df14 100644
--- a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
+++ b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
 xmlns:svg="http://www.w3.org/2000/svg">
   <name>Civil - Soil</name>
 
@@ -71,5 +71,5 @@ xmlns:svg="http://www.w3.org/2000/svg">
     <svg:line style="stroke-width: 0.8; stroke: foreground"
     x1="2.36192" y1="0" x2="1.75837" y2="1" />
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
index 43b9495f..57cdbdb7 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - if</name> <!-- XXX - OBSOLETE -->
   <description>if</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="-2,0 -.75,0" />
     <svg:polyline points="-1,1 1,0 2,0 "/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
index 667e75f6..d8ae4d62 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - ifnot</name> <!-- XXX - OBSOLETE -->
   <description>if not</description>
@@ -20,6 +20,6 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
index 1e3d1042..15cc5257 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - lamp</name> <!-- XXX OBSOLETE -->
   <description>lamp</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="-.707,-.707 .707,.707"/>
     <svg:polyline points="-.707,.707 .707,-.707"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
index 4016df10..f933cf5b 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Contact - relay</name> <!-- XXX OBSOLETE -->
   <description>relay</description>
@@ -21,6 +21,6 @@
     <svg:rect x="-1" y="-1" width="2" height="2"/>
     <svg:polyline points="-1,.5 1,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
index 1a7fd4e7..a58db432 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - ifnot</name>
   <description>if not</description>
@@ -23,4 +23,4 @@
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" 
 	      svg:style="stroke-width:.05"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
index 124c3069..f595cb6a 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - out</name>
   <description>out</description>
@@ -22,6 +22,6 @@
     <svg:path d="M .5,.75 C .75,.5 .75,.25 .75,0
 	      C .75,-.25 .75,-.5 .5,-.75" />
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
index 49060cdf..427fd724 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outj</name>
   <description>out jump</description>
@@ -25,6 +25,6 @@
 	         C .25,.5 .5,.5 .5,.25
 	         L .5,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
index 5a360fc5..15c078bd 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outnot</name>
   <description>outnot</description>
@@ -23,6 +23,6 @@
 	      C .75,-.25 .75,-.5 .5,-.75" />
     <svg:polyline points="-.5,.5 .5,-.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
index 94761257..830eaae1 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outr</name>
   <description>out reset</description>
@@ -28,6 +28,6 @@
     <svg:polyline points="-.5,0 0,0" />
     <svg:path d="M -.25,0 C 0,.25 0,.25 .5,.5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
index 2ef92bd0..03cf0f4f 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - outs</name>
   <description>out set</description>
@@ -28,6 +28,6 @@
                  C .5,.5 .25,.5 0,.5
                  C -.25,.5 -.5,.5 -.5,.25"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
index db9a6228..6635c317 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - sout</name>
   <description>ps out</description>
@@ -28,7 +28,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
index 5a2f6f18..45fc49a4 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutnot</name>
   <description>ps outnot</description>
@@ -29,6 +29,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
index 8d54e7be..f2c48f8f 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - soutr</name>
   <description>ps out reset</description>
@@ -34,7 +34,7 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
index 0cd35bbb..32520cae 100644
--- a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
+++ b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>LADDER - souts</name>
   <description>ps out set</description>
@@ -34,6 +34,6 @@
     <svg:path d="M 1.25,-1.125
 	      C 1.375,-1 1.625,-1 1.75,-1.125"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape
index 7ea6d2b8..b76f2aa9 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/command.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/command.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - command</name>
   <description>command</description>
@@ -18,7 +18,7 @@
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
index 31057db1..43208f14 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_f</name>
   <description>contact_f</description>
@@ -18,6 +18,6 @@
     <svg:polyline points="0,.5 .3,.5 .3,.3"/>
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
index ee1b2787..d2bea36d 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - contact_o</name>
   <description>contact_o</description>
@@ -17,6 +17,6 @@
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
index 081ae768..87aa6861 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_f</name>
   <description>intpos_f</description>
@@ -20,6 +20,6 @@
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>
     <svg:polyline points=".6,.45 .35,.45 .4,.35"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
index 086de61b..ceb72cb5 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - intpos_o</name>
   <description>intpos_o</description>
@@ -19,6 +19,6 @@
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
     <svg:polyline points=".6,.55 .45,.75 .4,.65"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
index 0a9461fb..0d506ff9 100644
--- a/kivio/kiviopart/stencils/Dia/Electric/relay.shape
+++ b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Electric - relay</name>
   <description>relay</description>
@@ -19,7 +19,7 @@
     <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
     <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
index 4f8d788c..ea8ee9bf 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Demultiplexer</name>
   <description>Demultiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="10" y1="5" x2="0" y2="10"/>
     <svg:line x1="0" y1="0" x2="0" y2="10"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
index 96f90015..364565ff 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Large Extension Node</name>
   <description>Large Extension Node</description>
@@ -26,5 +26,5 @@
     <svg:line x1="1" y1="1" x2="1" y2="5"/>
     <svg:line x1="7" y1="1" x2="7" y2="5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
index 9483a7df..371eef0d 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Multiplexer</name>
   <description>Multiplexer</description>
@@ -24,4 +24,4 @@
     <svg:line x1="0" y1="5" x2="10" y2="10"/>
     <svg:line x1="10" y1="0" x2="10" y2="10"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
index 3f59d4ca..31a84511 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Node Center</name>
   <description>Node Center</description>
@@ -22,4 +22,4 @@
     <svg:line x1="5" y1="10" x2="9.330126" y2="2.5"/>
     <svg:line x1="0.669874" y1="2.5" x2="9.330126" y2="2.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
index 1513e25b..19a8b68e 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Small Extension Node</name>
   <description>Small Extension Node</description>
@@ -21,5 +21,5 @@
     <svg:line x1="0" y1="0" x2="0" y2="6"/>
     <svg:line x1="8" y1="0" x2="8" y2="6"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
index 411bd80a..2964a28b 100644
--- a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
+++ b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Tactical Satellite Communications Terminal</name>
   <description>Tactical Satellite Communications Terminal</description>
@@ -24,4 +24,4 @@
 
     <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
index c768f038..39d6a058 100644
--- a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - An external DAT drive</name>
   <icon>dat_external.xpm</icon>
@@ -33,4 +33,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13.5" y1="6" x2="1.5" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="1.5" y1="6.5" x2="13.5" y2="6.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
index 7b2b8e22..0b7f7ded 100644
--- a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Digitizing Board</name>
   <icon>digitizing_board.png</icon>
   <connections>
@@ -30,4 +30,4 @@
     <svg:rect style="fill: #4c4c4c" x="10" y="9" width="3" height="0.5"/>
     <svg:rect style="stroke-width: 0.1; stroke: foreground" x="10" y="9" width="3" height="0.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
index 280da134..904760e0 100644
--- a/kivio/kiviopart/stencils/Dia/Network/diskette.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Diskette</name>
   <icon>diskette.xpm</icon>
@@ -35,4 +35,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="6" x2="13" y2="6"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13" y1="8" x2="3" y2="8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
index 53734fbc..ea128a59 100644
--- a/kivio/kiviopart/stencils/Dia/Network/firewall.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Firewall</name>
   <icon>firewall.xpm</icon>
@@ -78,4 +78,4 @@
     <svg:polyline style="stroke:foreground; stroke-width:.5"
     points="0,0 .125,-.125 1.125,-.125,1.125,1.875 1,2 0,2 0,0"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape
index b2faadbb..62c624f1 100644
--- a/kivio/kiviopart/stencils/Dia/Network/hub.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/hub.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Hub</name>
   <icon>hub.xpm</icon>
@@ -37,5 +37,5 @@
     <svg:rect style="stroke:none; fill:foreground"
      x="4" y=".75" width=".25" height=".24"/>
   </svg:svg>
-</tqshape>
+</shape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
index 431c5efd..ba006a8f 100644
--- a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Mobile Phone</name>
   <icon>mobile_phone.xpm</icon>
@@ -59,4 +59,4 @@
     <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
index fcc21c3a..66fc1734 100644
--- a/kivio/kiviopart/stencils/Dia/Network/monitor.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation Monitor</name>
   <icon>monitor.xpm</icon>
@@ -28,4 +28,4 @@
     <svg:rect style="fill: #d9d9cd" x="3" y="17" width="12" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="3" y="17" width="12" height="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
index 2b2025ea..639f4b7a 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Bigtower PC</name>
   <icon>pc_bigtower.xpm</icon>
@@ -63,4 +63,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="23.5" x2="11.5" y2="23.5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="23" x2="2.5" y2="23"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
index 7a3c7455..5847b063 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Desktop PC</name>
   <icon>pc_desktop.xpm</icon>
@@ -49,4 +49,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="5.5" x2="11.5" y2="5"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="1.5" x2="11.5" y2="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
index 409c6e12..daed926e 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Midi-tower PC</name>
   <icon>pc_miditower.xpm</icon>
@@ -54,4 +54,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="17" x2="11.5" y2="17"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="16.5" x2="2.5" y2="16.5"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
index 6b33ec5f..683e4ee1 100644
--- a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Minitower PC</name>
   <icon>pc_minitower.xpm</icon>
@@ -52,4 +52,4 @@
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="8" x2="2.5" y2="8"/>
    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="8" x2="6.5" y2="8"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
index 3c0cc737..ed64d2eb 100644
--- a/kivio/kiviopart/stencils/Dia/Network/plotter.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - Plotter</name>
   <icon>plotter.png</icon>
   <connections>
@@ -41,4 +41,4 @@
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="12.5,10.5 12.5,7.5 13.5,7.5 13.5,10.5 "/>
     <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="14,10.5 14,7.5 15,7.5 15,10.5 "/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
index 19003b8e..109a0651 100644
--- a/kivio/kiviopart/stencils/Dia/Network/workstation.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Workstation</name>
   <icon>workstation.xpm</icon>
@@ -56,4 +56,4 @@
     <svg:rect style="fill: #cdcdcd" x="5" y="2" width="9" height="1"/>
     <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5" y="2" width="9" height="1"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
index e317f3e1..c071d1ca 100644
--- a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
+++ b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A ZIP Disk</name>
   <icon>zip-disk.xpm</icon>
@@ -46,4 +46,4 @@
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="4.375" x2="2" y2="9.875"/>
     <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7.75" y1="4.375" x2="7.75" y2="9.85"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
index fe6bc807..25a05e72 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - DEJack</name>
   <description>dejack</description>
@@ -25,6 +25,6 @@
     <svg:rect x=".4" y=".2" width="2.6" height=".8" 
 	      svg:style="stroke-width: 1.0"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
index 0f484add..f0fd67e2 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist32</name>
   <description>dist32</description>
@@ -34,6 +34,6 @@
     <svg:polygon points="1.8,.8 1.8,1 1.6,.9" 
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
index 04e644eb..b2f38fc7 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist42</name>
   <description>dist42</description>
@@ -35,6 +35,6 @@
     <svg:polygon points="1.8,0 1.8,.2 1.6,.1"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
index 021db07e..c1902669 100644
--- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
+++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <!-- -*- xml -*- -->
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Pneum - dist52</name>
   <description>dist52</description>
@@ -44,6 +44,6 @@
     <svg:polygon points=".750,1 .830,.80 .650,.84"
 		 svg:style="stroke:none; fill:foreground"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape
index c697400d..4e18f2f5 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/block.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/block.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Block</name>
   <description>Block Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default" />
     <svg:polygon points="0.15,0.15 2.35,0.15 2.35,1.85 0.15,1.85" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
index 6cb1fba7..2c2ce44f 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/decision.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Decision</name>
   <description>Decision</description>
@@ -15,4 +15,4 @@
   <svg:svg width="2.5" height="2.5">
     <svg:polygon points="1.25,0 2.5,1.25 1.25,2.5 0,1.25" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape
index 95028b58..0a8512f5 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/process.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/process.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Process</name>
   <description>Process Type Reference</description>
@@ -16,4 +16,4 @@
     <svg:polygon points="0.3,0 2.2,0 2.5,0.3 2.5,1.7 2.2,2 0.3,2 0,1.7 0,0.3" style="fill: default" />
     <svg:polygon points="0.3,0.15 2.2,0.15 2.35,0.3 2.35,1.7 2.2,1.85 0.3,1.85 0.15,1.7 0.15,0.3" style="fill: default" />
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape
index fd4936e7..3223741f 100644
--- a/kivio/kiviopart/stencils/Dia/SDL/service.shape
+++ b/kivio/kiviopart/stencils/Dia/SDL/service.shape
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>SDL - Service</name>
   <description>Service Type Reference</description>
@@ -17,4 +17,4 @@
                  h -0.25  c -0.75,-0.4 -1.125,-0.6 -1.125,-1 c 0,-0.4 0.25,-0.6 1.125,-1 z"
               style="fill: default"/>
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
index 81ff9f03..4d3f913f 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/client.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Client Application</name>
   <icon>client.xpm</icon>
@@ -21,5 +21,5 @@
     <svg:path style="stroke:foreground; stroke-width: 0.5" 
     d="M1.2,.8 L1.2,1.2 L1.6,1 L1.2,.8"/>
   </svg:svg>
-</tqshape>   
+</shape>   
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
index 85340990..49cce15d 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Dataserver</name>
   <icon>dataserver.xpm</icon>
@@ -19,7 +19,7 @@
     M 0.0706,0.66667 L 1.5,0.66667 M 0,1 L 1.5,1 M 0.0706,1.33333 L
   1.5,1.33333 M 0.24,1.66667 L 1.5,1.66667" /> 
   </svg:svg>
-</tqshape>
+</shape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
index 508b64bf..1df9b7fc 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Log Transfer Manager/Rep Agent</name>
   <icon>ltm.xpm</icon>
@@ -28,4 +28,4 @@
     d="M 1.4,1 L 1.8,1"/>
     
   </svg:svg>
-</tqshape>
+</shape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
index bef14946..946603b1 100644
--- a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
+++ b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns"
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
        xmlns:svg="http://www.w3.org/2000/svg">
   <name>Sybase - Replication Server</name>
   <icon>repserver.xpm</icon>
@@ -26,6 +26,6 @@
     points="1,1 .7,.85 .7,1.15"/>
     <svg:circle style="stroke:none; fill:foreground" cx="1" cy="1" r=".5"/>
   </svg:svg>
-</tqshape>
+</shape>
 
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
index 707882e9..704e66b0 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Card"/>
 		<Id data="Card"/>
-		<Description data="Basic flowcharting card tqshape"/>
+		<Description data="Basic flowcharting card shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
index a052fc1c..2fa28f24 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml
@@ -4,7 +4,7 @@
 		<Author data="Dave Marotti"/>
 		<Title data="Data"/>
 		<Id data="Data"/>
-		<Description data="Data tqshape for flowcharting"/>
+		<Description data="Data shape for flowcharting"/>
 		<Version data="1.0"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
index 2e83ee8e..e069d4ac 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Decision"/>
 		<Id data="Decision"/>
-		<Description data="Basic flowcharting decision tqshape"/>
+		<Description data="Basic flowcharting decision shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
index df9d3a5f..21661b74 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Direct Data"/>
 		<Id data="Direct Data"/>
-		<Description data="Basic flowcharting direct data tqshape"/>
+		<Description data="Basic flowcharting direct data shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
index 9634593e..f07580d2 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Display"/>
 		<Id data="Display"/>
-		<Description data="Basic flowcharting display tqshape"/>
+		<Description data="Basic flowcharting display shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
index d4051189..3a7a50ae 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Internal Storage"/>
 		<Id data="Internal Storage"/>
-		<Description data="Internal storage tqshape"/>
+		<Description data="Internal storage shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
index b409c57a..199072a6 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Loop Limit"/>
 		<Id data="Loop Limit"/>
-		<Description data="Basic flowcharting loop limit tqshape"/>
+		<Description data="Basic flowcharting loop limit shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
index 17691486..d6104506 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Input"/>
 		<Id data="Manual Input"/>
-		<Description data="Basic flowcharting manual input tqshape"/>
+		<Description data="Basic flowcharting manual input shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
index 2536f822..bc452400 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Manual Operation"/>
 		<Id data="Manual Operation"/>
-		<Description data="Basic flowcharting manual operation tqshape"/>
+		<Description data="Basic flowcharting manual operation shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
index e1f80367..452e048a 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Predefined Process"/>
 		<Id data="Predefined Process"/>
-		<Description data="Predefined process tqshape"/>
+		<Description data="Predefined process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
index b935d273..f79d2a51 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Preparation"/>
 		<Id data="Preperation"/>
-		<Description data="Basic flowcharting preparation tqshape"/>
+		<Description data="Basic flowcharting preparation shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
index 60a00732..94d129ac 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Basic flowcharting process tqshape"/>
+		<Description data="Basic flowcharting process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
index aa11f970..fc01b542 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy
@@ -4,7 +4,7 @@
         <Author data="Dmitry Poplavsky"/>
         <Title data="Python"/>
         <Id data="Python"/>
-        <Description data="Basic flowcharting card tqshape"/>
+        <Description data="Basic flowcharting card shape"/>
         <Version data="0.1"/>
         <Web data="www.thekompany.com"/>
         <Email data="dima@kde.org"/>
@@ -40,7 +40,7 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                     ]
 
 
-tqshapes = {
+shapes = {
           "rect" :{
                    "type"  : "Rectangle",
                    "fillstyle" : "solid",
@@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                             { "x":(x+x2)/2, "y":y }
                           ]
 
-tqshapes["rect2"]["x"] = x+w-35
-tqshapes["rect2"]["y"] = y+h-35
-tqshapes["rect2"]["w"] = 20
-tqshapes["rect2"]["h"] = 20
+shapes["rect2"]["x"] = x+w-35
+shapes["rect2"]["y"] = y+h-35
+shapes["rect2"]["w"] = 20
+shapes["rect2"]["h"] = 20
 
-if ( tqshapes["text"]["text"] == "1" ):
+if ( shapes["text"]["text"] == "1" ):
     stencil = curLayer().firstStencil()
     stencil.setText( "x:"+str(x)+"  y:"+str(y) )
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
index 98ba2016..6a727990 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Stored Data"/>
 		<Id data="Stored Data"/>
-		<Description data="Basic flowcharting stored data tqshape"/>
+		<Description data="Basic flowcharting stored data shape"/>
 		<Version data="0.1"/>
 		<Web data="www.thekompany.com"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
index a998b6ca..769d1f5d 100644
--- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml
@@ -4,7 +4,7 @@
 		<Author data="Landshark"/>
 		<Title data="Terminator"/>
 		<Id data="Terminator"/>
-		<Description data="Terminator tqshape"/>
+		<Description data="Terminator shape"/>
 		<Version data="0.1"/>
 		<Web data="kivio.sourceforge.net"/>
 		<Email data="lndshark@speakeasy.net"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
index 445fef79..c96361ce 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Data Store"/>
 		<Id data="Data Store"/>
-		<Description data="Data Store tqshape"/>
+		<Description data="Data Store shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
index 622b0205..b1d1a835 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Database"/>
 		<Id data="database"/>
-		<Description data="Database tqshape"/>
+		<Description data="Database shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
index fa1824de..57229b1a 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Process"/>
 		<Id data="Process"/>
-		<Description data="Process tqshape"/>
+		<Description data="Process shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
index e3f53b8f..c68f8a79 100644
--- a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
+++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Source or Sink"/>
 		<Id data="Source or Sink"/>
-		<Description data="Source or Sink tqshape"/>
+		<Description data="Source or Sink shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
index b3ecbefc..34c0b640 100644
--- a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
+++ b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Floppy Disk"/>
 		<Id data="Floppy Disk"/>
-		<Description data="Floppy Disk tqshape"/>
+		<Description data="Floppy Disk shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
index aa34fe08..a03ce9cb 100644
--- a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
+++ b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Key"/>
 		<Id data="Key"/>
-		<Description data="Key tqshape"/>
+		<Description data="Key shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
index a9013398..6470beb0 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Arrow"/>
 		<Id data="Arrow"/>
-		<Description data="Arrow tqshape"/>
+		<Description data="Arrow shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
index 72a5cfd3..909e814c 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 1"/>
 		<Id data="Multiple arrow 1"/>
-		<Description data="Multiple Arrow tqshape 1"/>
+		<Description data="Multiple Arrow shape 1"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
index 296f55fb..16599b33 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 2"/>
 		<Id data="Multiple arrow 2"/>
-		<Description data="Multiple Arrow tqshape 2"/>
+		<Description data="Multiple Arrow shape 2"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
index 13fe1905..b0243201 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Multiple Arrow 3"/>
 		<Id data="Multiple arrow 3"/>
-		<Description data="Multiple Arrow tqshape 3"/>
+		<Description data="Multiple Arrow shape 3"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
index 07bdf483..7cfdc307 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Sun Arrow"/>
 		<Id data="Sun arrow"/>
-		<Description data="Sun Arrow tqshape"/>
+		<Description data="Sun Arrow shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
index 7d8390db..8ff9b029 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Factory"/>
 		<Id data="Factory"/>
-		<Description data="Factory tqshape"/>
+		<Description data="Factory shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
index 9e1193cf..95075972 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="House"/>
 		<Id data="House"/>
-		<Description data="House tqshape"/>
+		<Description data="House shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
index af310f33..88e06fdb 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml
@@ -3,7 +3,7 @@
     <Title data="Attribute"/>
     <Id data="ER-Attribute"/>
     <Version data="1.0"/>
-    <Description data="Attribute tqshape used in ER diagrams"/>
+    <Description data="Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
index 5c2e4f74..8c325c32 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Derived Attribute"/>
     <Id data="ER-DerivedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Derived Attribute tqshape used in ER diagrams"/>
+    <Description data="Derived Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
index 2b22e32a..6eaed85a 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml
@@ -4,7 +4,7 @@
     <Title data="Entity"/>
     <Id data="ER-Entity"/>
     <Version data="1.0"/>
-    <Description data="Entity tqshape used in ER diagrams"/>
+    <Description data="Entity shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
index 56329cf1..baef5b76 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml
@@ -3,7 +3,7 @@
     <Title data="Multivalued Attribute"/>
     <Id data="ER-MultivaluedAttribute"/>
     <Version data="1.0"/>
-    <Description data="Multivalued Attribute tqshape used in ER diagrams"/>
+    <Description data="Multivalued Attribute shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
index dbcad720..bd6c93ea 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship tqshape used in ER diagrams"/>
+    <Description data="Relationship shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
index 02547ca0..b81da1e9 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml
@@ -4,7 +4,7 @@
     <Title data="Weak Entity"/>
     <Id data="ER-WeakEntity"/>
     <Version data="1.0"/>
-    <Description data="Weak Entity tqshape used in ER diagrams"/>
+    <Description data="Weak Entity shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
index 1e30e26d..ac102000 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml
@@ -4,7 +4,7 @@
     <Title data="Relationship"/>
     <Id data="ER-Relationship"/>
     <Version data="1.0"/>
-    <Description data="Relationship tqshape used in ER diagrams"/>
+    <Description data="Relationship shape used in ER diagrams"/>
     <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/>
     <Author data="Peter Simonsson"/>
     <Email data="psn@linux.se"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
index 27c487ea..eb1650e7 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Bad"/>
 		<Id data="Bad"/>
-		<Description data="Bad tqshape"/>
+		<Description data="Bad shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
index 88ff54e8..8cb5b46d 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Good"/>
 		<Id data="Good"/>
-		<Description data="Good tqshape"/>
+		<Description data="Good shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
index 0656c2a7..13c5b46c 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Man"/>
 		<Id data="Man"/>
-		<Description data="Man tqshape"/>
+		<Description data="Man shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
index 9f903a1f..e1c4aabc 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman"/>
 		<Id data="Woman"/>
-		<Description data="Woman tqshape"/>
+		<Description data="Woman shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
index 6bd7f849..36e87464 100755
--- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Woman Shape"/>
 		<Id data="Woman Shape"/>
-		<Description data="Woman tqshape"/>
+		<Description data="Woman shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
index d8e01658..f7f6d666 100644
--- a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
+++ b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml
@@ -4,7 +4,7 @@
 		<Author data="Kristof Borrey"/>
 		<Title data="Truck"/>
 		<Id data="Truck"/>
-		<Description data="Truck tqshape"/>
+		<Description data="Truck shape"/>
 		<Version data="0.1"/>
 		<Web data="www.koffice.org"/>
 		<Email data="borrey@kde.org"/>
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui
index 1ed0c197..1b1b607d 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -243,7 +243,7 @@
                                 <property name="pixmap">
                                     <pixmap>image3</pixmap>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -280,7 +280,7 @@
                                 <property name="pixmap">
                                     <pixmap>image5</pixmap>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignBottom|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index fadba0e3..1302f2be 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -118,7 +118,7 @@ void KivioLayerPanel::addItem()
 
   // Set the layer name to something a bit different. This isn't
   // guaranteed to be unique, but it's better than "Untitled"
-  layer->setName(i18n("Layer %1").tqarg(id));
+  layer->setName(i18n("Layer %1").arg(id));
   page->addLayer(layer);
   page->setCurLayer(layer);
 
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 393b771d..14a3c86d 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid()
 void KivioOptionsDialog::setLayoutText(const KoPageLayout& l)
 {
   KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem());
-  TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").tqarg(
-    KoPageFormat::formatString(l.format)).tqarg(KoUnit::toUserValue(l.ptWidth, unit))
-    .tqarg(KoUnit::toUserValue(l.ptHeight, unit)).tqarg(KoUnit::unitName(unit)).tqarg(
+  TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").arg(
+    KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit))
+    .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg(
     KoUnit::unitName(unit));
   m_layoutTxtLbl->setText(txt);
 }
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index ca3ff402..26b8feb8 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -122,7 +122,7 @@ void ConnectorTool::setActivated(bool a)
     m_pStencil = 0;
     m_pDragData = 0;
     view()->canvasWidget()->setShowConnectorTargets(true);
-    view()->canvasWidget()->tqrepaint();
+    view()->canvasWidget()->repaint();
     emit activated(this);
   } else {
     if(m_pStencil && (m_mode == stmDrawRubber) && (m_type == PolyLineConnector)) {
@@ -150,7 +150,7 @@ void ConnectorTool::setActivated(bool a)
     m_permanent = false;
     view()->setStatusBarInfo("");
     view()->canvasWidget()->setShowConnectorTargets(false);
-    view()->canvasWidget()->tqrepaint();
+    view()->canvasWidget()->repaint();
   }
 }
 
@@ -278,7 +278,7 @@ bool ConnectorTool::startRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
 
-  canvas->tqrepaint();
+  canvas->repaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -322,7 +322,7 @@ void ConnectorTool::continueRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
   m_pStencil->updateGeometry();
-  canvas->tqrepaint();
+  canvas->repaint();
 }
 
 void ConnectorTool::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index b6c24c57..6117cf61 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -247,7 +247,7 @@ bool SelectTool::startRubberBanding(const TQPoint &pos)
     canvas->activePage()->unselectAllStencils();
 
   canvas->startRectDraw( pos, KivioCanvas::Rubber );
-  canvas->tqrepaint();
+  canvas->repaint();
 
   return true;
 }
@@ -299,7 +299,7 @@ bool SelectTool::startDragging(const TQPoint &pos, bool onlySelected)
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
 
-  // Build the list of old tqgeometry
+  // Build the list of old geometry
   KivioSelectDragData *pData;
   m_lstOldGeometry.clear();
   pStencil = canvas->activePage()->selectedStencils()->first();
@@ -365,7 +365,7 @@ bool SelectTool::startCustomDragging(const TQPoint &pos, bool selectedOnly )
   m_customDragOrigPoint = pStencil->customIDPoint(m_customDragID);
 
   view()->canvasWidget()->setShowConnectorTargets(true);
-  view()->canvasWidget()->tqrepaint();
+  view()->canvasWidget()->repaint();
 
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
@@ -491,7 +491,7 @@ void SelectTool::continueRubberBanding(const TQPoint &pos)
  * Continues the dragging process of a stencil (moving)
  *
  * How does this work?  Initially we create a list of all the original
- * tqgeometry of all the selected stencils.  We use that to calculate delta
+ * geometry of all the selected stencils.  We use that to calculate delta
  * movements and snap them to the grid.
  */
 void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides)
@@ -512,7 +512,7 @@ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides)
     canvas->drawSelectedStencilsXOR();
   } else {
     canvas->activePage()->setPaintSelected(false);
-    canvas->tqrepaint();
+    canvas->repaint();
     m_firstTime = false;
   }
 
@@ -628,7 +628,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos)
       canvas->drawStencilXOR(m_pCustomDraggingStencil);
     } else {
       m_pCustomDraggingStencil->setHidden(true);
-      canvas->tqrepaint();
+      canvas->repaint();
       m_firstTime = false;
     }
   }
@@ -641,7 +641,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos)
   if(m_pCustomDraggingStencil->type() != kstConnector){
     canvas->drawStencilXOR(m_pCustomDraggingStencil);
   } else {
-    view()->canvasWidget()->tqrepaint();
+    view()->canvasWidget()->repaint();
   }
 
   view()->updateToolBars();
@@ -674,7 +674,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides)
   
   if( !pData )
   {
-      kdDebug(43000) << "SelectTool::continueResizing() - Original tqgeometry not found" << endl;
+      kdDebug(43000) << "SelectTool::continueResizing() - Original geometry not found" << endl;
       return;
   }
 
@@ -687,7 +687,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides)
       canvas->drawStencilXOR( m_pResizingStencil );
     } else {
       m_pResizingStencil->setHidden(true);
-      canvas->tqrepaint();
+      canvas->repaint();
       m_firstTime = false;
     }
   
@@ -1050,7 +1050,7 @@ void SelectTool::endDragging(const TQPoint&)
 
   canvas->drawSelectedStencilsXOR();
   canvas->endUnclippedSpawnerPainter();
-  // Clear the list of old tqgeometry
+  // Clear the list of old geometry
   m_lstOldGeometry.clear();
 }
 
@@ -1077,7 +1077,7 @@ void SelectTool::endCustomDragging(const TQPoint&)
   canvas->endUnclippedSpawnerPainter();
 
   canvas->setShowConnectorTargets(false);
-  canvas->tqrepaint();
+  canvas->repaint();
 }
 
 void SelectTool::endResizing(const TQPoint&)
@@ -1200,7 +1200,7 @@ void SelectTool::keyPress(TQKeyEvent* e)
   // Create a new painter object
   canvas->beginUnclippedSpawnerPainter();
 
-  // Build the list of old tqgeometry
+  // Build the list of old geometry
   KivioSelectDragData *pData;
   m_lstOldGeometry.clear();
   KivioStencil* pStencil = canvas->activePage()->selectedStencils()->first();
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
index 3745820c..8617eb98 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp
@@ -32,7 +32,7 @@
 #include "kivio_stencil_spawner_set.h"
 #include "kivio_text_style.h"
 #include "kivio_shape.h"
-#include "kivio_tqshape_data.h"
+#include "kivio_shape_data.h"
 #include "kivio_point.h"
 
 #include "tkmath.h"
@@ -96,9 +96,9 @@ KivioSMLConnector::KivioSMLConnector( const TQString &name )
 	// This is a stencil of type connector
 	setType( kstConnector );
 
-	// We only have one tqshape, an open path.
-	//m_tqshape = new KivioShape();
-	//m_tqshape->tqshapeData() ->setShapeType( KivioShapeData::kstOpenPath );
+	// We only have one shape, an open path.
+	//m_shape = new KivioShape();
+	//m_shape->shapeData() ->setShapeType( KivioShapeData::kstOpenPath );
 	loadPath( name );
 }
 
@@ -196,7 +196,7 @@ KivioStencil *KivioSMLConnector::duplicate()
 void KivioSMLConnector::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
 	KivioPainter * painter;
-	KivioShapeData *pShapeData = pShape->tqshapeData();
+	KivioShapeData *pShapeData = pShape->shapeData();
 	KivioPoint *pPoint, *pNewPoint;
 	TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
 
@@ -262,7 +262,7 @@ void KivioSMLConnector::paint( KivioIntraStencilData *pData )
 	}
 
 
-	// Build tqshape up from m_pConnectorPoints
+	// Build shape up from m_pConnectorPoints
 
 
 	TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>;
@@ -314,7 +314,7 @@ bool KivioSMLConnector::saveCustom( TQDomElement &e, TQDomDocument &doc )
 	kdDebug(43000) << "Save custom " << endl;
 	e.appendChild( saveArrowHeads( doc ) );
 
-	//TQDomElement type = m_tqshape->saveXML(doc);
+	//TQDomElement type = m_shape->saveXML(doc);
 	KivioConnectorPoint *p = m_PointList.first();
 	while ( p )
 	{
@@ -341,7 +341,7 @@ bool KivioSMLConnector::loadCustom( const TQDomElement &e )
 		}
 		else if ( name == "KivioShape" )
 		{
-			//m_tqshape->loadXML(node.toElement());
+			//m_shape->loadXML(node.toElement());
 			TQDomNode pts = node.firstChild();
 			while ( !pts.isNull() )
 			{
diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
index a50ec750..b631f84b 100644
--- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
+++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h
@@ -43,7 +43,7 @@ class KivioSMLConnector : public Kivio1DStencil
 private:
 	bool loadPath(const TQString &file);
     //void drawOpenPath( KivioShape *, KivioIntraStencilData * );
-    KivioShape *m_tqshape;
+    KivioShape *m_shape;
     TQPtrList<KivioConnectorPoint> m_PointList;
 
     TQString m_name;
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index 4578f0a7..5cef094e 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -190,7 +190,7 @@ bool SMLConnector::startRubberBanding( TQMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
 
-  canvas->tqrepaint();
+  canvas->repaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -223,7 +223,7 @@ void SMLConnector::continueRubberBanding( TQMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
   m_pStencil->updateGeometry();
-  canvas->tqrepaint();
+  canvas->repaint();
 }
 
 void SMLConnector::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 7d449ae0..5b1ee4fc 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -185,7 +185,7 @@ void TextTool::mousePress( TQMouseEvent *e )
 bool TextTool::startRubberBanding( TQMouseEvent *e )
 {
   view()->canvasWidget()->startRectDraw( e->pos(), KivioCanvas::Rubber );
-  view()->canvasWidget()->tqrepaint();
+  view()->canvasWidget()->repaint();
   m_startPoint = e->pos();
 
   return true;
@@ -222,7 +222,7 @@ void TextTool::mouseRelease( TQMouseEvent *e )
 
   m_mode = stmNone;
 
-  view()->canvasWidget()->tqrepaint();
+  view()->canvasWidget()->repaint();
 }
 
 void TextTool::endRubberBanding(TQMouseEvent */*e*/)
@@ -282,12 +282,12 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
     TQString text = editor.text();
     TQFont font = editor.font();
     TQColor textColor = editor.fontColor();
-    int htqalignment = editor.horizontalAlignment();
-    int vtqalignment = editor.verticalAlignment();
+    int halignment = editor.horizontalAlignment();
+    int valignment = editor.verticalAlignment();
     bool changeFont = (stencil->textFont() != font);
     bool changeTextColor = (stencil->textColor() != textColor);
-    bool changeHAlignment = (stencil->hTextAlign() != htqalignment);
-    bool changeVAlignment = (stencil->vTextAlign() != vtqalignment);
+    bool changeHAlignment = (stencil->hTextAlign() != halignment);
+    bool changeVAlignment = (stencil->vTextAlign() != valignment);
 
 
     while( stencil )
@@ -317,18 +317,18 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
         changed = true;
       }
 
-      if(changeHAlignment && (stencil->hTextAlign() != htqalignment)) {
+      if(changeHAlignment && (stencil->hTextAlign() != halignment)) {
         KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
-            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), htqalignment);
-        stencil->setHTextAlign(htqalignment);
+            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment);
+        stencil->setHTextAlign(halignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
 
-      if(changeVAlignment && (stencil->vTextAlign() != vtqalignment)) {
+      if(changeVAlignment && (stencil->vTextAlign() != valignment)) {
         KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
-            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), vtqalignment);
-        stencil->setVTextAlign(vtqalignment);
+            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment);
+        stencil->setVTextAlign(valignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
@@ -400,24 +400,24 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos)
       changed = true;
     }
 
-    int htqalignment = editor.horizontalAlignment();
+    int halignment = editor.horizontalAlignment();
 
-    if(stencil->hTextAlign(name) != htqalignment) {
+    if(stencil->hTextAlign(name) != halignment) {
       KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
           i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil,
-          stencil->hTextAlign(name), htqalignment, name);
-      stencil->setHTextAlign(name, htqalignment);
+          stencil->hTextAlign(name), halignment, name);
+      stencil->setHTextAlign(name, halignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }
 
-    int vtqalignment = editor.verticalAlignment();
+    int valignment = editor.verticalAlignment();
 
-    if(stencil->vTextAlign(name) != vtqalignment) {
+    if(stencil->vTextAlign(name) != valignment) {
       KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
           i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil,
-      stencil->vTextAlign(name), vtqalignment, name);
-      stencil->setVTextAlign(name, vtqalignment);
+      stencil->vTextAlign(name), valignment, name);
+      stencil->setVTextAlign(name, valignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index cbc314ab..27bec9d6 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -158,7 +158,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* )
   
   /*if (!KIO::NetAccess::exists(url,true,0) )
   {
-    KMessageBox::error(0L, i18n("The file %1 doesn't exist.").tqarg(url.url()) );
+    KMessageBox::error(0L, i18n("The file %1 doesn't exist.").arg(url.url()) );
     recentAction()->removeURL(url); //remove the file from the recent-opened-file-list
     saveRecentFiles();
     return false;
@@ -503,7 +503,7 @@ void KoShellWindow::switchToPage( TQValueList<Page>::Iterator it )
   v->setFocus();
 
   partSpecificHelpAction->setEnabled(true);
-  partSpecificHelpAction->setText(i18n("%1 Handbook").tqarg((*m_activePage).m_pDoc->instance()->aboutData()->programName()));
+  partSpecificHelpAction->setText(i18n("%1 Handbook").arg((*m_activePage).m_pDoc->instance()->aboutData()->programName()));
 }
 
 void KoShellWindow::slotFileNew()
diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h
index 4e0cb704..3dceb1c1 100644
--- a/kplato/intervalitem.h
+++ b/kplato/intervalitem.h
@@ -31,7 +31,7 @@ class IntervalItem : public TQListViewItem
 {
 public:
     IntervalItem(TQListView * parent, TQTime start, TQTime end)
-    : TQListViewItem(parent, TQString("%1  -  %2").tqarg(start.toString(), end.toString())),
+    : TQListViewItem(parent, TQString("%1  -  %2").arg(start.toString(), end.toString())),
       m_start(start),
       m_end(end)
     {}
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc
index 5fd3c7cd..d2a38927 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cc
@@ -216,8 +216,8 @@ void AccountsView::slotUpdate() {
     if (m_cumulative) {
         t += " <b>" + i18n("Cumulative") + "</b>  ";
     }
-    t += i18n("Cut-off date:%1").tqarg("<b>" + locale->formatDate(m_date, true) + "</b>");
-    t += " " + i18n("Periodicity:%1").tqarg("<b>" + periodText(m_period) + "</b>");
+    t += i18n("Cut-off date:%1").arg("<b>" + locale->formatDate(m_date, true) + "</b>");
+    t += " " + i18n("Periodicity:%1").arg("<b>" + periodText(m_period) + "</b>");
     m_label->setText(t);
     
     // Add columns for selected period/periods
@@ -260,7 +260,7 @@ void AccountsView::slotUpdate() {
             //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl;
             int y;
             int w = cal->weekNumber(dt, &y);
-            TQString t = i18n("<week>-<year>", "%1-%2").tqarg(w).tqarg(y);
+            TQString t = i18n("<week>-<year>", "%1-%2").arg(w).arg(y);
             m_dlv->addSlaveColumn(t);
             dt = pend.addDays(1);
             pend = cal->addDays(pend, 7);
@@ -305,7 +305,7 @@ void AccountsView::slotUpdate() {
         cal->setYMD(pend, dt.year(), dt.month(), dt.daysInMonth());
         for (; pend <= end; ++c) {
             //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl;
-            TQString m = cal->monthName(dt, true) + TQString(" %1").tqarg( dt.year());
+            TQString m = cal->monthName(dt, true) + TQString(" %1").arg( dt.year());
             m_dlv->addSlaveColumn(m);
         
             dt = pend.addDays(1); // 1. next month
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index 48b4f9ca..59ab2f01 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -209,7 +209,7 @@ CalendarPanel::dateChangedSlot(TQDate date)
 {
     //kdDebug() << "CalendarPanel::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl;
     line->setText(KGlobal::locale()->formatDate(date, true));
-    d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
+    d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
     selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false));
     selectYear->setText(date.toString("yyyy"));
     emit(dateChanged(date));
@@ -242,7 +242,7 @@ CalendarPanel::setDate(const TQDate& date)
 	TQString temp;
 	// -----
 	table->setDate(date);
-	d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
+	d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
 	selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false));
 	temp.setNum(date.year());
 	selectYear->setText(temp);
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index 9cd6654e..837fb48a 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -88,7 +88,7 @@ void PertNodeItem::move(PertCanvas *view, int row, int col)
     m_row = row; m_col = col;
     view->mapNode(this);
 
-    // Now map my tqchildren
+    // Now map my children
     TQPtrListIterator<PertNodeRelation> it(m_childRelations);
     for (; it.current(); ++it)
     {
@@ -708,10 +708,10 @@ void GanttViewSummaryItem::insertRelations(GanttView *view)
         {
             KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type()));
             //TODO i18n
-            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
+            TQString t = i18n("From: %1").arg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
             }
             link->setTooltipText(t);
             view->addTaskLink(link);
@@ -789,10 +789,10 @@ void GanttViewTaskItem::insertRelations(GanttView *view)
         {
             KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type()));
             //TODO i18n
-            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
+            TQString t = i18n("From: %1").arg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
             }
             link->setTooltipText(t);
             view->addTaskLink(link);
@@ -871,10 +871,10 @@ void GanttViewEventItem::insertRelations(GanttView *view)
         {
             KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type()));
             
-            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
+            TQString t = i18n("From: %1").arg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
             }
             link->setTooltipText(t);
             view->addTaskLink(link);
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc
index 662c0dd0..992bfb5c 100644
--- a/kplato/kptcommand.cc
+++ b/kplato/kptcommand.cc
@@ -347,7 +347,7 @@ NodeDeleteCmd::NodeDeleteCmd(Part *part, Node *node, TQString name)
         for (; it.current(); ++it) {
             Schedule *s = node->findSchedule(it.current()->id());
             if (s && s->isScheduled()) {
-                // Only tqinvalidate schedules this node is part of
+                // Only invalidate schedules this node is part of
                 addSchScheduled(it.current());
             }
         }
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index 44f91500..2fc19d4f 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -175,7 +175,7 @@ void DateTable::paintWeekNumber(TQPainter *painter, int row) {
     painter->drawRect(0, 0, w, h);
     painter->setPen(KGlobalSettings::textColor());
     
-    painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").tqarg(m_weeks[row].first), -1, &rect);
+    painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").arg(m_weeks[row].first), -1, &rect);
     painter->setPen(colorLine);
     painter->moveTo(w-1, 0);
     painter->lineTo(w-1, h-1);
@@ -527,7 +527,7 @@ bool DateTable::selectDate(const TQDate& date_) {
     return true;
 }
 
-bool DateTable::setDate(const TQDate& date_, bool tqrepaint) {
+bool DateTable::setDate(const TQDate& date_, bool repaint) {
     //kdDebug()<<k_funcinfo<<"date="<<date_.toString()<<endl;
     bool changed=false;
     TQDate temp;
@@ -562,7 +562,7 @@ bool DateTable::setDate(const TQDate& date_, bool tqrepaint) {
         m_selectedDates.insert(date);
     }*/
     numDaysPrevMonth=temp.daysInMonth();
-    if(changed && tqrepaint) {
+    if(changed && repaint) {
         repaintContents(false);
     }
     if (m_enabled)
@@ -894,7 +894,7 @@ DateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
               updateCell( row, col /*, false */ ); // mark the new active cell
             }
         }
-      if ( tmpRow > -1 ) // tqrepaint the former active cell
+      if ( tmpRow > -1 ) // repaint the former active cell
           updateCell( tmpRow, tmpCol /*, true */ );
     }
 }
@@ -1053,7 +1053,7 @@ int
 PopupFrame::exec(TQPoint pos)
 {
   popup(pos);
-  tqrepaint();
+  repaint();
   tqApp->enter_loop();
   hide();
   return result;
diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h
index 9cd992e3..b75f98db 100644
--- a/kplato/kptdatetable.h
+++ b/kplato/kptdatetable.h
@@ -278,7 +278,7 @@ public:
     /**
      * Select and display this date.
      */
-    bool setDate(const TQDate&, bool tqrepaint=true);
+    bool setDate(const TQDate&, bool repaint=true);
     const TQDate& getDate() const;
     bool selectDate(const TQDate& date_);
 
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc
index 23c0c80b..4a04c1b0 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cc
@@ -128,7 +128,7 @@ void DoubleListViewBase::SlaveListItem::clearColumn(int col) {
 }
 void DoubleListViewBase::SlaveListItem::setColumn(int col, double value) {
     if (col < listView()->columns()) {
-        //setText(col, TQString("%1").tqarg(value, m_fieldwidth, m_fmt, m_prec));
+        //setText(col, TQString("%1").arg(value, m_fieldwidth, m_fmt, m_prec));
         setText(col, KGlobal::locale()->formatNumber(value, m_prec));
         m_valueMap.replace(col, value);
         //kdDebug()<<k_funcinfo<<m_masterItem->text(0)<<": column["<<col<<"]="<<value<<endl;
@@ -240,14 +240,14 @@ void DoubleListViewBase::MasterListItem::slaveItemDeleted() {
 
 void DoubleListViewBase::MasterListItem::setTotal(double tot) {
     m_value = tot;
-    //setText(1, TQString("%1").tqarg(tot, m_fieldwidth, m_fmt, m_prec));
+    //setText(1, TQString("%1").arg(tot, m_fieldwidth, m_fmt, m_prec));
     setText(1, KGlobal::locale()->formatNumber(tot, m_prec));
     //kdDebug()<<k_funcinfo<<text(0)<<"="<<tot<<endl;
 }
 
 void DoubleListViewBase::MasterListItem::addToTotal(double v) {
     m_value += v;
-    //setText(1, TQString("%1").tqarg(m_value, m_fieldwidth, m_fmt, m_prec));
+    //setText(1, TQString("%1").arg(m_value, m_fieldwidth, m_fmt, m_prec));
     setText(1, KGlobal::locale()->formatNumber(m_value, m_prec));
 }
 
diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h
index e56b21b9..6b610475 100644
--- a/kplato/kptdoublelistviewbase.h
+++ b/kplato/kptdoublelistviewbase.h
@@ -125,7 +125,7 @@ public:
         MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false);
         ~MasterListItem();
         
-        /// Creates slaveitems for myself and my tqchildren
+        /// Creates slaveitems for myself and my children
         void createSlaveItems(TQListView *lv, TQListViewItem *after=0);
         void slaveItemDeleted();
         void setSlaveOpen(bool on);
diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc
index 5e9d6b44..0a2296b0 100644
--- a/kplato/kptduration.cc
+++ b/kplato/kptduration.cc
@@ -129,11 +129,11 @@ TQString Duration::toString(Format format) const {
             hours = ms / (1000 * 60 * 60);
             ms -= (TQ_INT64)hours * (1000 * 60 * 60);
             minutes = ms / (1000 * 60);
-            result = TQString("%1h%2m").tqarg(hours).tqarg(minutes);
+            result = TQString("%1h%2m").arg(hours).arg(minutes);
             break;
         case Format_Day:
             days = m_ms / (1000 * 60 * 60 * 24.0);
-            result = TQString("%1d").tqarg(TQString::number(days, 'f', 4));
+            result = TQString("%1d").arg(TQString::number(days, 'f', 4));
             break;
         case Format_DayTime:
             ms = m_ms;
@@ -156,7 +156,7 @@ TQString Duration::toString(Format format) const {
             hours = ms / (1000 * 60 * 60);
             ms -= (TQ_INT64)hours * (1000 * 60 * 60);
             minutes = ms / (1000 * 60);
-            result = i18n("<hours>h:<minutes>m", "%1h:%2m").tqarg(hours).tqarg(minutes);
+            result = i18n("<hours>h:<minutes>m", "%1h:%2m").arg(hours).arg(minutes);
             break;
         case Format_i18nDay:
             result = KGlobal::locale()->formatNumber(toDouble(Unit_d), 2);
@@ -174,7 +174,7 @@ TQString Duration::toString(Format format) const {
             if (days == 0) {
                 result = toString(Format_i18nHour);
             } else {
-                result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").tqarg(days).tqarg(hours).tqarg(minutes);
+                result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").arg(days).arg(hours).arg(minutes);
             }
             break;
         case Format_i18nHourFraction:
diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui
index e437fa58..74018692 100644
--- a/kplato/kptdurationwidget.ui
+++ b/kplato/kptdurationwidget.ui
@@ -125,7 +125,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -175,7 +175,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -214,7 +214,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -264,7 +264,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -320,7 +320,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc
index e37ab194..28ef7a57 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -322,7 +322,7 @@ void GanttView::resetDrawn(KDGanttViewItem *_item)
     for (; item; item = nextItem) {
         nextItem = item->nextSibling();
         setDrawn(item, false);
-        resetDrawn(item->firstChild()); // then my tqchildren
+        resetDrawn(item->firstChild()); // then my children
     }
 }
 
@@ -336,7 +336,7 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item)
                 m_currentItem = 0;
             deleteItem(item);
         } else {
-            removeNotDrawn(item->firstChild()); // then my tqchildren
+            removeNotDrawn(item->firstChild()); // then my children
         }
     }
 }
@@ -502,10 +502,10 @@ void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task)
     } else {
         item->setText(TQString());
     }    
-    TQString w = i18n("Name: %1").tqarg(task->name());
+    TQString w = i18n("Name: %1").arg(task->name());
     if (!task->notScheduled()) {
-        w += "\n" + i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime()));
-        w += "\n" + i18n("End: %1").tqarg(locale->formatDateTime(task->endTime()));
+        w += "\n" + i18n("Start: %1").arg(locale->formatDateTime(task->startTime()));
+        w += "\n" + i18n("End: %1").arg(locale->formatDateTime(task->endTime()));
     }
     bool ok = true;
     if (task->notScheduled()) {
@@ -582,15 +582,15 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task)
         item->setFloatStartTime(TQDateTime());
         item->setFloatEndTime(TQDateTime());
     }
-    TQString w = i18n("Name: %1").tqarg(task->name());
+    TQString w = i18n("Name: %1").arg(task->name());
     if (!task->notScheduled()) {
-        w += "\n"; w += i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime()));
-        w += "\n"; w += i18n("End: %1").tqarg(locale->formatDateTime(task->endTime()));
+        w += "\n"; w += i18n("Start: %1").arg(locale->formatDateTime(task->startTime()));
+        w += "\n"; w += i18n("End: %1").arg(locale->formatDateTime(task->endTime()));
         if (m_showProgress) {
-            w += "\n"; w += i18n("Completion: %1%").tqarg(task->progress().percentFinished);
+            w += "\n"; w += i18n("Completion: %1%").arg(task->progress().percentFinished);
         }
         if (task->positiveFloat() > Duration::zeroDuration) {
-            w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
+            w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
         }
         if (task->inCriticalPath()) {
             w += "\n" + i18n("Critical path");
@@ -623,7 +623,7 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task)
         if (task->resourceOverbooked()) {
             ok = false;
             TQStringList rl = task->overbookedResources();
-            sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").tqarg(rl.join(","));
+            sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").arg(rl.join(","));
             
         }
         if (!m_showNoInformation && m_project && m_project->notScheduled()) {
@@ -684,12 +684,12 @@ void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task)
     }
     //TODO: Show progress
     
-    TQString w = i18n("Name: %1").tqarg(task->name());
+    TQString w = i18n("Name: %1").arg(task->name());
     if (!task->notScheduled()) {
-        w += "\n" + i18n("Time: %1").tqarg(locale->formatDateTime(task->startTime()));
+        w += "\n" + i18n("Time: %1").arg(locale->formatDateTime(task->startTime()));
         
         if (task->positiveFloat() > Duration::zeroDuration) {
-            w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
+            w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
         }
         if (task->inCriticalPath()) {
             w += "\n" + i18n("Critical path");
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc
index 222ca0a9..29f2195e 100644
--- a/kplato/kptmainprojectpanel.cc
+++ b/kplato/kptmainprojectpanel.cc
@@ -62,7 +62,7 @@ MainProjectPanel::MainProjectPanel(Project &p, TQWidget *parent, const char *nam
     TQString s = i18n("Scheduling");
     Schedule *sch = project.currentSchedule();
     if (sch) {
-        s = i18n("Scheduling (%1)").tqarg(sch->typeToString(true));
+        s = i18n("Scheduling (%1)").arg(sch->typeToString(true));
     }
     schedulingGroup->setTitle(s);
     if (project.constraint() == Node::MustStartOn) {
diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui
index 108c6f14..e711ca64 100644
--- a/kplato/kptmainprojectpanelbase.ui
+++ b/kplato/kptmainprojectpanelbase.ui
@@ -46,7 +46,7 @@
                     <property name="text">
                         <string>&amp;Leader:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index 9f8d5a0d..c95a1c9b 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -942,7 +942,7 @@ int Effort::pessimisticRatio() const {
 
 // Debugging
 #ifndef NDEBUG
-void Node::printDebug(bool tqchildren, TQCString indent) {
+void Node::printDebug(bool children, TQCString indent) {
     kdDebug()<<indent<<"  Unique node identity="<<m_id<<endl;
     if (m_effort) m_effort->printDebug(indent);
     TQString s = "  Constraint: " + constraintToString();
@@ -972,7 +972,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) {
     }
     kdDebug()<<indent<<"  No of successors: "<<m_dependChildNodes.count()<<endl;
     TQPtrListIterator<Relation> cit(m_dependChildNodes);
-    //kdDebug()<<indent<<"  Dependant tqchildren="<<cit.count()<<endl;
+    //kdDebug()<<indent<<"  Dependant children="<<cit.count()<<endl;
     if (cit.count() > 0) {
         for ( ; cit.current(); ++cit ) {
             cit.current()->printDebug(indent);
@@ -981,7 +981,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) {
 
     //kdDebug()<<indent<<endl;
     indent += "  ";
-    if (tqchildren) {
+    if (children) {
         TQPtrListIterator<Node> it(m_nodes);
         for ( ; it.current(); ++it ) {
             it.current()->printDebug(true,indent);
diff --git a/kplato/kptnode.h b/kplato/kptnode.h
index 95d7c24b..10c5613f 100644
--- a/kplato/kptnode.h
+++ b/kplato/kptnode.h
@@ -91,7 +91,7 @@ public:
     virtual bool load(TQDomElement &) { return true; }
     virtual bool load(TQDomElement &, Project &) { return true; }
     virtual void save(TQDomElement &element) const  = 0;
-    /// Save my and my tqchildrens relations.
+    /// Save my and my childrens relations.
     virtual void saveRelations(TQDomElement &element) const;
 
     // simple child node management
@@ -458,7 +458,7 @@ public:
     void setRunningAccount(Account *acc) { m_runningAccount = acc; }
 
     Schedule *currentSchedule() const { return m_currentSchedule; }
-    /// Set current schedule to schedule with identity id, for me and my tqchildren
+    /// Set current schedule to schedule with identity id, for me and my children
     virtual void setCurrentSchedule(long id);
     // NOTE: Cannot use setCurrentSchedule() due to overload/casting problems
     void setCurrentSchedulePtr(Schedule *schedule) { m_currentSchedule = schedule; }
@@ -541,7 +541,7 @@ private:
         
 #ifndef NDEBUG
 public:
-    virtual void printDebug(bool tqchildren, TQCString indent);
+    virtual void printDebug(bool children, TQCString indent);
 #endif
 
 };
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index e442c048..7ff06084 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cc
@@ -198,14 +198,14 @@ bool Part::loadXML(TQIODevice *, const TQDomDocument &document) {
     }
     else if (value != "application/x-vnd.kde.kplato") {
         kdError() << "Unknown mime type " << value << endl;
-        setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").tqarg(value));
+        setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").arg(value));
         return false;
     }
     TQString m_syntaxVersion = plan.attribute("version", CURRENT_SYNTAX_VERSION);
     if (m_syntaxVersion > CURRENT_SYNTAX_VERSION) {
         int ret = KMessageBox::warningContinueCancel(
             0, i18n("This document was created with a newer version of KPlato (syntax version: %1)\n"
-                    "Opening it in this version of KPlato will lose some information.").tqarg(m_syntaxVersion),
+                    "Opening it in this version of KPlato will lose some information.").arg(m_syntaxVersion),
             i18n("File-Format Mismatch"), i18n("Continue") );
         if (ret == KMessageBox::Cancel)
         {
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index b1f49afb..efa57f2e 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -83,7 +83,7 @@ void PertCanvas::draw(Project& project)
         if (!(it.current()->hasParent()) && it.current()->hasChild())
         {
             m_rows.append(new TQMemArray<bool>(1)); // New node always goes into new row, first column
-            it.current()->move(this, m_rows.count()-1, 0); // item also moves it's tqchildren
+            it.current()->move(this, m_rows.count()-1, 0); // item also moves it's children
         }
     }
     // now items without relations
@@ -140,7 +140,7 @@ void PertCanvas::createChildItems(PertNodeItem *parentItem)
             m_relations.append(it.current());
     }
 
-    // Now my tqchildren
+    // Now my children
 	TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator());
     for ( ; nit.current(); ++nit ) {
         createChildItems(createNodeItem(nit.current()));
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc
index 13c44cb3..97eb8202 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cc
@@ -308,7 +308,7 @@ bool Project::load(TQDomElement &element) {
     if (!s.isEmpty())
         m_constraintEndTime = DateTime::fromString(s);
     
-    // Load the project tqchildren
+    // Load the project children
     // Must do these first
     TQDomNodeList list = element.childNodes();
     for (unsigned int i=0; i<list.count(); ++i) {
@@ -498,7 +498,7 @@ void Project::save(TQDomElement &element)  const {
     }
 
     for (int i=0; i<numChildren(); i++)
-    // Save all tqchildren
+    // Save all children
     getChildNode(i)->save(me);
 
     // Now we can save relations assuming no tasks have relations outside the project
@@ -568,7 +568,7 @@ bool Project::addTask( Node* task, Node* position )
         return addSubTask(task, position);
 	}
 	// find the position
-	// we have to tell the parent that we want to delete one of its tqchildren
+	// we have to tell the parent that we want to delete one of its children
 	Node* parentNode = position->getParent();
 	if ( !parentNode ) {
 		kdDebug()<<k_funcinfo<<"parent node not found???"<<endl;
@@ -636,7 +636,7 @@ bool Project::canIndentTask(Node* node)
         //kdDebug()<<k_funcinfo<<"The root node cannot be indented"<<endl;
         return false;
     }
-    // we have to find the parent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of children
     Node* parentNode = node->getParent();
     if ( !parentNode ) {
         return false;
@@ -679,7 +679,7 @@ bool Project::canUnindentTask( Node* node )
         //kdDebug()<<k_funcinfo<<"The root node cannot be unindented"<<endl;
         return false;
     }
-    // we have to find the parent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of children
     // and we need the parent's parent too
     Node* parentNode = node->getParent();
     if ( !parentNode ) {
@@ -714,7 +714,7 @@ bool Project::canMoveTaskUp( Node* node )
 {
     if (node == 0)
         return false; // safety
-    // we have to find the parent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of children
     Node* parentNode = node->getParent();
     if (!parentNode) {
         //kdDebug()<<k_funcinfo<<"No parent found"<<endl;
@@ -742,7 +742,7 @@ bool Project::canMoveTaskDown( Node* node )
 {
     if (node == 0)
         return false; // safety
-    // we have to find the parent of task to manipulate its list of tqchildren
+    // we have to find the parent of task to manipulate its list of children
     Node* parentNode = node->getParent();
     if (!parentNode) {
         return false;
@@ -779,10 +779,10 @@ Task *Project::createTask(Task &def, Node* parent) {
 
 TQString Project::uniqueNodeId(int seed) {
     int i = seed;
-    while (findNode(TQString("%1").tqarg(i))) {
+    while (findNode(TQString("%1").arg(i))) {
         ++i;
     }
-    return TQString("%1").tqarg(i);
+    return TQString("%1").arg(i);
 }
 
 bool Project::removeId(const TQString &id) {
@@ -987,7 +987,7 @@ void Project::setStandardWorktime(StandardWorktime * worktime) {
 }
 
 bool Project::legalToLink(Node *par, Node *child) {
-    //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" children)"<<endl;
     
     if (!child || par->isDependChildOf(child)) {
         return false;
@@ -1007,7 +1007,7 @@ bool Project::legalToLink(Node *par, Node *child) {
 
 bool Project::legalParents(Node *par, Node *child) {
     bool legal = true;
-    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl;
     for (int i=0; i < par->numDependParentNodes() && legal; ++i) {
         Node *pNode = par->getDependParentNode(i)->parent();
         if (child->isParentOf(pNode) || pNode->isParentOf(child)) {
@@ -1024,7 +1024,7 @@ bool Project::legalParents(Node *par, Node *child) {
 
 bool Project::legalChildren(Node *par, Node *child) {
     bool legal = true;
-    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl;
     for (int j=0; j < child->numDependChildNodes() && legal; ++j) {
         Node *cNode = child->getDependChildNode(j)->child();
         if (par->isParentOf(cNode) || cNode->isParentOf(par)) {
@@ -1079,7 +1079,7 @@ void Project::insertCalendarId(const TQString &id, const Calendar *calendar) {
 }
         
 #ifndef NDEBUG
-void Project::printDebug(bool tqchildren, TQCString indent) {
+void Project::printDebug(bool children, TQCString indent) {
 
     kdDebug()<<indent<<"+ Project node: "<<name()<<endl;
     indent += "!";
@@ -1087,7 +1087,7 @@ void Project::printDebug(bool tqchildren, TQCString indent) {
     for ( ; it.current(); ++it)
         it.current()->printDebug(indent);
 
-    Node::printDebug(tqchildren, indent);
+    Node::printDebug(children, indent);
 }
 void Project::printCalendarDebug(TQCString indent) {
     kdDebug()<<indent<<"-------- Calendars debug printout --------"<<endl;
diff --git a/kplato/kptproject.h b/kplato/kptproject.h
index 14f03384..d0dd1eb9 100644
--- a/kplato/kptproject.h
+++ b/kplato/kptproject.h
@@ -223,11 +223,11 @@ public:
 
     Accounts &accounts() { return m_accounts; }
     
-    /// Set current schedule to schedule with identity id, for me and my tqchildren
+    /// Set current schedule to schedule with identity id, for me and my children
     virtual void setCurrentSchedule(long id);
     /// Create new schedule with unique id.
     MainSchedule *createSchedule(TQString name, Schedule::Type type);
-    /// Set parent schedule for my tqchildren
+    /// Set parent schedule for my children
     virtual void setParentSchedule(Schedule *sch);
     
 protected:
@@ -267,7 +267,7 @@ private:
 #ifndef NDEBUG
 #include <tqcstring.h>
 public:
-    void printDebug(bool tqchildren, TQCString indent);
+    void printDebug(bool children, TQCString indent);
     void printCalendarDebug(TQCString indent="");
 #ifdef DEBUGPERT
     static void pert_test();
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc
index a45bddf2..c59a12e9 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cc
@@ -91,24 +91,24 @@ void ProjectDialog::slotSchedulingChanged(int activated) {
     switch(activated) {
         // TODO please provide nice explenations on this.
         case 0: // ASAP
-            label = label.tqarg(i18n("As Soon as Possible"));
-            label = label.tqarg(i18n("Place all events at the earliest possible moment permitted in the schedule"));
+            label = label.arg(i18n("As Soon as Possible"));
+            label = label.arg(i18n("Place all events at the earliest possible moment permitted in the schedule"));
             break;
         case 1: // ALAP
-            label = label.tqarg(i18n("As Late as Possible"));
-            label = label.tqarg(i18n("Place all events at the last possible moment permitted in the schedule"));
+            label = label.arg(i18n("As Late as Possible"));
+            label = label.arg(i18n("Place all events at the last possible moment permitted in the schedule"));
             break;
         case 2: // Start not earlier then
-            label = label.tqarg(i18n("Start not Earlier then"));
-            label = label.tqarg(i18n(""));
+            label = label.arg(i18n("Start not Earlier then"));
+            label = label.arg(i18n(""));
             break;
         case 3: // Finish not later then
-            label = label.tqarg(i18n("Finish not Later then"));
-            label = label.tqarg(i18n(""));
+            label = label.arg(i18n("Finish not Later then"));
+            label = label.arg(i18n(""));
             break;
         case 4: // Must start on
-            label = label.tqarg(i18n("Must Start on"));
-            label = label.tqarg(i18n(""));
+            label = label.arg(i18n("Must Start on"));
+            label = label.arg(i18n(""));
             break;
         default: // error ...
             dia->lSchedulingExplain->setText("");
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc
index 3bdab2b2..a07ea359 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cc
@@ -127,7 +127,7 @@ public:
             if (tag.section(".", 1, 1) == "availableuntil")
                 return (m_resource ? l->formatDate(m_resource->availableUntil().date(), true) : TQString());
             if (tag.section(".", 1, 1) == "units")
-                return (m_resource ? TQString("%1%").tqarg(m_resource->units()) : TQString());
+                return (m_resource ? TQString("%1%").arg(m_resource->units()) : TQString());
             if (tag.section(".", 1, 1) == "normalrate")
                 return (m_resource ? l->formatMoney(m_resource->normalRate()) : TQString());
             if (tag.section(".", 1, 1) == "overtimerate")
@@ -494,11 +494,11 @@ void ReportView::loadTemplate(TQDomDocument &doc) {
 
     m_reportTags->m_project = &(mainView()->getPart()->getProject());
     // Get all the child report elements
-    TQDomNodeList tqchildren = tpl.childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = tpl.childNodes();
+    int childCount = children.length();
 
     for(int j = 0; j < childCount; j++){
-        child = tqchildren.item(j);
+        child = children.item(j);
         if(child.nodeType() == TQDomNode::ElementNode) {
             TQDomElement e = child.toElement();
             //kdDebug()<<child.nodeName()<<endl;
@@ -526,10 +526,10 @@ void ReportView::loadTemplate(TQDomDocument &doc) {
 
 void ReportView::handleHeader(TQDomNode &node) {
     TQDomNode child;
-    TQDomNodeList tqchildren = node.childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = node.childNodes();
+    int childCount = children.length();
     for (int j = 0; j < childCount; j++) {
-        child = tqchildren.item(j);
+        child = children.item(j);
         if (child.nodeName() == "Label") {
             TQDomNode n = child.attributes().namedItem("Text");
             TQString s = n.nodeValue();
@@ -658,14 +658,14 @@ void ReportView::getTemplateFile(const TQString &tpl) {
 
 	if (!url.isValid())
 	{
-			KMessageBox::sorry(this,i18n("Malformed template filename: %1").tqarg(url.prettyURL()));
+			KMessageBox::sorry(this,i18n("Malformed template filename: %1").arg(url.prettyURL()));
 	}
 	else
 	{
 		if (KIO::NetAccess::download(url,localtpl,this))
 			isTemp = true;
 		else
-			KMessageBox::sorry(this,i18n("Unable to download template file: %1").tqarg(url.prettyURL()));
+			KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL()));
 	}
 
 	if (!localtpl.isNull())
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc
index d65f86e7..bca9a208 100644
--- a/kplato/kptrequestresourcespanel.cc
+++ b/kplato/kptrequestresourcespanel.cc
@@ -72,7 +72,7 @@ void ResourceTableItem::insert(TQTable *table, int row) {
 }
 
 GroupLVItem::GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task)
-    : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())),
+    : TQListViewItem(parent, group->name(), TQString("%1").arg(group->units())),
       m_group(group),
       m_units(0)
 {
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc
index 40d4b7c9..b7544f90 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cc
@@ -240,7 +240,7 @@ protected:
             if ( tx < 0 )
                 tx = header()->cellPos( cell );
     
-            // do any tqchildren of current need to be painted?
+            // do any children of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
               if ( ih != ith && 
                  rootIsDecorated() &&
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc
index 964b8e4e..4e41e6bc 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cc
@@ -198,7 +198,7 @@ bool Task::load(TQDomElement &element, Project &project) {
     
     m_wbs = element.attribute("wbs", "");
     
-    // Load the project tqchildren
+    // Load the project children
     TQDomNodeList list = element.childNodes();
     for (unsigned int i=0; i<list.count(); ++i) {
         if (list.item(i).isElement()) {
@@ -570,7 +570,7 @@ void Task::initiateCalculationLists(TQPtrList<Node> &startnodes, TQPtrList<Node>
     //kdDebug()<<k_funcinfo<<m_name<<endl;
     if (type() == Node::Type_Summarytask) {
         summarytasks.append(this);
-        // propagate my relations to my tqchildren and dependent nodes
+        // propagate my relations to my children and dependent nodes
         
         TQPtrListIterator<Node> nodes = m_nodes;
         for (; nodes.current(); ++nodes) {
@@ -1293,7 +1293,7 @@ void Task::clearProxyRelations() {
 void Task::addParentProxyRelations(TQPtrList<Relation> &list) {
     //kdDebug()<<k_funcinfo<<m_name<<endl;
     if (type() == Type_Summarytask) {
-        // propagate to my tqchildren
+        // propagate to my children
         //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl;
         TQPtrListIterator<Node> nodes = m_nodes;
         for (; nodes.current(); ++nodes) {
@@ -1315,7 +1315,7 @@ void Task::addParentProxyRelations(TQPtrList<Relation> &list) {
 void Task::addChildProxyRelations(TQPtrList<Relation> &list) {
     //kdDebug()<<k_funcinfo<<m_name<<endl;
     if (type() == Type_Summarytask) {
-        // propagate to my tqchildren
+        // propagate to my children
         //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl;
         TQPtrListIterator<Node> nodes = m_nodes;
         for (; nodes.current(); ++nodes) {
@@ -1337,7 +1337,7 @@ void Task::addChildProxyRelations(TQPtrList<Relation> &list) {
 void Task::addParentProxyRelation(Node *node, const Relation *rel) {
     if (node->type() != Type_Summarytask) {
         if (type() == Type_Summarytask) {
-            //kdDebug()<<"Add parent proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl;
+            //kdDebug()<<"Add parent proxy from my children "<<m_name<<" to "<<node->name()<<endl;
             TQPtrListIterator<Node> nodes = m_nodes;
             for (; nodes.current(); ++nodes) {
                 nodes.current()->addParentProxyRelation(node, rel);
@@ -1352,7 +1352,7 @@ void Task::addParentProxyRelation(Node *node, const Relation *rel) {
 void Task::addChildProxyRelation(Node *node, const Relation *rel) {
     if (node->type() != Type_Summarytask) {
         if (type() == Type_Summarytask) {
-            //kdDebug()<<"Add child proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl;
+            //kdDebug()<<"Add child proxy from my children "<<m_name<<" to "<<node->name()<<endl;
             TQPtrListIterator<Node> nodes = m_nodes;
             for (; nodes.current(); ++nodes) {
                 nodes.current()->addChildProxyRelation(node, rel);
@@ -1525,7 +1525,7 @@ bool Task::effortMetError() const {
 }
 
 #ifndef NDEBUG
-void Task::printDebug(bool tqchildren, TQCString indent) {
+void Task::printDebug(bool children, TQCString indent) {
     kdDebug()<<indent<<"+ Task node: "<<name()<<" type="<<type()<<endl;
     indent += "!  ";
     kdDebug()<<indent<<"Requested resources (total): "<<units()<<"%"<<endl;
@@ -1533,7 +1533,7 @@ void Task::printDebug(bool tqchildren, TQCString indent) {
     if (m_requests)
         m_requests->printDebug(indent);
     
-    Node::printDebug(tqchildren, indent);
+    Node::printDebug(children, indent);
 
 }
 
diff --git a/kplato/kpttask.h b/kplato/kpttask.h
index 2d3776db..55abd23f 100644
--- a/kplato/kpttask.h
+++ b/kplato/kpttask.h
@@ -244,7 +244,7 @@ public:
     /// Calculate critical path
     virtual bool calcCriticalPath(bool fromEnd);
     
-    /// Set current schedule to schedule with identity id, for me nd my tqchildren
+    /// Set current schedule to schedule with identity id, for me nd my children
     virtual void setCurrentSchedule(long id);
     
     virtual bool effortMetError() const;
@@ -296,7 +296,7 @@ private:
     
 #ifndef NDEBUG
 public:
-    void printDebug(bool tqchildren, TQCString indent);
+    void printDebug(bool children, TQCString indent);
 #endif
 
 };
diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h
index fe0cc9c9..b06fb4be 100644
--- a/kplato/kpttaskappointmentsview.ui.h
+++ b/kplato/kpttaskappointmentsview.ui.h
@@ -106,8 +106,8 @@ void TaskAppointmentsView::drawCostEffort()
     m_plannedEffort->setText(m_task->plannedEffortTo(m_date->date()).toString(Duration::Format_HourFraction));
     m_plannedEffortTotal->setText(m_task->plannedEffort().toString(Duration::Format_HourFraction));
     
-    m_epi->setText(TQString("%1").tqarg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2));
-    m_cpi->setText(TQString("%1").tqarg(m_task->costPerformanceIndex(m_date->date()),3,'f',2));
+    m_epi->setText(TQString("%1").arg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2));
+    m_cpi->setText(TQString("%1").arg(m_task->costPerformanceIndex(m_date->date()),3,'f',2));
 
 }
 
diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc
index f33d355c..e25f9fe6 100644
--- a/kplato/kptwbsdefinition.cc
+++ b/kplato/kptwbsdefinition.cc
@@ -108,25 +108,25 @@ const TQChar Letters[] = { '?','a','b','c','d','e','f','g','h','i','j','k','l','
 
 TQString WBSDefinition::code(CodeDef &def, uint index) {
     if (def.code == "Number") {
-        return TQString("%1").tqarg(index);
+        return TQString("%1").arg(index);
     }
     if (def.code == "Roman, lower case") {
-        return TQString("%1").tqarg(toRoman(index));
+        return TQString("%1").arg(toRoman(index));
     }
     if (def.code == "Roman, upper case") {
-        return TQString("%1").tqarg(toRoman(index, true));
+        return TQString("%1").arg(toRoman(index, true));
     }
     if (def.code == "Letter, lower case") {
         if (index > 26) {
             index = 0;
         }
-        return TQString("%1").tqarg(Letters[index]);
+        return TQString("%1").arg(Letters[index]);
     }
     if (def.code == "Letter, upper case") {
         if (index > 26) {
             index = 0;
         }
-        return TQString("%1").tqarg(Letters[index].upper());
+        return TQString("%1").arg(Letters[index].upper());
     }
     return TQString();
 }
diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc
index 8dcfe891..083c9216 100644
--- a/kplato/kptwbsdefinitionpanel.cc
+++ b/kplato/kptwbsdefinitionpanel.cc
@@ -57,7 +57,7 @@ WBSDefinitionPanel::WBSDefinitionPanel(WBSDefinition &def, TQWidget *p, const ch
     kdDebug()<<"Map size="<<lev.count()<<endl;
     TQMap<int, WBSDefinition::CodeDef>::const_iterator it;
     for (it = lev.begin(); it != lev.end(); ++it) {
-        levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(it.key()));
+        levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(it.key()));
         TQComboTableItem *item = new TQComboTableItem(levelsTable, codeList, true);
         item->setCurrentItem(it.data().code);
         levelsTable->setItem(i, 0, item);
@@ -108,7 +108,7 @@ void WBSDefinitionPanel::slotSelectionChanged() {
     bool rowSelected = false;
     for (int i=0; i < levelsTable->numRows(); ++i) {
         if (levelsTable->isRowSelected(i, true)) {
-            s += TQString("Row[%1]=selected ").tqarg(i);
+            s += TQString("Row[%1]=selected ").arg(i);
             rowSelected = true;
         }
     }
@@ -141,7 +141,7 @@ void WBSDefinitionPanel::slotAddBtnClicked() {
     }
     i++;
     levelsTable->insertRows(i);
-    levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(level->value()));
+    levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(level->value()));
     TQComboTableItem *item = new TQComboTableItem(levelsTable, m_def.codeList(), true);
     levelsTable->setItem(i, 0, item);
     levelsTable->clearSelection();
diff --git a/kplato/kptxmlloaderobject.h b/kplato/kptxmlloaderobject.h
index c8ddc7a5..272c3599 100644
--- a/kplato/kptxmlloaderobject.h
+++ b/kplato/kptxmlloaderobject.h
@@ -49,15 +49,15 @@ public:
         m_starttime = TQDateTime::currentDateTime();
         m_errors = m_warnings = 0;
         m_log.clear();
-        addMsg(TQString("Loading started at %1").tqarg(m_starttime.toString()));
+        addMsg(TQString("Loading started at %1").arg(m_starttime.toString()));
     }
     void stopLoad() { 
         m_elapsed = m_timer.elapsed();
-        addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::currentDateTime().toString()).tqarg(formatElapsed()));
+        addMsg(TQString("Loading finished at %1, took %2").arg(TQDateTime::currentDateTime().toString()).arg(formatElapsed()));
     }
     TQDateTime lastLoaded() const { return m_starttime; }
     int elapsed() const { return m_elapsed; }
-    TQString formatElapsed() { return TQString("%1 seconds").tqarg((double)m_elapsed/1000); }
+    TQString formatElapsed() { return TQString("%1 seconds").arg((double)m_elapsed/1000); }
     
     void setLogLevel(Severity sev) { m_logLevel = sev; }
     const TQStringList &log() const { return m_log; }
@@ -70,7 +70,7 @@ public:
         else if (sev == Diagnostics) s = "Diagnostic";
         else if (sev == Debug) s = "Debug";
         else s = "Message";
-        m_log<<TQString("%1: %2").tqarg(s, 13).tqarg(msg);
+        m_log<<TQString("%1: %2").arg(s, 13).arg(msg);
     }
     void addMsg(TQString msg) { m_log<<msg; }
     void increment(int sev) {
diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui
index bfa7fbdc..1c120b57 100644
--- a/kplato/relationpanel.ui
+++ b/kplato/relationpanel.ui
@@ -121,7 +121,7 @@
                             <property name="text">
                                 <string>From:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignTop</set>
                             </property>
                         </widget>
@@ -140,7 +140,7 @@
                             <property name="text">
                                 <string>To:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignTop</set>
                             </property>
                         </widget>
@@ -151,7 +151,7 @@
                             <property name="text">
                                 <string>Task 1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignTop</set>
                             </property>
                         </widget>
@@ -162,7 +162,7 @@
                             <property name="text">
                                 <string>Task 2</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignTop</set>
                             </property>
                         </widget>
@@ -220,7 +220,7 @@
                             <property name="text">
                                 <string>Lag:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignBottom</set>
                             </property>
                         </widget>
diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp
index 60c5cdcb..90a1eeba 100644
--- a/kpresenter/KPrAutoformObject.cpp
+++ b/kpresenter/KPrAutoformObject.cpp
@@ -80,8 +80,8 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
     kdDebug(33001) << "bool KPrAutoformObject::saveOasisObjectAttributes()" << endl;
     TQSize size( int( ext.width() * 100 ), int( ext.height() * 100 )  );
 
-    sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() )
-                                                                    .tqarg( size.height() ) );
+    sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( size.width() )
+                                                                    .arg( size.height() ) );
 
     TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() );
 
@@ -93,14 +93,14 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
         --pointCount;
 
     TQString d;
-    d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() )
-                            .tqarg( points.at(pos).y() );
+    d += TQString( "M%1 %2" ).arg( points.at(pos).x() )
+                            .arg( points.at(pos).y() );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() )
-                                .tqarg( points.at( pos ).y() );
+        d += TQString( "L%1 %2" ).arg( points.at( pos ).x() )
+                                .arg( points.at( pos ).y() );
         ++pos;
     }
 
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index b404231d..fb87b9f3 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration()
     {
         kdDebug(33001) << "set backgound to master" << endl;
         preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() );
-        preview->tqrepaint( true );
+        preview->repaint( true );
     }
     else
     {
@@ -331,7 +331,7 @@ void KPrBackDialog::updateConfiguration()
         preview->backGround()->setBackType( getBackType() );
         if ( preview->isVisible() && isVisible() ) {
             preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly.
-            preview->tqrepaint( true );
+            preview->repaint( true );
         }
 
         picChanged  = false;
diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp
index 0b12115e..a2e71ea0 100644
--- a/kpresenter/KPrBezierCurveObject.cpp
+++ b/kpresenter/KPrBezierCurveObject.cpp
@@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec
 bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
 {
     KoRect rect( getRect() );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
-                                                                   .tqarg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) )
+                                                                   .arg( int( rect.height() * 100 ) ) );
 
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
-                            .tqarg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
+                            .arg( int( points.at(pos).y() * 100 ) );
 
     while ( pos + 4 <= pointCount )
     {
-        d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) )
-                                            .tqarg( int( points.at( pos + 2 ).y() * 100 ) )
-                                            .tqarg( int( points.at( pos + 3 ).x() * 100 ) )
-                                            .tqarg( int( points.at( pos + 3 ).y() * 100 ) )
-                                            .tqarg( int( points.at( pos + 1 ).x() * 100 ) )
-                                            .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) )
+                                            .arg( int( points.at( pos + 2 ).y() * 100 ) )
+                                            .arg( int( points.at( pos + 3 ).x() * 100 ) )
+                                            .arg( int( points.at( pos + 3 ).y() * 100 ) )
+                                            .arg( int( points.at( pos + 1 ).x() * 100 ) )
+                                            .arg( int( points.at( pos + 1 ).y() * 100 ) );
         pos += 4;
     }
 
     if ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) )
-                                .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) )
+                                .arg( int( points.at( pos + 1 ).y() * 100 ) );
     }
 
     sc.xmlWriter.addAttribute( "svg:d", d );
diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp
index 06954f7c..71ea95fd 100644
--- a/kpresenter/KPrBrush.cpp
+++ b/kpresenter/KPrBrush.cpp
@@ -73,8 +73,8 @@ TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const
 
     if ( getGUnbalanced() )
     {
-        unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).arg( getGXFactor() / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).arg( getGYFactor() / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 6e550fe0..eee5d6c9 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -57,14 +57,14 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP
 
     m_brushUI = new BrushPropertyUI( m_stack );
 
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) );
     m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) );
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index e5e97785..61c00c96 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
         {
             //kdDebug(33001) << "KPrCanvas::paintEvent" << endl;
             TQPainter bufPainter;
-            bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
+            bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
             bufPainter.translate( -diffx(), -diffy() );
             bufPainter.setBrushOrigin( -diffx(), -diffy() );
 
@@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
                 }
 
                 if ( mouseSelectedObject )
-                    _tqrepaint( false );
+                    _repaint( false );
                 emit objectSelectedChanged();
             }
         } break;
@@ -1379,7 +1379,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
     emit objectSelectedChanged();
 
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
 
     m_view->disableAutoScroll();
     mousePressed = false;
@@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
                         angle -= 360;
 
                     m_rotateObject->rotate( angle );
-                    _tqrepaint( m_rotateObject );
+                    _repaint( m_rotateObject );
                 }
             }break;
             case INS_AUTOFORM:
@@ -2072,8 +2072,8 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e )
                         m_resizeObject->setOrig( m_rectBeforeResize.topLeft() );
                         m_resizeObject->setSize( m_rectBeforeResize.size() );
                         drawContour = false;
-                        m_view->kPresenterDoc()->tqrepaint( oldBoundingRect );
-                        m_view->kPresenterDoc()->tqrepaint( m_resizeObject );
+                        m_view->kPresenterDoc()->repaint( oldBoundingRect );
+                        m_view->kPresenterDoc()->repaint( m_resizeObject );
                         m_ratio = 0.0;
                         m_resizeObject = 0;
                         m_isResizing = false;
@@ -2243,7 +2243,7 @@ KPrObject * KPrCanvas::getObjectAt( const KoPoint &pos, bool withoutProtected )
 void KPrCanvas::selectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( true );
-    _tqrepaint( kpobject );
+    _repaint( kpobject );
     emit objectSelectedChanged();
 
     mouseSelectedObject = true;
@@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject )
 void KPrCanvas::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    _tqrepaint( kpobject );
+    _repaint( kpobject );
 
     if ( !m_activePage->isOneObjectSelected() )
     {
@@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj()
     }
 
     mouseSelectedObject = true;
-    _tqrepaint( false );
+    _repaint( false );
     emit objectSelectedChanged();
 }
 
@@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation()
     m_step.m_pageNumber = 0;
     editMode = true;
     m_drawMode = false;
-    tqrepaint( false );
+    repaint( false );
     setToolEditMode( toolEditMode );
     setWFlags( WResizeNoErase );
 }
@@ -3173,7 +3173,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         m_step.m_step = *( --it );
         //hopefully there are never more than 1000 sub steps :-)
         m_step.m_subStep = 1000;
-        tqrepaint( false );
+        repaint( false );
         return false;
     } else {
         // when we go back on the first slide, thats like starting the presentation again
@@ -3201,7 +3201,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         else
         {
             m_step.m_step = *( --m_pageEffectSteps.end() );
-            tqrepaint( false );
+            repaint( false );
         }
 
         return true;
@@ -3544,7 +3544,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
     //deSelectAllObj(); // already done in KPrView::setupPrinter
     int i = 0;
 
-    tqrepaint( false );
+    repaint( false );
     kapp->processEvents();
 
     editMode = false;
@@ -3633,7 +3633,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
 
     fillBlack = true;
     editMode = true;
-    tqrepaint( false );
+    repaint( false );
 }
 
 
@@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline()
 
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3885,7 +3885,7 @@ void KPrCanvas::endDrawCubicBezierCurve()
     insertCubicBezierCurve( m_pointArray );
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _tqrepaint( false );
+    _repaint( false );
 }
 
 void KPrCanvas::selectPrev()
@@ -3927,7 +3927,7 @@ void KPrCanvas::selectPrev()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _tqrepaint( false );
+    _repaint( false );
 }
 
 void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e )
@@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const
     return m_view->kPresenterDoc()->getPageNums();
 }
 
-void KPrCanvas::_tqrepaint( bool /*erase*/ )
+void KPrCanvas::_repaint( bool /*erase*/ )
 {
-    m_view->kPresenterDoc()->tqrepaint( false );
+    m_view->kPresenterDoc()->repaint( false );
 }
 
-void KPrCanvas::_tqrepaint( const TQRect &r )
+void KPrCanvas::_repaint( const TQRect &r )
 {
-    m_view->kPresenterDoc()->tqrepaint( r );
+    m_view->kPresenterDoc()->repaint( r );
 }
 
-void KPrCanvas::_tqrepaint( KPrObject *o )
+void KPrCanvas::_repaint( KPrObject *o )
 {
-    m_view->kPresenterDoc()->tqrepaint( o );
+    m_view->kPresenterDoc()->repaint( o );
 }
 
 void KPrCanvas::slotExitPres()
@@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer )
         m_view->continueAutoPresTimer();
 }
 
-void KPrCanvas::exitEditMode( bool tqrepaint )
+void KPrCanvas::exitEditMode( bool repaint )
 {
     if ( m_editObject )
     {
@@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
             {
                 m_currentTextObjectView->clearSelection();
                 //hide cursor when we desactivate textObjectView
-                if ( tqrepaint )
+                if ( repaint )
                 {
                     m_currentTextObjectView->drawCursor( false );
                     m_currentTextObjectView->terminate();
@@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
                 delete m_currentTextObjectView;
                 m_currentTextObjectView = 0;
 
-                if ( tqrepaint )
-                    _tqrepaint( static_cast<KPrObject*>( kpTextObj ) );
+                if ( repaint )
+                    _repaint( static_cast<KPrObject*>( kpTextObj ) );
             }
             // Title of slide may have changed
             m_view->kPresenterDoc()->updateSideBarItem( m_activePage );
@@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
         else if (m_editObject->getType() == OT_PART )
         {
             static_cast<KPrPartObject *>(m_editObject)->deactivate();
-            _tqrepaint( m_editObject );
+            _repaint( m_editObject );
             m_editObject = 0;
             return;
         }
@@ -4632,7 +4632,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
         move.setY( pageRect.bottom() - rect.bottom() );
     }
 
-    // we only want a tqrepaint if we have guide lines
+    // we only want a repaint if we have guide lines
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
@@ -4934,8 +4934,8 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
             m_gl.repaintSnapping( sp, snapStatus );
         }
 
-        _tqrepaint( oldBoundingRect );
-        _tqrepaint( kpobject );
+        _repaint( oldBoundingRect );
+        _repaint( kpobject );
         emit objectSizeChanged();
     }
 }
@@ -4963,7 +4963,7 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout )
 
         m_ratio = 0.0;
         m_isResizing = false;
-        _tqrepaint( m_resizeObject );
+        _repaint( m_resizeObject );
         m_resizeObject = NULL;
     }
 }
@@ -5321,14 +5321,14 @@ void KPrCanvas::textContentsToHeight()
             if ( !macro )
                 macro = new KMacroCommand(i18n("Extend Text Contents to Height"));
             macro->addCommand( cmd);
-            _tqrepaint( it.current() );
+            _repaint( it.current() );
         }
     }
     if( macro )
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->tqrepaint(this);
+        m_view->kPresenterDoc()->repaint(this);
     }
 }
 
@@ -5354,7 +5354,7 @@ void KPrCanvas::textObjectToContents()
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->tqrepaint(this);
+        m_view->kPresenterDoc()->repaint(this);
     }
 
 }
@@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj )
     if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj )
     {
         m_currentTextObjectView->kpTextObject()->setEditingTextObj( false );
-        _tqrepaint( m_currentTextObjectView->kpTextObject() );
+        _repaint( m_currentTextObjectView->kpTextObject() );
         //don't remove selection otherwise break dnd.
         m_currentTextObjectView->terminate(false);
         delete m_currentTextObjectView;
diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h
index e2b373e1..f5355be7 100644
--- a/kpresenter/KPrCanvas.h
+++ b/kpresenter/KPrCanvas.h
@@ -376,8 +376,8 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 );
     void objectPopup( KPrObject *object, const TQPoint &point );
 
 public slots:
-    // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash
-    void exitEditMode( bool tqrepaint = true );
+    // use repaint = false when the KPrCanvas is destroyed to avaid a possible crash
+    void exitEditMode( bool repaint = true );
 
     void clipCut();
     void clipCopy();
@@ -543,9 +543,9 @@ protected:
     TQRect getPageRect( bool decBorders = true ) const;
     unsigned int pageNums() const;
 
-    void _tqrepaint( bool erase=true );
-    void _tqrepaint( const TQRect &r );
-    void _tqrepaint( KPrObject *o );
+    void _repaint( bool erase=true );
+    void _repaint( const TQRect &r );
+    void _repaint( KPrObject *o );
 
     /**
      * Draw page defined in step to painter.
@@ -692,7 +692,7 @@ private:
      * @param pos the point which should be snapped
      * @param repaintSnapping true if the guides should be repainted.
      * @param repaintSnapping false when the guides should not be repainted.
-     *        You have to call tqrepaint by yourself.
+     *        You have to call repaint by yourself.
      *
      * @return the position of the snapped point
      */
diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp
index be409183..208335f5 100644
--- a/kpresenter/KPrClosedLineObject.cpp
+++ b/kpresenter/KPrClosedLineObject.cpp
@@ -297,9 +297,9 @@ void KPrClosedLineObject::loadOasis( const TQDomElement &element, KoOasisContext
         points = parser.getPoints( d, true );
         loadOasisApplyViewBox( element, points );
     }
-    else if ( tag == "custom-tqshape" )
+    else if ( tag == "custom-shape" )
     {
-        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" );
+        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" );
 
         if ( !enhancedGeometry.isNull() )
         {
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index 5236aaf6..85e66845 100644
--- a/kpresenter/KPrCommand.cpp
+++ b/kpresenter/KPrCommand.cpp
@@ -94,7 +94,7 @@ void KPrShadowCmd::execute()
         it.current()->setShadowParameter(newShadow.shadowDistance,
                                          newShadow.shadowDirection,
                                          newShadow.shadowColor);
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -105,7 +105,7 @@ void KPrShadowCmd::unexecute()
         objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance,
                                             oldShadow.at(i)->shadowDirection,
                                             oldShadow.at(i)->shadowColor);
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute()
     doc->setGridValue( gridX, gridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( txtBackCol );
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 void KPrSetOptionsCmd::unexecute()
@@ -155,7 +155,7 @@ void KPrSetOptionsCmd::unexecute()
     doc->setGridValue( oldGridX, oldGridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( otxtBackCol );
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings,
@@ -189,7 +189,7 @@ void KPrSetBackCmd::execute()
         }
 
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     if ( m_takeGlobal ) {
         TQPtrListIterator<KPrPage> it( m_doc->getPageList() );
@@ -217,7 +217,7 @@ void KPrSetBackCmd::unexecute()
             m_doc->restoreBackground(it.current());
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     if ( m_takeGlobal ) {
         TQPtrListIterator<KPrPage> it( m_doc->getPageList() );
@@ -272,7 +272,7 @@ void KPrRotateCmd::execute()
             it.current()->rotate( m_newAngle );
     }
     m_doc->updateRuler();
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -282,7 +282,7 @@ void KPrRotateCmd::unexecute()
     for ( unsigned int i = 0; i < m_objects.count(); i++ )
         m_objects.at(i)->rotate( m_oldAngles.at( i )->angle );
     m_doc->updateRuler();
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd()
 void KPrChgPixCmd::execute()
 {
     m_page->replaceObject( oldObject, newObject );
-    doc->tqrepaint( newObject );
+    doc->repaint( newObject );
 
     doc->updateSideBarItem( m_page );
 }
@@ -319,7 +319,7 @@ void KPrChgPixCmd::execute()
 void KPrChgPixCmd::unexecute()
 {
     m_page->replaceObject( newObject, oldObject );
-    doc->tqrepaint( oldObject );
+    doc->repaint( oldObject );
 
     doc->updateSideBarItem( m_page );
 }
@@ -378,7 +378,7 @@ void KPrDeleteCmd::execute()
     for ( itDelete.toFirst(); itDelete.current(); ++itDelete )
     {
         TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() );
-        m_doc->tqrepaint( oldRect );
+        m_doc->repaint( oldRect );
     }
     if(textObj)
         m_doc->updateRuler();
@@ -393,7 +393,7 @@ void KPrDeleteCmd::unexecute()
     for ( ; it.current(); ++it )
     {
         it.current()->addToObjList();
-        m_doc->tqrepaint( it.current() );
+        m_doc->repaint( it.current() );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -522,7 +522,7 @@ void KPrGroupObjCmd::unexecute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -561,7 +561,7 @@ void UnGroupObjCmd::execute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -587,7 +587,7 @@ void UnGroupObjCmd::unexecute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -641,7 +641,7 @@ void KPrInsertCmd::execute()
         m_object->addToObjList();
         if ( m_object->getType() == OT_TEXT )
             m_doc->updateRuler();
-        m_doc->tqrepaint( m_object );
+        m_doc->repaint( m_object );
     }
     else
     {
@@ -653,7 +653,7 @@ void KPrInsertCmd::execute()
             ( *it )->addToObjList();
             if ( ( *it )->getType() == OT_TEXT )
                 updateRuler = true;
-            m_doc->tqrepaint( *it );
+            m_doc->repaint( *it );
         }
         if ( updateRuler )
             m_doc->updateRuler();
@@ -678,7 +678,7 @@ void KPrInsertCmd::unexecute()
                 m_doc->updateRuler();
             }
         }
-        m_doc->tqrepaint( oldRect );
+        m_doc->repaint( oldRect );
     }
     else
     {
@@ -703,7 +703,7 @@ void KPrInsertCmd::unexecute()
         if ( updateRuler )
             m_doc->updateRuler();
 
-        m_doc->tqrepaint( false );
+        m_doc->repaint( false );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd()
 void KPrLowerRaiseCmd::execute()
 {
     m_page->setObjectList( newList );
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -744,7 +744,7 @@ void KPrLowerRaiseCmd::execute()
 void KPrLowerRaiseCmd::unexecute()
 {
     m_page->setObjectList( oldList );
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -783,8 +783,8 @@ void KPrMoveByCmd::execute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->tqrepaint( oldRect );
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( oldRect );
+        doc->repaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -803,8 +803,8 @@ void KPrMoveByCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->tqrepaint( oldRect );
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( oldRect );
+        doc->repaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -888,8 +888,8 @@ void KPrAlignCmd::execute()
                 doc->updateRuler();
         }
 
-        doc->tqrepaint( oldRect );
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( oldRect );
+        doc->repaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -907,8 +907,8 @@ void KPrAlignCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->tqrepaint( oldRect );
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( oldRect );
+        doc->repaint( objects.at( i ) );
         doc->updateRuler();
     }
 
@@ -976,7 +976,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
                 //obj->setPen( tmpPen->pen );
                 obj->setLineBegin( tmpPen->lineBegin );
                 obj->setLineEnd( tmpPen->lineEnd );
-                //doc->tqrepaint( obj );
+                //doc->repaint( obj );
             }
         } break;
         case OT_FREEHAND:
@@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
                 //obj->setPen( tmpPen->pen );
                 obj->setLineBegin( tmpPen->lineBegin );
                 obj->setLineEnd( tmpPen->lineEnd );
-                //doc->tqrepaint( obj );
+                //doc->repaint( obj );
             }
         } break;
         case OT_PIE:
@@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
     if ( obj )
     {
         obj->setPen( tmpPen->pen );
-        doc->tqrepaint( obj );
+        doc->repaint( obj );
     }
 }
 
@@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush )
     object->setGUnbalanced( tmpBrush->unbalanced );
     object->setGXFactor( tmpBrush->xfactor );
     object->setGYFactor( tmpBrush->yfactor );
-    doc->tqrepaint( object );
+    doc->repaint( object );
 }
 
 void KPrBrushCmd::unexecute()
@@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute()
                 obj->setPieLength( m_newValues.pieLength );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1473,7 +1473,7 @@ void KPrPieValueCmd::unexecute()
             obj->setPieLength( m_oldValues.at( i )->pieLength );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute()
                 obj->setSharpnessValue(m_newSettings.sharpnessValue );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1570,7 +1570,7 @@ void KPrPolygonSettingCmd::unexecute()
             obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue);
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute()
                 obj->setPictureBright( m_newSettings.bright );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1688,7 +1688,7 @@ void KPrPictureSettingCmd::unexecute()
             obj->setPictureBright( pictureSettings->bright );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute()
             obj->setRnds( xtmp, ytmp );
         }
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1809,7 +1809,7 @@ void KPrRectValueCmd::unexecute()
         if( obj )
             obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd );
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1846,8 +1846,8 @@ void KPrResizeCmd::execute()
     }
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
-    doc->tqrepaint( oldRect );
-    doc->tqrepaint( object );
+    doc->repaint( oldRect );
+    doc->repaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -1868,8 +1868,8 @@ void KPrResizeCmd::unexecute()
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
 
-    doc->tqrepaint( oldRect );
-    doc->tqrepaint( object );
+    doc->repaint( oldRect );
+    doc->repaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2368,7 +2368,7 @@ void KPrFlipObjectCommand::flipObjects()
     for ( ; it.current() ; ++it )
     {
         it.current()->flip( horizontal );
-        m_doc->tqrepaint( it.current() );
+        m_doc->repaint( it.current() );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -2425,7 +2425,7 @@ void KPrGeometryPropertiesCommand::execute()
         {
             it.current()->setProtect( m_newValue );
             if ( it.current()->isSelected() )
-                m_doc->tqrepaint( it.current() );
+                m_doc->repaint( it.current() );
         }
         else if ( m_type == KeepRatio)
             it.current()->setKeepRatio( m_newValue );
@@ -2441,7 +2441,7 @@ void KPrGeometryPropertiesCommand::unexecute()
         {
             obj->setProtect( *m_oldValue.at(i) );
             if ( obj->isSelected() )
-                m_doc->tqrepaint( obj );
+                m_doc->repaint( obj );
         }
         else if ( m_type == KeepRatio)
             obj->setKeepRatio( *m_oldValue.at(i) );
@@ -2568,7 +2568,7 @@ void KPrCloseObjectCommand::execute()
         ( *closeIt )->addToObjList();
         ( *openIt )->setSelected( false );
         ( *closeIt )->setSelected( selected );
-        m_doc->tqrepaint( *closeIt );
+        m_doc->repaint( *closeIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute()
         ( *openIt )->addToObjList();
         ( *closeIt )->setSelected( false );
         ( *openIt )->setSelected( selected );
-        m_doc->tqrepaint( *openIt );
+        m_doc->repaint( *openIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2670,7 +2670,7 @@ void KPrChangeMarginCommand::execute()
         it.current()->resizeTextDocument();
         it.current()->tqlayout();
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2686,7 +2686,7 @@ void KPrChangeMarginCommand::unexecute()
         object->resizeTextDocument();
         object->tqlayout();
     }
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2709,7 +2709,7 @@ void KPrChangeVerticalAlignmentCommand::execute()
 {
     m_obj->setVerticalAligment( m_newAlign );
     m_obj->kPresenterDocument()->tqlayout(m_obj);
-    m_obj->kPresenterDocument()->tqrepaint(m_obj);
+    m_obj->kPresenterDocument()->repaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2718,7 +2718,7 @@ void KPrChangeVerticalAlignmentCommand::unexecute()
 {
     m_obj->setVerticalAligment( m_oldAlign );
     m_obj->kPresenterDocument()->tqlayout(m_obj);
-    m_obj->kPresenterDocument()->tqrepaint(m_obj);
+    m_obj->kPresenterDocument()->repaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute()
             obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3);
         }
     }
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2794,7 +2794,7 @@ void KPrImageEffectCmd::unexecute()
                              oldSettings.at( i )->param3);
         }
     }
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     doc->updateSideBarItem( m_page );
 }
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 42a701e9..b25e1255 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -365,13 +365,13 @@ void KPrConfigureColorBackground::apply()
     if( oldGridColor != _col ) {
         config->setGroup( "KPresenter Color" );
         config->writeEntry( "GridColor", _col );
-        doc->tqrepaint( false );
+        doc->repaint( false );
         doc->setGridColor( _col );
         oldGridColor=_col;
         repaintNeeded = true;
     }
     if (repaintNeeded)
-        doc->tqrepaint( false );
+        doc->repaint( false );
 }
 
 void KPrConfigureColorBackground::slotDefault()
@@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply()
 
     doc->setGridValue( resolutionX->value(),
                        resolutionY->value(), true);
-    doc->tqrepaint( false );
+    doc->repaint( false );
 
     config->sync();
 
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 7c0fa1c9..61eebe23 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -214,7 +214,7 @@ void KPrCustomSlideShowDia::slotCopy()
         {
             if ( !uniqueName( i, str ) )
             {
-                str = str.tqarg( i );
+                str = str.arg( i );
                 m_customSlideShowMap.insert( str, m_customSlideShowMap[item->text()] );
                 list->insertItem( str );
                 break;
@@ -225,7 +225,7 @@ void KPrCustomSlideShowDia::slotCopy()
 
 bool KPrCustomSlideShowDia::uniqueName( int val, const TQString & name ) const
 {
-    TQString str = name.tqarg( val );
+    TQString str = name.arg( val );
     for ( int i= 0; i < ( int )list->count(); ++i )
     {
         if ( list->text ( i ) == str )
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index d7cb13cf..fca675d5 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -444,9 +444,9 @@ bool KPrDocument::saveChildren( KoStore* _store )
 {
     int i = 0;
 
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
-        // Don't save tqchildren that are only in the undo/redo history
+        // Don't save children that are only in the undo/redo history
         // but not anymore in the presentation
         TQPtrListIterator<KPrPage> pageIt( m_pageList );
         for ( int pagePos = 0; pageIt.current(); ++pageIt, ++pagePos )
@@ -669,9 +669,9 @@ TQDomDocument KPrDocument::saveXML()
     }
 
     // Write "OBJECT" tag for every child
-    TQPtrListIterator<KoDocumentChild> chl( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> chl( children() );
     for( ; chl.current(); ++chl ) {
-        // Don't save tqchildren that are only in the undo/redo history
+        // Don't save children that are only in the undo/redo history
         // but not anymore in the presentation
         for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) {
             if ( saveOnlyPage != -1 && i != saveOnlyPage )
@@ -735,8 +735,8 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, TQDomD
             TQDomElement embedded=doc.createElement("EMBEDDED");
             KPrChild* curr = (KPrChild*)chl;
 
-            // tqgeometry is no zoom value !
-            TQRect _rect = curr->tqgeometry();
+            // geometry is no zoom value !
+            TQRect _rect = curr->geometry();
             int tmpX = (int)zoomHandler()->unzoomItX( _rect.x() );
             int tmpY = (int)zoomHandler()->unzoomItY( _rect.y() );
             int tmpWidth = (int)zoomHandler()->unzoomItX( _rect.width() );
@@ -909,7 +909,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL
         TQString soundFileName = *it;
         int position = soundFileName.findRev( '.' );
         TQString format = soundFileName.right( soundFileName.length() - position - 1 );
-        TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
+        TQString _name = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() );
 
         TQDomElement fileElem = _doc.createElement( "FILE" );
         soundFiles.appendChild( fileElem );
@@ -955,7 +955,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list
         TQString soundFileName = *it;
         int position = soundFileName.findRev( '.' );
         TQString format = soundFileName.right( soundFileName.length() - position - 1 );
-        TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
+        TQString _storeURL = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() );
 
         if ( _store->open( _storeURL ) ) {
             KoStoreDevice dev( _store );
@@ -973,7 +973,7 @@ bool KPrDocument::loadChildren( KoStore* _store )
 {
     if ( objStartY == 0 && _clean) // Don't do this when inserting a template or a page...
     {
-        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+        TQPtrListIterator<KoDocumentChild> it( children() );
         for( ; it.current(); ++it ) {
             if ( !((KoDocumentChild*)it.current())->loadDocument( _store ) )
                 return false;
@@ -981,7 +981,7 @@ bool KPrDocument::loadChildren( KoStore* _store )
     }
     else // instead load form the correct child on, m_childCountBeforeInsert has the be set
     {
-        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+        TQPtrListIterator<KoDocumentChild> it( children() );
         for( int i = 0; it.current(); ++it, ++i ) {
             if ( i < m_childCountBeforeInsert )
                 continue;
@@ -1614,7 +1614,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
         return false;
     }
 
@@ -1857,7 +1857,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                         TQRect r;
                         KPrPartObject *kppartobject = new KPrPartObject( ch );
                         kppartobject->loadOasis( o, context, m_loadingInfo );
-                        r = ch->tqgeometry();
+                        r = ch->geometry();
                         if ( groupObject )
                             groupObject->addObjects( kppartobject );
                         else
@@ -1993,11 +1993,11 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                         break;
                 }
             }
-            else if ( name == "custom-tqshape" && isDrawNS )
+            else if ( name == "custom-shape" && isDrawNS )
             {
                 fillStyleStack( o, context, "graphic" );
 
-                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" );
+                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" );
 
                 if ( !enhancedGeometry.isNull() )
                 {
@@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                                         newpage->appendObject( kpClosedObject );
                                 } break;
                             default:
-                                kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
+                                kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
                                 break;
                         }
                     }
                     else
                     {
-                        kdDebug(33001) << "draw:custom-tqshape not supported" << endl;
+                        kdDebug(33001) << "draw:custom-shape not supported" << endl;
                     }
                 }
             }
@@ -2136,10 +2136,10 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or
         {
             const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation;
             if ( isPresentationNS &&
-                 ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) )
+                 ( tagName == "show-shape" || tagName == "hide-shape" ) )
             {
-                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) );
-                TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-id", TQString() );
+                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) );
+                TQString name = e.attributeNS( KoXmlNS::draw, "shape-id", TQString() );
                 kdDebug()<<" insert animation " << tagName << " name :" << name << endl;
 
                 if ( e.hasAttributeNS( KoXmlNS::koffice, "order-id" ) )
@@ -2150,7 +2150,7 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or
                 lstAnimation *tmp = new lstAnimation;
                 tmp->element = new TQDomElement( e );
                 tmp->order = orderAnimation;
-                if ( tagName == "show-tqshape" )
+                if ( tagName == "show-shape" )
                 {
                     m_loadingInfo->storePresentationShowAnimation( tmp, name );
                 }
@@ -2246,7 +2246,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc )
                             << "  Line: " << errorLine << " Column: " << errorColumn << endl
                             << "  Message: " << errorMsg << endl;
             setErrorMessage( i18n( "parsing error in the main document (converted from an old KPresenter format) at line %1, column %2\nError message: %3" )
-                             .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ) );
+                             .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) );
             return false;
         }
         b = loadXML( newdoc );
@@ -2294,7 +2294,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo
             TQDomElement object=elem.namedItem("OBJECT").toElement();
             if(!object.isNull()) {
                 ch->load(object, true);  // true == uppercase
-                r = ch->tqgeometry();
+                r = ch->geometry();
                 ch->loadDocument( store );
                 insertChild( ch );
                 kppartobject = new KPrPartObject( ch );
@@ -2376,7 +2376,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
            document.attribute("mime")!="application/x-kpresenter" &&
            document.attribute("mime")!="application/vnd.kde.kpresenter" ) ) {
         kdError(33001) << "Unknown mime type " << document.attribute("mime") << endl;
-        setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(document.attribute("mime")) );
+        setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").arg(document.attribute("mime")) );
         return false;
     }
     if(document.hasAttribute("url"))
@@ -2401,7 +2401,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
             TQDomElement object=elem.namedItem("OBJECT").toElement();
             if(!object.isNull()) {
                 ch->load(object, true);  // true == uppercase
-                r = ch->tqgeometry();
+                r = ch->geometry();
                 insertChild( ch );
                 kppartobject = new KPrPartObject( ch );
                 //emit sig_insertObject( ch, kppartobject );
@@ -3275,7 +3275,7 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout )
     //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ )
     //    m_pageList.at( i )->updateBackgroundSize();
 
-    tqrepaint( false );
+    repaint( false );
     tqlayout();
     // don't setModified(true) here, since this is called on startup
 }
@@ -3287,14 +3287,14 @@ void KPrDocument::updateHeaderFooterPosition( )
     TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() );
     _header->setOrig(pageRect.topLeft ());
     _header->setSize(pageRect.width(),_header->getSize().height());
-    tqrepaint( oldBoundingRect );
-    tqrepaint(_header);
+    repaint( oldBoundingRect );
+    repaint(_header);
 
     oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() );
     _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height());
     _footer->setSize(pageRect.width(),_footer->getSize().height());
-    tqrepaint(oldBoundingRect);
-    tqrepaint(_footer);
+    repaint(oldBoundingRect);
+    repaint(_footer);
 }
 
 bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
@@ -3401,16 +3401,16 @@ void KPrDocument::setGridValue( double _x, double _y, bool _replace )
         replaceObjs();
 }
 
-void KPrDocument::tqrepaint( bool erase )
+void KPrDocument::repaint( bool erase )
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->tqrepaint( erase );
+        canvas->repaint( erase );
     }
 }
 
-void KPrDocument::tqrepaint( const TQRect& rect )
+void KPrDocument::repaint( const TQRect& rect )
 {
     TQRect r;
     TQPtrListIterator<KoView> it( views() );
@@ -3439,9 +3439,9 @@ void KPrDocument::tqlayout()
     }
 }
 
-void KPrDocument::tqrepaint( KPrObject *kpobject )
+void KPrDocument::repaint( KPrObject *kpobject )
 {
-    tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
+    repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
 }
 
 TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num )
@@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum )
         }
     }
 
-    tqrepaint( false );
+    repaint( false );
 }
 
 void KPrDocument::pageOrderChanged()
@@ -3646,7 +3646,7 @@ int KPrDocument::insertNewPage( const TQString &cmdName, int _page, InsertPos _i
     KPrPage *newpage = new KPrPage( this, m_masterPage );
 
     m_pageWhereLoadObject=newpage;
-    m_childCountBeforeInsert = tqchildren().count();
+    m_childCountBeforeInsert = children().count();
 
     bool ok = loadNativeFormat( fileName );
     if ( !ok )
@@ -3726,7 +3726,7 @@ KCommand * KPrDocument::loadPastedObjs( const TQString &in, KPrPage* _page )
     KCommand *cmd = loadObjects(document,true);
     m_pageWhereLoadObject=0L;
 
-    tqrepaint( false );
+    repaint( false );
     setModified( true );
     return cmd;
 }
@@ -3750,7 +3750,7 @@ void KPrDocument::setDisplayObjectMasterPage( bool b )
     TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
         ((KPrView*)it.current())->updateDisplayObjectMasterPageButton();
-    tqrepaint(b);
+    repaint(b);
 }
 
 void KPrDocument::setDisplayBackground( bool b )
@@ -3758,7 +3758,7 @@ void KPrDocument::setDisplayBackground( bool b )
     TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
         ((KPrView*)it.current())->updateDisplayBackgroundButton();
-    tqrepaint(b);
+    repaint(b);
 }
 
 void KPrDocument::setHeader( bool b )
@@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b )
     }
     m_masterPage->setHeader( b, false );
     updateHeaderFooterButton();
-    tqrepaint(b);
+    repaint(b);
 }
 
 void KPrDocument::setFooter( bool b )
@@ -3786,7 +3786,7 @@ void KPrDocument::setFooter( bool b )
     }
     m_masterPage->setFooter( b, false );
     updateHeaderFooterButton();
-    tqrepaint(b);
+    repaint(b);
 }
 
 void KPrDocument::updateHeaderFooterButton()
@@ -3917,7 +3917,7 @@ void KPrDocument::movePage( int from, int to )
 void KPrDocument::copyPage( int from )
 {
     _clean = false;
-    m_childCountBeforeInsert = tqchildren().count();
+    m_childCountBeforeInsert = children().count();
 
     _duplicatePage=true; // ### now also set via savePage() parameter below
 
@@ -4145,7 +4145,7 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj )
 {
     //todo
     //use this function for the moment
-    tqrepaint( kptextobj );
+    repaint( kptextobj );
 }
 
 
@@ -4156,7 +4156,7 @@ void KPrDocument::recalcVariables( int type )
     if ( modifiedVariables.isEmpty() )
         return;
 
-    // TODO use the return value from recalcVariables to only tqrepaint what has changed.
+    // TODO use the return value from recalcVariables to only repaint what has changed.
     TQPtrListIterator<KPrPage> it( m_pageList );
     for ( ; it.current(); ++it )
         it.current()->slotRepaintVariable();
@@ -4665,7 +4665,7 @@ void KPrDocument::insertFile(const TQString & file )
 {
     m_insertFilePage = m_pageList.count();
 
-    m_childCountBeforeInsert = tqchildren().count();
+    m_childCountBeforeInsert = children().count();
     objStartY = 0;
     bool clean = _clean;
     _clean = false;
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index c51060a4..e1ae80e3 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -236,11 +236,11 @@ class KPrDocument : public KoDocument
     void deletePage( int _page );
     void copyPageToClipboard( int pgnum );
 
-    // tqrepaint all views
-    void tqrepaint( bool );
+    // repaint all views
+    void repaint( bool );
 
-    void tqrepaint( const TQRect& );
-    void tqrepaint( KPrObject* );
+    void repaint( const TQRect& );
+    void repaint( KPrObject* );
 
     // stuff for screen-presentations
     /**
@@ -552,7 +552,7 @@ protected:
     void testAndCloseAllTextObjectProtectedContent();
     // ************ functions ************
     /**
-     * Overloaded function from @ref Document_impl. Saves all tqchildren.
+     * Overloaded function from @ref Document_impl. Saves all children.
      */
     virtual bool saveChildren( KoStore* _store );
 
@@ -707,8 +707,8 @@ private:
     KPrLoadingInfo *m_loadingInfo;
     TQValueList<int> *m_customListTest;
 
-    /// here the amount of existing tqchildren before inserting a page/file
-    /// is saved, so that we load the correct tqchildren
+    /// here the amount of existing children before inserting a page/file
+    /// is saved, so that we load the correct children
     int m_childCountBeforeInsert;
 };
 
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index 04235d73..aa4d154a 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b )
 {
     doc->setShowGuideLines( b );
     doc->updateGuideLineButton();
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 void KPrDocumentIface::addGuideLine( bool horizontal, double pos )
 {
     doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos );
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 unsigned int KPrDocumentIface::nbHorizontalHelpLine() const
@@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid )
 {
     doc->setShowGrid( _grid);
     doc->updateGridButton();
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 double KPrDocumentIface::gridX() const
@@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x)
 {
     doc->setGridX( _x );
     if( showGrid() )
-        doc->tqrepaint( false );
+        doc->repaint( false );
 }
 
 double KPrDocumentIface::gridY() const
@@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y)
 {
     doc->setGridY( _y );
     if( showGrid() )
-        doc->tqrepaint( false );
+        doc->repaint( false );
 }
 
 bool KPrDocumentIface::configAutoSuperScript() const
@@ -555,9 +555,9 @@ TQStringList KPrDocumentIface::presentationList()
     return doc->presentationList();
 }
 
-void KPrDocumentIface::tqrepaint()
+void KPrDocumentIface::repaint()
 {
-    doc->tqrepaint( false );
+    doc->repaint( false );
 }
 
 void KPrDocumentIface::setConfigToolTipCompletion( bool b )
diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h
index 3dd061df..83429fb0 100644
--- a/kpresenter/KPrDocumentIface.h
+++ b/kpresenter/KPrDocumentIface.h
@@ -178,7 +178,7 @@ k_dcop:
 
     /// Repaint document. Call this after moving or resizing an object, for instance.
     /// @since 1.4
-    void tqrepaint();
+    void repaint();
 
 private:
     KPrDocument *doc;
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index abddeb68..979df309 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp
index 3836a8ad..709a86d1 100644
--- a/kpresenter/KPrFindReplace.cpp
+++ b/kpresenter/KPrFindReplace.cpp
@@ -55,10 +55,10 @@ void KPrFindReplace::emitNewCommand(KCommand *cmd)
 
 void KPrFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *_textdoc, KDialogBase* dialog)
 {
-    bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
+    bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
     KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc);
     KPrTextObject* textobj = textdoc->textObject();
-    textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog );
+    textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog );
 }
 
 #include "KPrFindReplace.moc"
diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp
index 077b9eed..273d6041 100644
--- a/kpresenter/KPrFreehandObject.cpp
+++ b/kpresenter/KPrFreehandObject.cpp
@@ -59,20 +59,20 @@ bool KPrFreehandObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
 {
     // the rect for the view box have to be the rect and not the real rect
     KoRect rect( getRect() );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
-                                                                   .tqarg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) )
+                                                                   .arg( int( rect.height() * 100 ) ) );
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
-                            .tqarg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
+                            .arg( int( points.at(pos).y() * 100 ) );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) )
-                                .tqarg( int( points.at( pos ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) )
+                                .arg( int( points.at( pos ).y() * 100 ) );
         ++pos;
     }
 
diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp
index 19843a1b..25ff2963 100644
--- a/kpresenter/KPrFreehandObjectIface.cpp
+++ b/kpresenter/KPrFreehandObjectIface.cpp
@@ -56,12 +56,12 @@ TQString KPrFreehandObjectIface::lineEnd() const
 
 void KPrFreehandObjectIface::horizontalFlip()
 {
-    //todo tqrepaint it
+    //todo repaint it
     obj->flip(true );
 }
 
 void KPrFreehandObjectIface::verticalFlip()
 {
-    //todo tqrepaint it
+    //todo repaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index d5d0ed24..c170f159 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -60,7 +60,7 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc,
             t.truncate(30);
             t+="...";
         }
-        spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 );
+        spinbox->insertItem( TQString( "%1 - %2" ).arg( *it ).arg( t ), -1 );
         if ( *it == start )
             spinbox->setCurrentItem( spinbox->count()-1 );
     }
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 6a0162c1..078a3918 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -217,7 +217,7 @@ void KPrImageEffectDia::setPixmap(TQPixmap pix)
 void KPrImageEffectDia::updatePreview()
 {
     base->m_previewLabel->setPixmap(m_pix);
-    base->m_previewLabel->tqrepaint(false);
+    base->m_previewLabel->repaint(false);
 }
 
 void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3)
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 298e8645..4b8545e2 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -91,7 +91,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     kapp->processEvents();
 
     for (int dirNum = 101; dirNum < 999; dirNum++) {
-        slidePath = TQString("/DCIM/%1MSPJP").tqarg(dirNum);
+        slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
         if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) )
             break;
     }
@@ -198,7 +198,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
 
     // DCIM path 1, 68 bytes null padded
     char buff[68];
-    strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 );
+    strncpy( buff, TQString("%1").arg(slidePath).ascii(), 67 );
     buff[67] = 0x00;
     sppStream.writeRawBytes( buff, 68 );
     sppStream << (TQ_UINT32)0x00000001; // fixed value
@@ -444,7 +444,7 @@ void KPrMSPresentationSetup::finish()
     if ( !KIO::NetAccess::exists(pathname, false, this) ) {
         TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                             "Do you want create it?</qt>" );
-        if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
+        if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
                                         i18n( "Directory Not Found" ) )
             == KMessageBox::Yes)
             {
@@ -471,7 +471,7 @@ void KPrMSPresentationSetup::finish()
         if ( KMessageBox::warningYesNo( 0,
                                    i18n( "You are about to overwrite an existing index "
                                          "file : %1.\n "
-                                         "Do you want to proceed?" ).tqarg( sppFile ),
+                                         "Do you want to proceed?" ).arg( sppFile ),
                                    i18n( "Overwrite Presentation" ) )
              == KMessageBox::No) {
             path->setFocus();
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index 576b11cc..80b93552 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -174,7 +174,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const
         if ( !firstText )
             allText += TQString("\n\n");
 
-        allText += i18n( "Slide Note %1:\n" ).tqarg( pageCount );
+        allText += i18n( "Slide Note %1:\n" ).arg( pageCount );
         if(noteIsEmpty && !doc->pageList().at(i)->noteText().isEmpty())
             noteIsEmpty = false;
         allText += doc->pageList().at(i)->noteText();
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index 5a03896a..8bc6089d 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -357,7 +357,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const
         transX.setNum( trans.x(), 'g', DBL_DIG );
         TQCString transY;
         transY.setNum( trans.y(), 'g', DBL_DIG );
-        TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() );
+        TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() );
         xmlWriter.addAttribute( "draw:transform", str );
     }
     else
@@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o
 {
     if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() )
     {
-        animation.startElement( "presentation:show-tqshape" );
-        animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:show-shape" );
+        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
         animation.addAttribute( "koffice:order-id", appearStep );
 
         switch( effect )
@@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o
     //FIXME oo doesn't support hide animation object
     if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty())
     {
-        animation.startElement( "presentation:hide-tqshape" );
-        animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:hide-shape" );
+        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
         animation.addAttribute( "koffice:order-id", disappearStep );
         switch( effect3 )
         {
@@ -1743,14 +1743,14 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa
         int tmpY = int( ( *it ).y() * 10000 );
         // no space allows before first element
         if ( !listOfPoint.isEmpty() )
-            listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
+            listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY );
         else
-            listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY );
+            listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
         maxX = TQMAX( maxX, tmpX );
         maxY = TQMAX( maxY, tmpY );
     }
     sc.xmlWriter.addAttribute("draw:points", listOfPoint );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) );
     return true;
 }
 
diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp
index d1afdd8b..a6938d82 100644
--- a/kpresenter/KPrPBPreview.cpp
+++ b/kpresenter/KPrPBPreview.cpp
@@ -55,7 +55,7 @@ void KPrPBPreview::resizeEvent( TQResizeEvent *e )
     {
 #if 1
         gradient->setSize( contentsRect().size() );
-        tqrepaint();
+        repaint();
 #endif
     }
 }
@@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _
     gradient->setUnbalanced( _unbalanced );
     gradient->setXFactor( _xfactor );
     gradient->setYFactor( _yfactor );
-    tqrepaint( false );
+    repaint( false );
 }
 
 
diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h
index c3ba061e..a3f1b283 100644
--- a/kpresenter/KPrPBPreview.h
+++ b/kpresenter/KPrPBPreview.h
@@ -49,21 +49,21 @@ public:
 
     KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen );
     ~KPrPBPreview();
-    void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); }
-    void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); }
-    void setLineBegin( LineEnd lb ) { lineBegin = lb; tqrepaint( true ); }
-    void setLineEnd( LineEnd le ) { lineEnd = le; tqrepaint( true ); }
-    void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } tqrepaint( true ); }
-    void setPaintType( PaintType pt ) { paintType = pt; tqrepaint(true); }
+    void setPen( const KoPen &_pen ) { pen = _pen; repaint( true ); }
+    void setBrush( const TQBrush &_brush ) { brush = _brush; repaint( true ); }
+    void setLineBegin( LineEnd lb ) { lineBegin = lb; repaint( true ); }
+    void setLineEnd( LineEnd le ) { lineEnd = le; repaint( true ); }
+    void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } repaint( true ); }
+    void setPaintType( PaintType pt ) { paintType = pt; repaint(true); }
 
     void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t,
                       bool _unbalanced, int _xfactor, int _yfactor );
-    void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); tqrepaint( false ); }
-    void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); tqrepaint( false ); }
-    void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); tqrepaint( false ); }
-    void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); tqrepaint( false ); }
-    void setXFactor( int i ) { gradient->setXFactor( i ); tqrepaint( false ); }
-    void setYFactor( int i ) { gradient->setYFactor( i ); tqrepaint( false ); }
+    void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); repaint( false ); }
+    void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); repaint( false ); }
+    void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); repaint( false ); }
+    void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); repaint( false ); }
+    void setXFactor( int i ) { gradient->setXFactor( i ); repaint( false ); }
+    void setYFactor( int i ) { gradient->setYFactor( i ); repaint( false ); }
 
 protected:
     void drawContents( TQPainter *p );
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index d8e65bac..3eff9180 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -524,7 +524,7 @@ TQDomElement KPrPage::save( TQDomDocument &doc )
 
 TQString KPrPage::oasisNamePage( int posPage ) const
 {
-    return  ( m_manualTitle.isEmpty() ?  TQString( "page%1" ).tqarg( posPage ) : m_manualTitle );
+    return  ( m_manualTitle.isEmpty() ?  TQString( "page%1" ).arg( posPage ) : m_manualTitle );
 }
 
 bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context,
@@ -881,7 +881,7 @@ void KPrPage::unifyObjectName( KPrObject *object ) {
         if ( rx.search( objectName ) != -1 ) {
             objectName.remove( rx );
         }
-        objectName += TQString(" (%1)").tqarg( count );
+        objectName += TQString(" (%1)").arg( count );
         object->setObjectName( objectName );
     }
 }
@@ -930,7 +930,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects )
         if ( usedPageNames.contains( objectName ) )
         {
             usedPageNames[objectName]++;
-            objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] );
+            objectName += TQString(" (%1)").arg( usedPageNames[objectName] );
             ( *oIt )->setObjectName( objectName );
         }
         m_objectList.append( *oIt );
@@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle,
         _tempObj->moveBy( moveX*(double)mod,moveY*(double)mod);
         _tempObj->setSelected( true );
         if ( angle == 0.0 || (increaseY == 0.0 && increaseX == 0.0))
-            m_doc->tqrepaint(_tempObj);
+            m_doc->repaint(_tempObj);
     }
 
     if ( angle != 0.0)
@@ -1344,14 +1344,14 @@ KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString&  text
     KPrTextObject *kptextobject = new KPrTextObject( m_doc );
     insertObject( i18n( "Insert Textbox" ), kptextobject, r );
     //TODO create macro command : now insertObject can return KCommand
-    //TODO fix tqrepaint object
+    //TODO fix repaint object
     if (  !text.isEmpty() )
     {
         KPrTextView *view =  kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L );
         view->insertText( text );
         view->terminate();
         delete view;
-        m_doc->tqrepaint( kptextobject );
+        m_doc->repaint( kptextobject );
     }
     return kptextobject;
 }
@@ -1461,7 +1461,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e )
     insertObject( i18n( "Embed Object" ), kppartobject, _rect );
 
     //emit sig_insertObject( ch, kppartobject );
-    m_doc->tqrepaint( false );
+    m_doc->repaint( false );
 
     return kppartobject;
 }
@@ -1534,7 +1534,7 @@ void KPrPage::slotRepaintVariable()
     for ( ; it.current() ; ++it )
     {
         if ( it.current()->getType() == OT_TEXT )
-            m_doc->tqrepaint( it.current() );
+            m_doc->repaint( it.current() );
     }
 }
 
@@ -1545,7 +1545,7 @@ void KPrPage::recalcPageNum()
     {
         if ( it.current()->getType() == OT_TEXT ) {
             ( (KPrTextObject*)it.current() )->recalcPageNum( this );
-            m_doc->tqrepaint( it.current() ); // TODO only if something changed
+            m_doc->repaint( it.current() ); // TODO only if something changed
         }
     }
 }
@@ -1605,7 +1605,7 @@ void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos )
         //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl;
         kppixmapobject->setOrig(0,0);
         kppixmapobject->setSize(w, h);
-        m_doc->tqrepaint( false );
+        m_doc->repaint( false );
     }
 }
 
@@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const
     {
         // MASTERPAGE
         if ( m_masterPage )
-            title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 );
+            title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 );
         else
             title = i18n( "Slide Master" );
     }
@@ -1990,7 +1990,7 @@ void KPrPage::deSelectAllObj()
 void KPrPage::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    m_doc->tqrepaint( kpobject );
+    m_doc->repaint( kpobject );
 }
 
 TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset,
@@ -2158,8 +2158,8 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy)
             _objects.append( it.current() );
             TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() );
             br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) );
-            m_doc->tqrepaint( br ); // Previous position
-            m_doc->tqrepaint( it.current() ); // New position
+            m_doc->repaint( br ); // Previous position
+            m_doc->repaint( it.current() ); // New position
             createCommand=true;
         }
     }
@@ -2189,8 +2189,8 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key)
 
             it.current()->moveBy( _move );
             _objects.append( it.current() );
-            m_doc->tqrepaint( oldBoundingRect );
-            m_doc->tqrepaint( it.current() );
+            m_doc->repaint( oldBoundingRect );
+            m_doc->repaint( it.current() );
         }
     }
 
@@ -2208,7 +2208,7 @@ void KPrPage::repaintObj()
     for ( ; it.current() ; ++it )
     {
         if(it.current()->isSelected())
-            m_doc->tqrepaint(it.current() );
+            m_doc->repaint(it.current() );
     }
 }
 
@@ -2388,7 +2388,7 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj)
         {
             static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true);
             if(refreshTextObj)
-                m_doc->tqrepaint( oIt.current() );
+                m_doc->repaint( oIt.current() );
         }
     }
 }
@@ -2446,7 +2446,7 @@ void KPrPage::changeTabStopValue ( double _tabStop )
             {
                 obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop ));
                 obj->tqlayout();
-                m_doc->tqrepaint( obj );
+                m_doc->repaint( obj );
             }
         }
     }
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index a7c3093b..b358fd55 100644
--- a/kpresenter/KPrPageEffects.cpp
+++ b/kpresenter/KPrPageEffects.cpp
@@ -440,7 +440,7 @@ bool KPrPageEffects::effectSurround1() const
     int repaint_w = w;
 
     bool finished = false;
-    bool tqrepaint= false;
+    bool repaint= false;
     int rh = 0;
     int rw = 0;
     int repaint_rh = 0;
@@ -454,7 +454,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= m_height )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - repaint_h;
             repaint_rw = step - m_height + repaint_w;
@@ -469,7 +469,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= m_height + m_width - repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize );
             repaint_rw = m_width - repaint_w;
@@ -484,7 +484,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >=  2 * m_height - repaint_h + m_width - repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = 0;
             repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize );
@@ -499,7 +499,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w;
             repaint_rw = repaint_w;
@@ -514,7 +514,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >=  3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - 2 * repaint_h;
             repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w;
@@ -529,7 +529,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize );
             repaint_rw = m_width - 2 * repaint_w;
@@ -544,7 +544,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = repaint_h;
             repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize );
@@ -559,7 +559,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w;
             repaint_rw = 2 * repaint_w;
@@ -574,7 +574,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - 3 * repaint_h;
             repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w;
@@ -589,7 +589,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize );
             repaint_rw = m_width - 3 * repaint_w;
@@ -604,7 +604,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = 2 * repaint_h;
             repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize );
@@ -619,7 +619,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w;
             repaint_rw = 3 * repaint_w;
@@ -634,7 +634,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - 4 * repaint_h;
             repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w;
@@ -649,7 +649,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize );
             repaint_rw = m_width - 4 * repaint_w;
@@ -664,7 +664,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = 3 * repaint_h;
             repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize );
@@ -679,7 +679,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w;
             repaint_rw = 4 * repaint_w;
@@ -694,7 +694,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - 5 * repaint_h;
             repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w;
@@ -709,7 +709,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w )
         {
-            tqrepaint = true;
+            repaint = true;
 
             repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize );
             repaint_rw = m_width - 5 * repaint_w;
@@ -737,7 +737,7 @@ bool KPrPageEffects::effectSurround1() const
 
     bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h );
 
-    if ( tqrepaint )
+    if ( repaint )
     {
         bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h );
     }
diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp
index 9f903608..42054ded 100644
--- a/kpresenter/KPrPartObject.cpp
+++ b/kpresenter/KPrPartObject.cpp
@@ -68,7 +68,7 @@ bool KPrPartObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
     kdDebug() << "KPrPartObject::saveOasisPart " << sc.partIndexObj << endl;
 
     sc.xmlWriter.startElement( "draw:object" );
-    const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 );
     ++sc.partIndexObj;
     child->saveOasisAttributes( sc.xmlWriter, name );
 
@@ -152,7 +152,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler,
 void KPrPartObject::slot_changed( KoChild *_koChild )
 {
     KoTextZoomHandler* zh = child->parent()->zoomHandler();
-    KoRect g = zh->unzoomRect( _koChild->tqgeometry() );
+    KoRect g = zh->unzoomRect( _koChild->geometry() );
     KPrObject::setOrig( g.x(), g.y() );
     KPrObject::setSize( g.width(), g.height() );
 }
diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp
index a2eafde8..ba0c8b33 100644
--- a/kpresenter/KPrPicturePreview.cpp
+++ b/kpresenter/KPrPicturePreview.cpp
@@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture()
     if ( mirrorType != PM_NORMAL )
     {
         mirrorType = PM_NORMAL;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture()
     if ( mirrorType != PM_HORIZONTAL )
     {
         mirrorType = PM_HORIZONTAL;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture()
     if ( mirrorType != PM_VERTICAL )
     {
         mirrorType = PM_VERTICAL;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture()
     if ( mirrorType != PM_HORIZONTALANDVERTICAL )
     {
         mirrorType = PM_HORIZONTALANDVERTICAL;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0()
     if ( depth !=0 )
     {
         depth = 0;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1()
     if ( depth != 1 )
     {
         depth = 1;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8()
     if ( depth != 8)
     {
         depth = 8;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16()
     if ( depth != 16 )
     {
         depth = 16;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32()
     if ( depth !=32 )
     {
         depth = 32;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on )
     if ( swapRGB != _on )
     {
         swapRGB = _on;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on )
     if ( grayscal != _on )
     {
         grayscal = _on;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value )
     if ( bright != _value )
     {
         bright = _value;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth)
     if ( _depth != depth )
     {
         depth = _depth;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -292,7 +292,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
     if ( mirrorType != _t )
     {
         mirrorType = _t;
-        tqrepaint( false );
+        repaint( false );
     }
 }
 
@@ -300,7 +300,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
 void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap)
 {
     origPixmap = _pixmap;
-    tqrepaint( false );
+    repaint( false );
 }
 
 
diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h
index 1f3ca45f..21be8531 100644
--- a/kpresenter/KPrPiePreview.h
+++ b/kpresenter/KPrPiePreview.h
@@ -39,13 +39,13 @@ public:
     ~KPrPiePreview() {}
 
     void setAngle( int _angle )
-        { angle = _angle; tqrepaint( true ); }
+        { angle = _angle; repaint( true ); }
     void setLength( int _len )
-        { len = _len; tqrepaint( true ); }
+        { len = _len; repaint( true ); }
     void setType( PieType _type )
-        { type = _type; tqrepaint( true ); }
+        { type = _type; repaint( true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; tqrepaint( true ); }
+        { pen = _pen; brush = _brush; repaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp
index a1fb0564..86fc4641 100644
--- a/kpresenter/KPrPointObject.cpp
+++ b/kpresenter/KPrPointObject.cpp
@@ -100,7 +100,7 @@ TQDomDocumentFragment KPrPointObject::save( TQDomDocument& doc, double offset )
 
 const char * KPrPointObject::getOasisElementName() const
 {
-    return "draw:custom-tqshape";
+    return "draw:custom-shape";
 }
 
 void KPrPointObject::loadOasisMarker( KoOasisContext & context )
diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp
index cd419aec..8283a4c5 100644
--- a/kpresenter/KPrPolyLineObjectIface.cpp
+++ b/kpresenter/KPrPolyLineObjectIface.cpp
@@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj )
 
 void KPrPolyLineObjectIface::horizontalFlip()
 {
-    //todo tqrepaint it
+    //todo repaint it
     obj->flip(true );
 }
 
 void KPrPolyLineObjectIface::verticalFlip()
 {
-    //todo tqrepaint it
+    //todo repaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp
index 451b1a48..2f621df9 100644
--- a/kpresenter/KPrPolygonObject.cpp
+++ b/kpresenter/KPrPolygonObject.cpp
@@ -75,7 +75,7 @@ bool KPrPolygonObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
     sc.xmlWriter.addAttribute( "draw:concave", checkConcavePolygon ? "true" : "false" );
     if ( checkConcavePolygon )
     {
-        sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) );
+        sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").arg( sharpnessValue ) );
     }
 
     return true;
diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp
index e41e9c6f..545472a3 100644
--- a/kpresenter/KPrPolygonPreview.cpp
+++ b/kpresenter/KPrPolygonPreview.cpp
@@ -85,35 +85,35 @@ void KPrPolygonPreview::drawContents( TQPainter *painter )
 void KPrPolygonPreview::slotConvexConcave( bool convexConcave )
 {
     isConcave = convexConcave;
-    tqrepaint();
+    repaint();
 }
 
 
 void KPrPolygonPreview::slotConvexPolygon()
 {
     isConcave = false;
-    tqrepaint();
+    repaint();
 }
 
 
 void KPrPolygonPreview::slotConcavePolygon()
 {
     isConcave = true;
-    tqrepaint();
+    repaint();
 }
 
 
 void KPrPolygonPreview::slotCornersValue( int value )
 {
     nCorners = value;
-    tqrepaint();
+    repaint();
 }
 
 
 void KPrPolygonPreview::slotSharpnessValue( int value )
 {
     sharpness = value;
-    tqrepaint();
+    repaint();
 }
 
 
diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h
index 4d6cc248..4a95a139 100644
--- a/kpresenter/KPrPolygonPreview.h
+++ b/kpresenter/KPrPolygonPreview.h
@@ -40,7 +40,7 @@ public:
     ~KPrPolygonPreview() {}
 
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; tqrepaint( true ); }
+        { pen = _pen; brush = _brush; repaint( true ); }
 
 public slots:
     void slotConvexConcave( bool convexConcave );
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index 34f578f6..67813eb1 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -71,7 +71,7 @@ void KPrPresDurationDia::setupSlideList( TQWidget *_page )
         if ( doc->pageList().at( i )->isSlideSelected() ) {
             KListViewItem *item = new KListViewItem( slides );
             item->setPixmap( 0, KPBarIcon( "slide" ) );
-            item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
+            item->setText( 0, TQString( "%1" ).arg( i + 1 ) );
             item->setText( 1, *m_durationListString.at( i ) );
             item->setText( 2, doc->pageList().at( i )->pageTitle() );
         }
diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h
index bf539132..d1dd20bb 100644
--- a/kpresenter/KPrRectPreview.h
+++ b/kpresenter/KPrRectPreview.h
@@ -37,9 +37,9 @@ public:
     ~KPrRectPreview() {}
 
     void setRnds( int _rx, int _ry )
-        { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); }
+        { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; tqrepaint( true ); }
+        { pen = _pen; brush = _brush; repaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 4988a5bb..be2e4079 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -672,7 +672,7 @@ void OutlineSlideItem::updateTitle()
 {
     TQString title = m_page->pageTitle();
     if ( ! m_page->isSlideSelected() )
-        title = i18n( "(%1)" ).tqarg( title );
+        title = i18n( "(%1)" ).arg( title );
     setText( 0, title );
 }
 
@@ -935,7 +935,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
         m_doc->deSelectAllObj();
         m_view->getCanvas()->selectObj( object );
         m_view->showObjectRect( object );
-        m_doc->tqrepaint( false );
+        m_doc->repaint( false );
     }
 }
 
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index f0b3a05b..9afecb25 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -198,7 +198,7 @@ void KPrSlideTransitionDia::preview()
 
         delete m_pageEffect;
         m_pageEffect = 0;
-        m_dialog->previewPixmap->tqrepaint();
+        m_dialog->previewPixmap->repaint();
     }
 
     m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed );
@@ -271,7 +271,7 @@ TQString KPrSlideTransitionDia::getSoundFileFilter()
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 54934755..6c16133e 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const
     if ( bright != 0.0 )
         styleobjectauto.addPropertyPt("fo:padding-right", bright );
 
-    //add vertical tqalignment
+    //add vertical alignment
     switch( m_textVertAlign )
     {
     case KP_TOP:
@@ -272,15 +272,15 @@ void KPrTextObject::loadOasis(const TQDomElement &element, KoOasisContext& conte
     if( styleStack.hasAttributeNS( KoXmlNS::fo, "padding-right" ) )
         bright = KoUnit::parseValue( styleStack.attributeNS( KoXmlNS::fo, "padding-right" ) );
     kdDebug()<<" KPrTextObject::loadOasis : btp :"<<btop<<" bbottom :"<<bbottom<<" bleft :"<<bleft<<" bright :"<<bright<<endl;
-    // vertical tqalignment
+    // vertical alignment
     if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) )
     {
-        TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
-        if ( tqalignment == "top" )
+        TQString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
+        if ( alignment == "top" )
             m_textVertAlign= KP_TOP;
-        else if ( tqalignment == "middle" )
+        else if ( alignment == "middle" )
             m_textVertAlign= KP_CENTER;
-        else if ( tqalignment == "bottom" )
+        else if ( alignment == "bottom" )
             m_textVertAlign= KP_BOTTOM;
     }
     kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign==  KP_CENTER ) ? "center": "bottom" )<<endl;
@@ -871,7 +871,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
     if ( !n.isNull() )
     {
         TQFontDatabase fdb;
-        TQStringList families = fdb.tqfamilies();
+        TQStringList families = fdb.families();
         if ( families.findIndex( n.attribute( attrFamily ) ) != -1 )
             fn.setFamily( n.attribute( attrFamily ) );
         else
@@ -1287,7 +1287,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page )
             }
 
             var->resize();
-            var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting !
+            var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting !
             var->paragraph()->setChanged( true );
         }
     }
@@ -1295,17 +1295,17 @@ void KPrTextObject::recalcPageNum( KPrPage *page )
 
 void KPrTextObject::tqlayout()
 {
-    tqinvalidate();
+    invalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KPrTextObject::tqinvalidate()
+void KPrTextObject::invalidate()
 {
-    //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl;
+    //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
     textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() );
-    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
+    textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint
 }
 
 // For the "paragraph after paragraph" effect
@@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp )
 
 void KPrTextObject::removeHighlight ()
 {
-    m_textobj->removeHighlight( true /*tqrepaint*/ );
+    m_textobj->removeHighlight( true /*repaint*/ );
 }
 
-void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog )
+void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog )
 {
-    m_textobj->highlightPortion( parag, index, length, tqrepaint );
-    if ( tqrepaint )
+    m_textobj->highlightPortion( parag, index, length, repaint );
+    if ( repaint )
     {
         KPrDocument* doc = canvas->getView()->kPresenterDoc();
 
@@ -1616,7 +1616,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
                 // Do recalculate the new available height though
                 slotAvailableHeightNeeded();
                 m_doc->updateRuler();
-                m_doc->tqrepaint( true );
+                m_doc->repaint( true );
                 *abort = false;
             }
         }
@@ -1864,9 +1864,9 @@ void KPrTextView::updateUI( bool updateFormat, bool force  )
     KoTextView::updateUI( updateFormat, force  );
     // Paragraph settings
     KoTextParag * parag = static_cast<KoTextParag*>( cursor()->parag());
-    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.tqalignment = parag->resolveAlignment();
-        m_canvas->getView()->alignChanged(  m_paragLayout.tqalignment );
+    if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.alignment = parag->resolveAlignment();
+        m_canvas->getView()->alignChanged(  m_paragLayout.alignment );
     }
 
     // Counter
@@ -2356,7 +2356,7 @@ void KPrTextView::insertVariable( KoVariable *var, KoTextFormat *format, bool re
                               customItemsMap );
         if ( refreshCustomMenu && var->type() == VT_CUSTOM )
             kpTextObject()->kPresenterDocument()->refreshMenuCustomVariable();
-        kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() );
+        kpTextObject()->kPresenterDocument()->repaint( kpTextObject() );
     }
 }
 
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index 3bacdb69..03de6444 100644
--- a/kpresenter/KPrTextObject.h
+++ b/kpresenter/KPrTextObject.h
@@ -115,7 +115,7 @@ public:
     void applyStyleChange( KoStyleChangeDefMap changed );
 
     void removeHighlight();
-    void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 );
+    void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool repaint, KDialogBase* dialog = 0 );
 
     KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected );
 
@@ -195,7 +195,7 @@ protected:
     void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged );
     void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to );
     void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem );
-    void tqinvalidate();
+    void invalidate();
     void recalcVerticalAlignment();
     virtual KoPen defaultPen() const;
 protected slots:
diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h
index f25d6987..bedb4753 100644
--- a/kpresenter/KPrTextPreview.h
+++ b/kpresenter/KPrTextPreview.h
@@ -13,10 +13,10 @@ public:
     KPrTextPreview( TQWidget* parent, const char* name = 0 );
     ~KPrTextPreview() {}
 
-    void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); }
-    void setShadowDistance( int sd ) { shadowDistance = sd; tqrepaint( true ); }
-    void setShadowColor( const TQColor &sc ) { shadowColor = sc; tqrepaint( true ); }
-    void setAngle( double a ) { angle = a; tqrepaint( true ); }
+    void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; repaint( true ); }
+    void setShadowDistance( int sd ) { shadowDistance = sd; repaint( true ); }
+    void setShadowColor( const TQColor &sc ) { shadowColor = sc; repaint( true ); }
+    void setAngle( double a ) { angle = a; repaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 3fad79a2..a060e45f 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -105,7 +105,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed )
 
         delete m_pageEffect;
         m_pageEffect = 0;
-        TQLabel::tqrepaint();
+        TQLabel::repaint();
     }
 
     m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed );
@@ -386,7 +386,7 @@ static TQString getSoundFileFilter()
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp
index fa21141a..2cbf5dc6 100644
--- a/kpresenter/KPrUtils.cpp
+++ b/kpresenter/KPrUtils.cpp
@@ -383,7 +383,7 @@ TQString saveOasisTimer( int second )
 
     //ISO8601 chapter 5.5.3.2
     //TQDate doesn't encode it as this format.
-    TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
+    TQString timeIso = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec );
     return timeIso;
 }
 
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 13e912f1..a2781ca1 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -579,7 +579,7 @@ void KPrView::print( KPrinter &prt )
         m_pKPresenterDoc->recalcVariables( VT_ALL );
     }
 
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
     kdDebug(33001) << "KPrView::print zoom&res reset" << endl;
     m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
     m_pKPresenterDoc->recalcVariables( VT_DATE );
@@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                             if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                                 KMessageBox::sorry( this, i18n(
-                                   "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ),
+                                   "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
                                    i18n("Save Failed") );
                             }
                         }
@@ -857,7 +857,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                     }
                     else
                         KMessageBox::sorry( this, i18n(
-                            "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
+                            "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
@@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
         if ( !kPresenterDoc()->spManualSwitch() )
         {
              m_autoPresStop = false;
-             m_pKPresenterDoc->tqrepaint( false );
+             m_pKPresenterDoc->repaint( false );
 
              if ( ! m_autoPresTimerConnected ) {
                  connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) );
@@ -2414,7 +2414,7 @@ void KPrView::setupActions()
     actionToolsZoom->setExclusiveGroup( "tools" );
 
     actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle",
-                                             actionCollection(), "tools_tqshapepopup" );
+                                             actionCollection(), "tools_shapepopup" );
     actionToolsShapePopup->setDelayed(true);
     connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup()));
 
@@ -2597,7 +2597,7 @@ void KPrView::setupActions()
         // This approach allows to edit toolbars and extract separate actions from this menu
         KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/
                                                 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ),
-                                                actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() );
         act->setExclusiveGroup( "counterstyle" );
         // Add to the right menu: both for "none", bullet for bullets, numbers otherwise
         if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) {
@@ -3096,19 +3096,19 @@ void KPrView::setupActions()
     actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0,
                                                 TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ),
                                                 actionCollection(), "align_top" );
-    actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" );
     actionAlignVerticalTop->setChecked( true );
 
 
     actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ),
                                                    actionCollection(), "align_bottom" );
-    actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" );
 
     actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ),
                                                    actionCollection(), "align_center" );
-    actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" );
+    actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" );
 
 
     actionSavePicture= new KAction( i18n("Save Picture..."), 0,
@@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus()
     actionToolsLinePopup->insert(actionToolsCubicBezierCurve);
     actionToolsLinePopup->insert(actionToolsQuadricBezierCurve);
 
-    // create insert-tqshape popup
+    // create insert-shape popup
     actionToolsShapePopup->insert(actionToolsRectangle);
     actionToolsShapePopup->insert(actionToolsCircleOrEllipse);
     actionToolsShapePopup->insert(actionToolsPie);
@@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num )
     //(Laurent) deselect object when we change page.
     //otherwise you can change object properties on other page
     deSelectAllObjects();
-    m_pKPresenterDoc->tqrepaint( FALSE );
+    m_pKPresenterDoc->repaint( FALSE );
 
     m_pKPresenterDoc->displayActivePage( page );
 }
@@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo()
 {
     if (m_sbPageLabel)
         m_sbPageLabel->setText( TQString(" ") +
-                                i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+
+                                i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+
                                 TQString(" ") );
 }
 
@@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem()
             KPrObject * obj = m_canvas->getSelectedObj();
             KoSize size = obj->getSize();
             m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" )
-                    .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( size.width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) );
+                    .arg( /*frame->frameSet()->name()*/obj->getObjectName() )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
+                    .arg( KoUnit::toUserStringValue( size.width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( size.height(), unit ) ) );
         }
         else
             m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) );
@@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster )
         if ( sidebar )
             sidebar->setViewMasterPage( m_editMaster );
         updateNoteBarText();
-        m_canvas->tqrepaint( false );
+        m_canvas->repaint( false );
     }
 }
 
@@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &old, int pos )
 
     kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl;
 
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
 }
 
 void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr )
@@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin
     if ( !textdoc )
         return;
     pos += m_spell.kospell->currentStartIndex();
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
 
     KoTextCursor cursor( textdoc );
     cursor.setParag( parag );
@@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu()
             if ( !lst.contains( varName) )
             {
                 lst.append( varName );
-                TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
+                TQCString name = TQString("custom-action_%1").arg(i).latin1();
                 act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this),
                                    TQT_SLOT( insertCustomVariable() ), actionCollection(), name );
 
@@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu()
         actionInsertCustom->popupMenu()->insertSeparator();
 
     act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),
-                       TQString("custom-action_%1").tqarg(i).latin1() );
+                       TQString("custom-action_%1").arg(i).latin1() );
     act->setGroup( "custom-variable-action" );
     actionInsertCustom->insert( act );
 
@@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler()
                 if( getHRuler()->flags()!= flags )
                 {
                     getHRuler()->changeFlags(flags);
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
             if( getVRuler())
@@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler()
                 if( getVRuler()->flags() != 0 )
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
         }
@@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom )
         qHeapSort( list );
 
         for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-            lst.append( i18n("%1%").tqarg(*it) );
+            lst.append( i18n("%1%").arg(*it) );
     }
     else
     {
-        lst << i18n("%1%").tqarg("33");
-        lst << i18n("%1%").tqarg("50");
-        lst << i18n("%1%").tqarg("75");
-        lst << i18n("%1%").tqarg("100");
-        lst << i18n("%1%").tqarg("125");
-        lst << i18n("%1%").tqarg("150");
-        lst << i18n("%1%").tqarg("200");
-        lst << i18n("%1%").tqarg("250");
-        lst << i18n("%1%").tqarg("350");
-        lst << i18n("%1%").tqarg("400");
-        lst << i18n("%1%").tqarg("450");
-        lst << i18n("%1%").tqarg("500");
+        lst << i18n("%1%").arg("33");
+        lst << i18n("%1%").arg("50");
+        lst << i18n("%1%").arg("75");
+        lst << i18n("%1%").arg("100");
+        lst << i18n("%1%").arg("125");
+        lst << i18n("%1%").arg("150");
+        lst << i18n("%1%").arg("200");
+        lst << i18n("%1%").arg("250");
+        lst << i18n("%1%").arg("350");
+        lst << i18n("%1%").arg("400");
+        lst << i18n("%1%").arg("450");
+        lst << i18n("%1%").arg("500");
     }
     actionViewZoom->setItems( lst );
 }
@@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom )
 void KPrView::showZoom( int zoom )
 {
     TQStringList list = actionViewZoom->items();
-    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
+    TQString zoomStr( i18n("%1%").arg( zoom ) );
     int pos = list.findIndex(zoomStr);
     if( pos == -1)
     {
@@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s )
     }
 
     m_canvas->setFocus();
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
 }
 
 void KPrView::setZoomRect( const KoRect & rect )
@@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect )
     m_canvas->setToolEditMode( TEM_MOUSE );
     m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) );
     m_canvas->setUpdatesEnabled( true );
-    m_canvas->tqrepaint();
+    m_canvas->repaint();
 }
 
 void KPrView::setZoom( int zoom, bool updateViews )
@@ -5361,7 +5361,7 @@ void KPrView::slotViewFormattingChars()
 {
     m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked());
     m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 void KPrView::setPageDuration( int _pgNum )
@@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines()
     m_pKPresenterDoc->updateGuideLineButton();
     deSelectAllObjects();
     refreshRuler( state );
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 
@@ -5656,7 +5656,7 @@ void KPrView::viewGrid()
     m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() );
     m_pKPresenterDoc->setModified( true );
     m_pKPresenterDoc->updateGridButton();
-    m_pKPresenterDoc->tqrepaint(false);
+    m_pKPresenterDoc->repaint(false);
 }
 
 
@@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getHRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getHRuler()->tqrepaint();
+            getHRuler()->repaint();
         }
         else
         {
@@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getHRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
             else
@@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != 0 )
                 {
                     getHRuler()->changeFlags( 0 );
-                    getHRuler()->tqrepaint();
+                    getHRuler()->repaint();
                 }
             }
         }
@@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getVRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getVRuler()->tqrepaint();
+            getVRuler()->repaint();
         }
         else
         {
@@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getVRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
             else
@@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags()!= 0)
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->tqrepaint();
+                    getVRuler()->repaint();
                 }
             }
         }
@@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged()
         KoParagCounter counter;
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
-        int align = paragLayout->tqalignment;
+        int align = paragLayout->alignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         alignChanged( align );
@@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode()
             getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             getHRuler()->changeFlags(0);
-        getHRuler()->tqrepaint();
+        getHRuler()->repaint();
     }
 }
 
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index 1fc3cc7e..f00b7e2d 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -1172,7 +1172,7 @@ private:
 
     CurrentLineTool m_currentLineTool;
 
-    // store the currently selected tqshape-tool
+    // store the currently selected shape-tool
     enum CurrentShapeTool {
         StRectangle = 1,
         StCircle = 2,
diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp
index 6f8aa314..49c2d887 100644
--- a/kpresenter/KPrViewIface.cpp
+++ b/kpresenter/KPrViewIface.cpp
@@ -642,9 +642,9 @@ TQStringList KPrViewIface::exportPage( int _nPage,
                         //       see http://www.indeview.org for details.
                         // Note: We use the 1-based page number as fallback page title.
                         res << TQString("Name=%1")
-                                .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) );
+                                .arg( page->pageTitle( TQString("Page%1").arg(_nPage) ) );
                         res << TQString("Notes=%1")
-                                .tqarg( page->noteText() );
+                                .arg( page->noteText() );
                     }
                 }
             }
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 40ad82be..0d490cf4 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
             {
                 if (!codec->canEncode(ch))
                 {
-                    strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                    strReturn+=TQString("&#%1;").arg(ch.tqunicode());
                     break;
                 }
             }
@@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str
         {
             if (!codec->canEncode(ch))
             {
-                strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                strReturn+=TQString("&#%1;").arg(ch.tqunicode());
                 continue;
             }
         }
@@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig()
     if ( num <= slideInfos.count() ) {
         for ( unsigned int i = 0; i < num; i++ )
         {
-            TQString key = TQString::fromLatin1( "SlideTitle%1" ).tqarg( i );
+            TQString key = TQString::fromLatin1( "SlideTitle%1" ).arg( i );
             if ( cfg.hasKey( key ) )
             {
                 // We'll assume that the selected pages haven't changed... Hmm.
@@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig()
     cfg.writeEntry( "Slides", slideInfos.count() );
 
     for ( unsigned int i = 0; i < slideInfos.count(); i++ )
-        cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle );
+        cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle );
 
     cfg.writeEntry( "BackColor", backColor );
     cfg.writeEntry( "TitleColor", titleColor );
@@ -310,7 +310,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
     for ( unsigned int i = 0; i < slideInfos.count(); i++ ) {
         int pgNum = slideInfos[i].pageNumber;
         view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ );
-        filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 );
+        filename = TQString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 );
 
         KTempFile tmp;
         pix.save( tmp.name(), "PNG" );
@@ -395,8 +395,8 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
 
         unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides
         KTempFile tmp;
-        TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum );
-        TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
+        TQString dest= TQString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum );
+        TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
 
         TQFile file( tmp.name() );
         file.open( IO_WriteOnly );
@@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             streamOut << "<a href=\"" << next << "\">";
 
 	    streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\""
-                      << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
+                      << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
 
 	    if ( i < slideInfos.count() - 1 )
                 streamOut << "</a>";
@@ -509,9 +509,9 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             if (email.isEmpty())
                 htmlAuthor=escapeHtmlText( codec, author );
             else
-                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
+                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
             streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                          .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) );
+                                          .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
             streamOut << "    </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
         }
@@ -532,7 +532,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 {
     TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
     KTempFile tmp;
-    TQString dest = TQString( "%1/index.html" ).tqarg( path );
+    TQString dest = TQString( "%1/index.html" ).arg( path );
     TQFile file( tmp.name() );
     file.open( IO_WriteOnly );
     TQTextStream streamOut( &file );
@@ -560,9 +560,9 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 
     // footer: author name, e-mail
     TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
-                         TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
+                         TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
     streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                      .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) );
+                                      .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
     streamOut << "</body>\n</html>\n";
     file.close();
@@ -1081,7 +1081,7 @@ void KPrWebPresentationWizard::pageChanged()
         {
             TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                                 "Do you want create it?</qt>" );
-            if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
+            if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
                                             i18n( "Directory Not Found" ) )
                 == KMessageBox::Yes)
             {
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 7043a692..5914a621 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -86,7 +86,7 @@ void AFChoose::setupTabs()
         for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next())
         {
             grpPtr->tab = new TQVBox(this);
-            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) );
+            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) );
             grpPtr->loadWid = new KIconCanvas(grpPtr->tab);
             // Changes for the new KIconCanvas (Werner)
             TQDir d( grpPtr->dir.absFilePath() );
diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp
index 5f010518..0f01368a 100644
--- a/kpresenter/autoformEdit/ATFInterpreter.cpp
+++ b/kpresenter/autoformEdit/ATFInterpreter.cpp
@@ -199,7 +199,7 @@ TQPointArray ATFInterpreter::getPointArray(int wid,int heig)
                     if (i == 14) py = tmp;
                 }
             }
-            pntArray.setPoint(coordList.tqat(),px,py);
+            pntArray.setPoint(coordList.at(),px,py);
         }
     }
     return pntArray;
@@ -239,7 +239,7 @@ void ATFInterpreter::interpret()
 
     for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it)
     {
-        if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT)
+        if (!(*it).isEmpty() && (*it).at(0) != COMMENT)
         {
             if (level.top() == LEVEL_NULL)
             {
@@ -265,7 +265,7 @@ void ATFInterpreter::interpret()
             }
             else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR)
             {
-                switch (((*it).tqat(0)).latin1())
+                switch (((*it).at(0)).latin1())
                 {
                 case VAR_1:
                 {
@@ -310,7 +310,7 @@ void ATFInterpreter::interpret()
                 } break;
                 case VAR_PW:
                 {
-                    pw = 1; pw = ((*it).tqat(4)).latin1() - 48;
+                    pw = 1; pw = ((*it).at(4)).latin1() - 48;
                     attrib.pwDiv = (*it);
                 } break;
                 case '}':
@@ -363,10 +363,10 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
 
     for (unsigned int i=1; i<s.length(); ++i)
     {
-        if(s.tqat(i)==' ')
+        if(s.at(i)==' ')
             continue;
         signPtr = new Sign;
-        switch (s.tqat(i).latin1())
+        switch (s.at(i).latin1())
         {
         case VAR_W: signPtr->type = ST_WIDTH; break;
         case VAR_H: signPtr->type = ST_HEIGHT; break;
@@ -431,20 +431,20 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
             signPtr->type = ST_NUMBER;
             if (s.length() - 1 > i)
             {
-                switch (s.tqat(i+1).latin1())
+                switch (s.at(i+1).latin1())
                 {
                 case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4:
                 case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9:
                 {
-                    signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48;
+                    signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48;
                     i++;
                 } break;
                 default:
-                    signPtr->num = s.tqat(i).latin1() - 48; break;
+                    signPtr->num = s.at(i).latin1() - 48; break;
                 }
             }
             else
-                signPtr->num = s.tqat(i).latin1() - 48;
+                signPtr->num = s.at(i).latin1() - 48;
         } break;
         }
         list.append(signPtr);
diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui
index 84d38866..ec1f9959 100644
--- a/kpresenter/imageEffectBase.ui
+++ b/kpresenter/imageEffectBase.ui
@@ -60,7 +60,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -648,7 +648,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -672,7 +672,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -794,7 +794,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -818,7 +818,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl
index 60aa3fb3..524b3d8d 100644
--- a/kpresenter/kprconverter.pl
+++ b/kpresenter/kprconverter.pl
@@ -43,9 +43,9 @@ while (<INPUT>)
       # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right
       # In the new one it's align="..." and uses the Qt::AlignmentFlags enums.
       # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4
-      $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/);
-      $tqalignment =~ tr/01/14/;
-      s/horzAlign=\"[0-2]+\"/align=$tqalignment/;
+      $alignment=$1 if(/horzAlign=(\"[0-2]+\")/);
+      $alignment =~ tr/01/14/;
+      s/horzAlign=\"[0-2]+\"/align=$alignment/;
       s/>$/ type=$objType>/;
     }
   elsif (/<\/PARAGRAPH>/)
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 11184218..3c43a860 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -500,7 +500,7 @@ corresponding manipulator provides methods to store/recall the undo information)
 <p>Status: PLANNED.</p>
 
 <p>Formatting specifies how a cell should look like. It involves font
-attributes like bold or italics, vertical and horizontal tqalignment,
+attributes like bold or italics, vertical and horizontal alignment,
 rotation angle, shading, background color and so on. Each cell can have
 its own format, but bear also in mind that a whole row or column format
 should also apply.</p>
diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt
index 2eb878c8..6aebbb9e 100644
--- a/kspread/OASIS.txt
+++ b/kspread/OASIS.txt
@@ -155,29 +155,29 @@ Merged cells
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce3"/>
 
-Cell horizontal tqalignment: top
+Cell horizontal alignment: top
     <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="top"/>
     </style:style>
 
-Cell horizontal tqalignment: middle
+Cell horizontal alignment: middle
     <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="middle"/>
     </style:style>
 
-Cell horizontal tqalignment: bottom
+Cell horizontal alignment: bottom
     <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties style:vertical-align="bottom"/>
     </style:style>
 
-Cell vertical tqalignment: top
+Cell vertical alignment: top
     <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
       fo:margin-left="0in" style:vertical-align="top"/>
     </style:style>
 
-Cell vertical tqalignment: middle
+Cell vertical alignment: middle
     <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
@@ -185,7 +185,7 @@ Cell vertical tqalignment: middle
     </style:style>
 
 
-Cell vertical tqalignment: bottom
+Cell vertical alignment: bottom
     <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default">
       <style:table-cell-properties fo:text-align="center" 
       style:text-align-source="fix" style:repeat-content="none" 
diff --git a/kspread/commands.cc b/kspread/commands.cc
index a4788bda..490bee81 100644
--- a/kspread/commands.cc
+++ b/kspread/commands.cc
@@ -77,7 +77,7 @@ TQString MergeCellCommand::name() const
   if( rangeName.isEmpty() )
     return i18n("Merge Cells");
   else
-    return i18n("Merge Cells %1").tqarg( rangeName );
+    return i18n("Merge Cells %1").arg( rangeName );
 }
 
 void MergeCellCommand::execute()
@@ -174,7 +174,7 @@ void HideSheetCommand::unexecute()
 
 TQString HideSheetCommand::name() const
 {
-    TQString n = TQString( i18n("Hide Sheet %1") ).tqarg( sheetName );
+    TQString n = TQString( i18n("Hide Sheet %1") ).arg( sheetName );
     if( n.length() > 64 ) n = i18n("Hide Sheet");
     return n;
 }
@@ -205,7 +205,7 @@ void ShowSheetCommand::unexecute()
 
 TQString ShowSheetCommand::name() const
 {
-    TQString n = TQString( i18n("Show Sheet %1") ).tqarg( sheetName );
+    TQString n = TQString( i18n("Show Sheet %1") ).arg( sheetName );
     if( n.length() > 64 ) n = i18n("Show Sheet");
     return n;
 }
@@ -590,37 +590,37 @@ ChangeObjectGeometryCommand::~ChangeObjectGeometryCommand()
 
 void ChangeObjectGeometryCommand::execute()
 {
-    doc->tqrepaint( obj->tqgeometry() );
+    doc->repaint( obj->geometry() );
 
-    KoRect tqgeometry = obj->tqgeometry();
-    tqgeometry.moveBy( m_diff.x(),  m_diff.y() );
-    tqgeometry.setWidth( tqgeometry.width() + r_diff.width() );
-    tqgeometry.setHeight( tqgeometry.height() + r_diff.height() );
-    obj->setGeometry( tqgeometry );
+    KoRect geometry = obj->geometry();
+    geometry.moveBy( m_diff.x(),  m_diff.y() );
+    geometry.setWidth( geometry.width() + r_diff.width() );
+    geometry.setHeight( geometry.height() + r_diff.height() );
+    obj->setGeometry( geometry );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-    doc->tqrepaint( obj );
+    doc->repaint( obj );
 }
 
 void ChangeObjectGeometryCommand::unexecute()
 {
-  doc->tqrepaint( obj->tqgeometry() );
+  doc->repaint( obj->geometry() );
 
-  KoRect tqgeometry = obj->tqgeometry();
-  tqgeometry.moveBy( -m_diff.x(),  -m_diff.y() );
-  tqgeometry.setWidth( tqgeometry.width() - r_diff.width() );
-  tqgeometry.setHeight( tqgeometry.height() - r_diff.height() );
-  obj->setGeometry( tqgeometry );
+  KoRect geometry = obj->geometry();
+  geometry.moveBy( -m_diff.x(),  -m_diff.y() );
+  geometry.setWidth( geometry.width() - r_diff.width() );
+  geometry.setHeight( geometry.height() - r_diff.height() );
+  obj->setGeometry( geometry );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
 }
 
 TQString ChangeObjectGeometryCommand::name() const
 {
-  /*if ( fabs( obj->tqgeometry().width() - newGeometry.width() )<1e-3  && fabs( obj->tqgeometry().height() - newGeometry.height() ) < 1e-3 )
+  /*if ( fabs( obj->geometry().width() - newGeometry.width() )<1e-3  && fabs( obj->geometry().height() - newGeometry.height() ) < 1e-3 )
     return i18n("Move Object");
   else */
     return i18n("Resize Object");
@@ -665,7 +665,7 @@ void RemoveObjectCommand::execute()
   }
 
   obj->setSelected( false );
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
   executed = true;
 }
 
@@ -677,7 +677,7 @@ void RemoveObjectCommand::unexecute()
     EmbeddedKOfficeObject *eko = dynamic_cast<EmbeddedKOfficeObject *>(obj);
     eko->embeddedObject()->setDeleted(false);
   }
-  doc->tqrepaint( obj );
+  doc->repaint( obj );
   executed = false;
 }
 
@@ -689,18 +689,18 @@ TQString RemoveObjectCommand::name() const
     return i18n("Remove Object");
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
 {
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   entry = _entry;
   canvas = _canvas;
   type = OBJECT_KOFFICE_PART;
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
+InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
 {
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   entry = _entry;
   data = _data;
   canvas = _canvas;
@@ -708,10 +708,10 @@ InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEn
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry , KURL& _file, Canvas *_canvas ) //picture
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry , KURL& _file, Canvas *_canvas ) //picture
 {
   //In the case of pictures, only the top left point of the rectangle is relevant
-  tqgeometry = _tqgeometry;
+  geometry = _geometry;
   file = _file;
   canvas = _canvas;
   type = OBJECT_PICTURE;
@@ -737,7 +737,7 @@ void InsertObjectCommand::execute()
   if ( obj ) //restore the object which was removed from the object list in InsertObjectCommand::unexecute()
   {
     canvas->doc()->embeddedObjects().append( obj );
-    canvas->doc()->tqrepaint( obj );
+    canvas->doc()->repaint( obj );
   }
   else
   {
@@ -746,17 +746,17 @@ void InsertObjectCommand::execute()
     {
       case OBJECT_CHART:
       {
-        success = canvas->activeSheet()->insertChart( tqgeometry, entry, data );
+        success = canvas->activeSheet()->insertChart( geometry, entry, data );
         break;
       }
       case OBJECT_KOFFICE_PART:
       {
-        success = canvas->activeSheet()->insertChild( tqgeometry, entry );
+        success = canvas->activeSheet()->insertChild( geometry, entry );
         break;
       }
       case OBJECT_PICTURE:
       {
-        success = canvas->activeSheet()->insertPicture( tqgeometry.topLeft() , file );
+        success = canvas->activeSheet()->insertPicture( geometry.topLeft() , file );
         break;
       }
       default:
@@ -780,7 +780,7 @@ void InsertObjectCommand::unexecute()
 
   canvas->doc()->embeddedObjects().removeRef( obj );
   obj->setSelected( false );
-  canvas->doc()->tqrepaint( obj );
+  canvas->doc()->repaint( obj );
 
   executed = false;
 }
@@ -871,7 +871,7 @@ void GeometryPropertiesCommand::execute()
         {
             it.current()->setProtect( m_newValue );
             if ( it.current()->isSelected() )
-                m_doc->tqrepaint( it.current() );
+                m_doc->repaint( it.current() );
         }
         else if ( m_type == KeepRatio)
             it.current()->setKeepRatio( m_newValue );
@@ -887,7 +887,7 @@ void GeometryPropertiesCommand::unexecute()
         {
             obj->setProtect( *m_oldValue.at(i) );
             if ( obj->isSelected() )
-                m_doc->tqrepaint( obj );
+                m_doc->repaint( obj );
         }
         else if ( m_type == KeepRatio)
             obj->setKeepRatio( *m_oldValue.at(i) );
@@ -920,13 +920,13 @@ void MoveObjectByCmd::execute()
     TQRect oldRect;
 
     for ( unsigned int i = 0; i < objects.count(); i++ ) {
-        doc->tqrepaint( objects.at( i )->tqgeometry() );
+        doc->repaint( objects.at( i )->geometry() );
 
-        KoRect r = objects.at( i )->tqgeometry();
+        KoRect r = objects.at( i )->geometry();
         r.moveBy( diff.x(), diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( objects.at( i ) );
     }
 }
 
@@ -935,12 +935,12 @@ void MoveObjectByCmd::unexecute()
     TQRect oldRect;
 
     for ( unsigned int i = 0; i < objects.count(); i++ ) {
-        doc->tqrepaint( objects.at( i )->tqgeometry() );
+        doc->repaint( objects.at( i )->geometry() );
 
-        KoRect r = objects.at( i )->tqgeometry();
+        KoRect r = objects.at( i )->geometry();
         r.moveBy( -diff.x(), -diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->tqrepaint( objects.at( i ) );
+        doc->repaint( objects.at( i ) );
     }
 }
diff --git a/kspread/commands.h b/kspread/commands.h
index d0bd9132..b3622035 100644
--- a/kspread/commands.h
+++ b/kspread/commands.h
@@ -392,9 +392,9 @@ class RemoveObjectCommand : public KCommand
 class InsertObjectCommand : public KCommand
 {
   public:
-    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, Canvas *_canvas ); //child
-    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart
-    InsertObjectCommand( const KoRect& _tqgeometry, KURL& _file, Canvas *_canvas ); //picture
+    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, Canvas *_canvas ); //child
+    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart
+    InsertObjectCommand( const KoRect& _geometry, KURL& _file, Canvas *_canvas ); //picture
     ~InsertObjectCommand();
 
     virtual void execute();
@@ -402,7 +402,7 @@ class InsertObjectCommand : public KCommand
     virtual TQString name() const;
 
   protected:
-    KoRect tqgeometry;
+    KoRect geometry;
     Canvas *canvas;
     bool executed;
     KoDocumentEntry entry;
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index b7ae7fb9..0fe6fb41 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -206,7 +206,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index 91589f9f..f24e691a 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk()
        h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) ));
     return;
   }
 
   if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax )
   {
     m_pView->slotUpdateView( m_pView->activeSheet() );
-    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) ));
     return;
   }
 
@@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk()
     if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax)
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i]));
+      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i]));
       return;
     }
     if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) ||
@@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk()
 	 ( desc == D_COL && w != w2 ) )
     {
       m_pView->slotUpdateView( m_pView->activeSheet() );
-      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] );
+      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] );
       KMessageBox::error( this, tmp);
       return;
     }
@@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed()
   Range r( txt, m_pView->doc()->map() );
   if ( !r.isValid() )
   {
-    KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt ));
+    KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt ));
     return;
   }
 
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index ca1ed59c..0d957265 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -139,11 +139,11 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   Frame16Layout->addWidget( TextLabel5, 5, 0 );
   Frame5Layout->addWidget( Frame16 );
 
-  m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" );
-  m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) );
-  m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) );
-  m_databaseStatus->setText( " " );
-  Frame5Layout->addWidget( m_databaseStatus );
+  m_databasetStatus = new TQLabel( Frame5, "m_databasetStatus" );
+  m_databasetStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetStatus->sizePolicy().hasHeightForWidth() ) );
+  m_databasetStatus->setMaximumSize( TQSize( 32767, 30 ) );
+  m_databasetStatus->setText( " " );
+  Frame5Layout->addWidget( m_databasetStatus );
 
   m_databaseLayout->addWidget( Frame5, 0, 1 );
 
@@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext()
       m_dbConnection->setPort( port );
     }
 
-    m_databaseStatus->setText( i18n("Connecting to database...") );
+    m_databasetStatus->setText( i18n("Connecting to database...") );
     if ( m_dbConnection->open() )
     {
-      m_databaseStatus->setText( i18n("Connected. Retrieving table information...") );
+      m_databasetStatus->setText( i18n("Connected. Retrieving table information...") );
       TQStringList sheetList( m_dbConnection->tables() );
 
       if ( sheetList.isEmpty() )
@@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext()
       }
 
       m_sheetView->setEnabled( true );
-      m_databaseStatus->setText( " " );
+      m_databasetStatus->setText( " " );
     }
     else
     {
@@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext()
         errorMsg.append( error.databaseText() );
         errorMsg.append( "\n" );
       }
-      m_databaseStatus->setText( " " );
+      m_databasetStatus->setText( " " );
 
       KMessageBox::error( this, errorMsg );
       return false;
@@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext()
   else
   {
     KMessageBox::error( this, i18n("Driver could not be loaded") );
-    m_databaseStatus->setText( " " );
+    m_databasetStatus->setText( " " );
     return false;
   }
   setNextEnabled(m_sheet, true);
@@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext()
 
 bool DatabaseDialog::sheetsDoNext()
 {
-  m_databaseStatus->setText( i18n("Retrieving meta data of tables...") );
+  m_databasetStatus->setText( i18n("Retrieving meta data of tables...") );
   TQStringList sheets;
 
   for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling())
diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h
index 9334935c..0bb859bd 100644
--- a/kspread/dialogs/kspread_dlg_database.h
+++ b/kspread/dialogs/kspread_dlg_database.h
@@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard
   TQSqlDatabase * m_dbConnection;
 
   TQWidget      * m_database;
-  TQLabel       * m_databaseStatus;
+  TQLabel       * m_databasetStatus;
   TQLineEdit    * m_username;
   TQLineEdit    * m_port;
   TQLineEdit    * m_databaseName;
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index 6374c102..6163710b 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index )
     if ( img.isEmpty() )
     {
 	TQString str( i18n( "Could not find image %1." ) );
-	str = str.tqarg( m_entries[ index ].image );
+	str = str.arg( m_entries[ index ].image );
 	KMessageBox::error( this, str ); 
 	
 	enableButtonOK(false);
@@ -118,7 +118,7 @@ void FormatDialog::slotActivated( int index )
     if ( pix.isNull() )
     {
 	TQString str( i18n( "Could not load image %1." ) );
-	str = str.tqarg( img );
+	str = str.arg( img );
 	KMessageBox::error( this,str );
 	
 	enableButtonOK(false);
@@ -138,7 +138,7 @@ void FormatDialog::slotOk()
     if ( xml.isEmpty() )
     {
 	TQString str( i18n( "Could not find sheet-style XML file '%1'." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
@@ -152,7 +152,7 @@ void FormatDialog::slotOk()
     if ( !parseXML( doc ) )
     {
 	TQString str( i18n( "Parsing error in sheet-style XML file %1." ) );
-	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.arg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index a52d4df9..9eb92a45 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     //    m_targetCell->setCalcDirtyFlag();
     m_targetCell->calc( false );
 
-    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = false;
@@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal)
     m_targetCell->setCalcDirtyFlag();
     m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect());
     m_targetCell->calc( false );
-    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) );
     m_newValue->setText( "" );
     m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) );
     m_restored = true;
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 27e27868..f7878266 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle
     penStyle = _style;
     penColor = _color;
     penWidth = _width;
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::setUndefined()
@@ -127,7 +127,7 @@ void PatternSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void PatternSelect::slotSelect()
@@ -136,7 +136,7 @@ void PatternSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName )
     {
       KMessageBox::sorry( this,
                           i18n( "The style cannot inherit from '%1' because of recursive references." )
-                          .tqarg( m_parentBox->currentText() ) );
+                          .arg( m_parentBox->currentText() ) );
       return false;
     }
 
@@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
 
   TQStringList tmpListFont;
   TQFontDatabase *fontDataBase = new TQFontDatabase();
-  tmpListFont = fontDataBase->tqfamilies();
+  tmpListFont = fontDataBase->families();
   delete fontDataBase;
 
   family_combo->insertStringList( tmpListFont);
@@ -1996,7 +1996,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
   TQStringList lst;
   lst.append("");
   for ( unsigned int i = 1; i < 100; ++i )
-        lst.append( TQString( "%1" ).tqarg( i ) );
+        lst.append( TQString( "%1" ).arg( i ) );
 
   size_combo->insertStringList( lst );
 
@@ -2151,7 +2151,7 @@ void CellFormatPageFont::display_example(const TQFont& font)
   TQString string;
   fontChanged=true;
   example_label->setFont(font);
-  example_label->tqrepaint();
+  example_label->repaint();
 }
 
 void CellFormatPageFont::setCombos()
@@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isRowSelected )
         width->setEnabled(false);
 
-    defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName()));
+    defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName()));
     if ( dlg->isRowSelected )
         defaultWidth->setEnabled(false);
 
@@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isColumnSelected )
         height->setEnabled(false);
 
-    defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma
+    defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma
     if ( dlg->isColumnSelected )
         defaultHeight->setEnabled(false);
 
@@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p )
       vertical->setChanged(true);
     }
   }
-  area->tqrepaint();
+  area->repaint();
 }
 
 void CellFormatPageBorder::changeState( BorderButton *_p)
@@ -3243,7 +3243,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p)
     _p->setColor( colorGroup().text() );
   }
 
- area->tqrepaint();
+ area->repaint();
 }
 
 void CellFormatPageBorder::draw()
@@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     }
   }
 
-  area->tqrepaint();
+  area->repaint();
 }
 
 
@@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style )
 {
     brushStyle = _style;
     brushColor = _color;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    tqrepaint();
+    repaint();
 }
 
 void BrushSelect::slotSelect()
@@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    tqrepaint();
+    repaint();
 }
 
 
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index b8ec0bba..8d38663a 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -101,16 +101,16 @@ class PatternSelect : public TQFrame
 public:
     PatternSelect( TQWidget *parent, const char *_name );
 
-    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); }
+    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); }
     Qt::PenStyle getPenStyle() { return penStyle; }
-    void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); }
+    void setColor( const TQColor &_col ) { penColor = _col; repaint(); }
     const TQColor& getColor() { return penColor; }
-    void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); }
+    void setPenWidth( int _w ) { penWidth = _w; repaint(); }
     int getPenWidth() { return penWidth; }
 
     void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style );
     void setUndefined();
-    void setDefined() { undefined = FALSE; tqrepaint(); }
+    void setDefined() { undefined = FALSE; repaint(); }
 
     bool isDefined() { return !undefined; }
 
@@ -389,7 +389,7 @@ class BrushSelect : public TQFrame
 public:
     BrushSelect( TQWidget *parent, const char *_name );
 
-    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); }
+    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); }
     Qt::BrushStyle getBrushStyle() const { return brushStyle; }
     TQColor getBrushColor() const { return brushColor; }
     void setBrushColor(const TQColor &_c) { brushColor=_c;}
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index f0e6f664..7150b017 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     TQStringList lst;
     for( int i = 5; i < 500; i += 5 )
     {
-        lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) );
+        lst.append( TQString( i18n( "%1%" ) ).arg( i ) );
         if( tqRound( print->zoom() * 100 ) > i &&
             tqRound( print->zoom() * 100 ) < i + 5 )
         {
-            lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) );
+            lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) );
         }
     }
     m_cZoom->insertStringList( lst );
 
     int number_of_entries = m_cZoom->count();
-    TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) );
+    TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) );
     for (int i = 0; i < number_of_entries ; i++)
     {
         if ( string == (TQString) m_cZoom->text(i) )
@@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstX.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstX.append( TQString( "%1" ).tqarg( i ) );
+        lstX.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitX() > 20 )
     {
-      lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) );
+      lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) );
     }
     m_cLimitPagesX->insertStringList( lstX );
 
@@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstY.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstY.append( TQString( "%1" ).tqarg( i ) );
+        lstY.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitY() > 20 )
     {
-      lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) );
+      lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) );
     }
     m_cLimitPagesY->insertStringList( lstY );
 
@@ -407,7 +407,7 @@ void PaperLayout::slotOk()
       if ( m_rScalingZoom->isChecked() )
       {
         kdDebug() << "Zoom is selected" << endl;
-        if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
+        if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
         {
           kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl;
           TQString zoomtext = m_cZoom->currentText();
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 9d223e19..c4777a7b 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig()
 
 void parameterLocale::updateToMatchLocale(KLocale* locale)
 {
-  m_language->setText( i18n("Language: %1").tqarg( locale->language() ));
-  m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) ));
-  m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::currentDate() )));
-  m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ,true) ));
-  m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) ));
-  m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) ));
+  m_language->setText( i18n("Language: %1").arg( locale->language() ));
+  m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) ));
+  m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( TQDate::currentDate() )));
+  m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( TQDate::currentDate() ,true) ));
+  m_time->setText( i18n("Time format: %1").arg( locale->formatTime( TQTime::currentTime() ) ));
+  m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) ));
 }
 
 configure::configure( View* _view, TQVBox *box , char *name )
@@ -488,7 +488,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name )
 //   valIndent->setRange( 0.0, 100.0, 10.0 );
   valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) );
   TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) );
-  valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit)));
+  valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit)));
 
   msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox);
   msgError->setChecked(m_bMsgError);
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 1587e866..477cfd1c 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -110,7 +110,7 @@ reference::reference( View* parent, const char* name )
            TQT_SLOT(slotDoubleClicked(TQListBoxItem *)));
   connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this,
            TQT_SLOT(slotHighlighted(TQListBoxItem * )));
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
 
   resize( 250, 200 );
 }
@@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName)
     }
   }
 
-  tmpName = i18n("Area: %1").tqarg(tmpName);
+  tmpName = i18n("Area: %1").arg(tmpName);
   m_rangeName->setText(tmpName);
 }
 
@@ -206,7 +206,7 @@ void reference::slotEdit()
   EditAreaName editDlg( m_pView, "EditArea", name );
   editDlg.exec();
 
-  m_rangeName->setText(i18n("Area: %1").tqarg(""));
+  m_rangeName->setText(i18n("Area: %1").arg(""));
   TQString tmp = m_list->text(m_list->currentItem());
   if (!tmp.isEmpty())
     displayAreaValues( tmp );
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 75a50cc3..0a32a44d 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -78,9 +78,9 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         for( it = listInt.begin(); it != listInt.end(); ++it )
 	  {
 	    if(!showColNumber)
-	      listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it));
+	      listCol+=i18n("Column: %1").arg(Cell::columnName(*it));
 	    else
-	      listCol+=i18n("Column: %1").tqarg(text.setNum(*it));
+	      listCol+=i18n("Column: %1").arg(text.setNum(*it));
 	  }
         list->insertStringList(listCol);
         }
@@ -98,7 +98,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type )
         qHeapSort(listInt);
         TQValueList<int>::Iterator it;
         for( it = listInt.begin(); it != listInt.end(); ++it )
-	  listRow+=i18n("Row: %1").tqarg(text.setNum(*it));
+	  listRow+=i18n("Row: %1").arg(text.setNum(*it));
 
         list->insertStringList(listRow);
         }
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index e903fcd5..6a7b2abc 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -351,7 +351,7 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -359,13 +359,13 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		
 		if ( i == r.left() )
 		  selectionMayHaveHeader=false;
             }
     }
-     // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+     // m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
   }
   // Entire rows selected ?
   else if ( util_isRowSelected(r) )
@@ -377,7 +377,7 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i)
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -385,7 +385,7 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listRow += i18n("Row %1").tqarg(i);
+		m_listRow += i18n("Row %1").arg(i);
 		
 		if ( i == r.top() )
 		  selectionMayHaveHeader=false;
@@ -419,13 +419,13 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 		    m_listColumn += guessName + colName;
 	    else
 	    {
-		    m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
+		    m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
 		    
 		    if (i == r.left())
 		      selectionMayHaveHeader=false;
@@ -435,13 +435,13 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i) 
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").tqarg(i);
+	    TQString rowName=i18n(" (Row %1)").arg(i);
 	    
 	    if (!guessName.isEmpty())
 		    m_listRow += guessName + rowName;
 	    else
 	    {
-		    m_listRow += i18n("Row %1").tqarg(i);
+		    m_listRow += i18n("Row %1").arg(i);
 		    
 		    if (i == r.top())
 		      selectionMayHaveHeader=false;
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 787aac7c..dd0857e3 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -232,11 +232,11 @@ void StyleDlg::slotUser1()
     s = m_styleManager->defaultStyle();
 
   int i = 1;
-  TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) );
+  TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) );
   while ( m_styleManager->style( newName ) != 0 )
   {
     ++i;
-    newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i );
+    newName = i18n( "style%1" ).arg( m_styleManager->count() + i );
   }
 
   CustomStyle * style = new CustomStyle( newName, s );
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index 1b899ebf..f88f3a7f 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -243,7 +243,7 @@ void SubtotalDialog::fillColumnBoxes()
 
     if ( text.length() > 0 )
     {
-      text = col.tqarg( Cell::columnName( i ) );
+      text = col.arg( Cell::columnName( i ) );
     }
 
     m_dialog->m_columnBox->insertItem( text );
diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html
index d3c739a8..13a674db 100644
--- a/kspread/doc/PAINTING.html
+++ b/kspread/doc/PAINTING.html
@@ -129,7 +129,7 @@ that is demanded can be handled in several different ways:</p>
   <li>The content can be partially shown, i.e. cut.
 
   <li>The content can overflow into neighbor cell(s). Which cells that
-      are affected is dependent on tqalignment, if the neighbors are
+      are affected is dependent on alignment, if the neighbors are
       empty, etc, etc.  </ul>
 
 <h3>Borders and overflow</h3>
diff --git a/kspread/formula.cc b/kspread/formula.cc
index 1e42867a..0f70feaf 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -1479,10 +1479,10 @@ TQString Formula::dump() const
     compile( tokens );
   }
 
-  result = TQString("Expression: [%1]\n").tqarg( d->expression );
+  result = TQString("Expression: [%1]\n").arg( d->expression );
 #if 0
   Value value = eval();
-  result.append( TQString("Result: %1\n").tqarg(
+  result.append( TQString("Result: %1\n").arg(
       converter->asString(value).asString() ) );
 #endif
 
@@ -1491,12 +1491,12 @@ TQString Formula::dump() const
   {
     TQString vtext;
     Value val = d->constants[c];
-    if( val.isString() ) vtext = TQString("[%1]").tqarg( val.asString() );
-    else if( val.isNumber() ) vtext = TQString("%1").tqarg( val.asFloat() );
-    else if( val.isBoolean() ) vtext = TQString("%1").tqarg( val.asBoolean() ? "True":"False");
+    if( val.isString() ) vtext = TQString("[%1]").arg( val.asString() );
+    else if( val.isNumber() ) vtext = TQString("%1").arg( val.asFloat() );
+    else if( val.isBoolean() ) vtext = TQString("%1").arg( val.asBoolean() ? "True":"False");
     else if( val.isError() ) vtext = "error";
     else vtext = "???";
-    result += TQString("    #%1 = %2\n").tqarg(c).tqarg( vtext );
+    result += TQString("    #%1 = %2\n").arg(c).arg( vtext );
   }
 
   result.append("\n");
@@ -1506,9 +1506,9 @@ TQString Formula::dump() const
     TQString ctext;
     switch( d->codes[i].type )
     {
-      case Opcode::Load:     ctext = TQString("Load #%1").tqarg( d->codes[i].index ); break;
-      case Opcode::Ref:      ctext = TQString("Ref #%1").tqarg( d->codes[i].index ); break;
-      case Opcode::Function: ctext = TQString("Function (%1)").tqarg( d->codes[i].index ); break;
+      case Opcode::Load:     ctext = TQString("Load #%1").arg( d->codes[i].index ); break;
+      case Opcode::Ref:      ctext = TQString("Ref #%1").arg( d->codes[i].index ); break;
+      case Opcode::Function: ctext = TQString("Function (%1)").arg( d->codes[i].index ); break;
       case Opcode::Add:      ctext = "Add"; break;
       case Opcode::Sub:      ctext = "Sub"; break;
       case Opcode::Mul:      ctext = "Mul"; break;
diff --git a/kspread/kspread_brush.cc b/kspread/kspread_brush.cc
index 3a66549b..f3c6953c 100644
--- a/kspread/kspread_brush.cc
+++ b/kspread/kspread_brush.cc
@@ -103,8 +103,8 @@ void KSpreadBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles&
 
     if ( m_unbalanced )
     {
-        unbalancedx = TQString( "%1%" ).tqarg( m_xfactor / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).tqarg( m_yfactor / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).arg( m_xfactor / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).arg( m_yfactor / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 6b7e191f..4d091a3d 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -1011,7 +1011,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
               (int) _ev->y() );
     if ( ( obj = getObject( p, activeSheet() ) ) && obj->isSelected() )
     {
-      KoRect const bound = obj->tqgeometry();
+      KoRect const bound = obj->geometry();
       TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(),
       bound.width(),
       bound.height() ) );
@@ -1056,7 +1056,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
   }
 
   //Check to see if the mouse is over a highlight range size grip and if it is, change the cursor
-  //tqshape to a resize arrow
+  //shape to a resize arrow
   if (highlightRangeSizeGripAt(ev_PosX,ev_PosY))
   {
     if ( sheet->layoutDirection()==Sheet::RightToLeft )
@@ -1177,7 +1177,7 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/)
             doc()->addCommand( cmd );
         } else
         {
-          tqrepaint();
+          repaint();
         }
         d->m_isMoving = false;
         break;
@@ -1253,13 +1253,13 @@ void Canvas::processLeftClickAnchor()
 
 	if ( KRun::isExecutableFile( d->anchor , type ) )
 	{
-        	//TQString question = i18n("Do you want to open this link to '%1'?\n").tqarg(d->anchor);
+        	//TQString question = i18n("Do you want to open this link to '%1'?\n").arg(d->anchor);
 
           	//question += i18n("Note that opening a link to a local file may "
                           //   "compromise your system's security.");
 
 		TQString question = i18n("This link points to the program or script '%1'.\n"
-					"Malicious programs can harm your computer.  Are you sure that you want to run this program?").tqarg(d->anchor);
+					"Malicious programs can harm your computer.  Are you sure that you want to run this program?").arg(d->anchor);
         	// this will also start local programs, so adding a "don't warn again"
         	// checkbox will probably be too dangerous
         	int choice = KMessageBox::warningYesNo(this, question, i18n("Open Link?"));
@@ -1352,9 +1352,9 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev )
 
         d->m_resizeObject = obj;
 
-        d->m_ratio = static_cast<double>( obj->tqgeometry().width() ) /
-            static_cast<double>( obj->tqgeometry().height() );
-        d->m_rectBeforeResize = obj->tqgeometry();
+        d->m_ratio = static_cast<double>( obj->geometry().width() ) /
+            static_cast<double>( obj->geometry().height() );
+        d->m_rectBeforeResize = obj->geometry();
       }
 
       KoPoint docPoint ( doc()->unzoomPoint( _ev->pos() ) );
@@ -2150,13 +2150,13 @@ void Canvas::processEscapeKey(TQKeyEvent * event)
       case MT_RESIZE_RU:
       case MT_RESIZE_RD:
       {
-        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->tqgeometry()/*getRepaintRect()*/);
+        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->geometry()/*getRepaintRect()*/);
         d->m_resizeObject->setGeometry( d->m_rectBeforeResize );
         oldBoundingRect.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) ,
                             (int)( -yOffset() * doc()->zoomedResolutionY()) );
 
         activeSheet()->setRegionPaintDirty( oldBoundingRect );
-        tqrepaint( oldBoundingRect );
+        repaint( oldBoundingRect );
         repaintObject( d->m_resizeObject );
         d->m_ratio = 0.0;
         d->m_resizeObject = 0;
@@ -3290,7 +3290,7 @@ KSpread::EmbeddedObject *Canvas::getObject( const TQPoint &pos, Sheet *_sheet )
   {
     if ( itObject.current()->sheet() == _sheet )
     {
-        KoRect const bound = ( itObject.current() )->tqgeometry();
+        KoRect const bound = ( itObject.current() )->geometry();
         TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(),
                                 bound.width(),
                                 bound.height() ) );
@@ -3429,7 +3429,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 {
     EmbeddedObject *obj = d->m_resizeObject;
 
-    KoRect objRect = obj->tqgeometry();
+    KoRect objRect = obj->geometry();
     objRect.moveBy( -xOffset(), -yOffset() );
     TQRect oldBoundingRect( doc()->zoomRect( objRect ) );
 
@@ -3575,7 +3575,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 //       m_gl.repaintSnapping( sp, snapStatus );
 //     }
 
-    tqrepaint( oldBoundingRect );
+    repaint( oldBoundingRect );
     repaintObject( obj );
     emit objectSizeChanged();
   }
@@ -3586,12 +3586,12 @@ void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
 {
   if ( d->m_resizeObject )
   {
-    KoPoint move = KoPoint( d->m_resizeObject->tqgeometry().x() - d->m_rectBeforeResize.x(),
-                            d->m_resizeObject->tqgeometry().y() - d->m_rectBeforeResize.y() );
-    KoSize size = KoSize( d->m_resizeObject->tqgeometry().width() - d->m_rectBeforeResize.width(),
-                          d->m_resizeObject->tqgeometry().height() - d->m_rectBeforeResize.height() );
+    KoPoint move = KoPoint( d->m_resizeObject->geometry().x() - d->m_rectBeforeResize.x(),
+                            d->m_resizeObject->geometry().y() - d->m_rectBeforeResize.y() );
+    KoSize size = KoSize( d->m_resizeObject->geometry().width() - d->m_rectBeforeResize.width(),
+                          d->m_resizeObject->geometry().height() - d->m_rectBeforeResize.height() );
 
-    if ( ( d->m_resizeObject->tqgeometry() ) != d->m_rectBeforeResize )
+    if ( ( d->m_resizeObject->geometry() ) != d->m_rectBeforeResize )
     {
         ChangeObjectGeometryCommand *resizeCmd = new ChangeObjectGeometryCommand( d->m_resizeObject, move, size );
         // the command is not executed as the object is allready resized.
@@ -3669,7 +3669,7 @@ void Canvas::deleteEditor (bool saveChanges, bool array)
 
   TQString t = d->cellEditor->text();
   // Delete the cell editor first and after that update the document.
-  // That means we get a synchronous tqrepaint after the cell editor
+  // That means we get a synchronous repaint after the cell editor
   // widget is gone. Otherwise we may get painting errors.
   delete d->cellEditor;
   d->cellEditor = 0;
@@ -3819,8 +3819,8 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
 
 void Canvas::repaintObject( EmbeddedObject *obj )
 {
-	//Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget
-	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() );
+	//Calculate where the object appears on the canvas widget and then repaint that part of the widget
+	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->geometry() );
 	canvasRelativeGeometry.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) ,
 			   			(int)( -yOffset() * doc()->zoomedResolutionY()) );
 
@@ -3828,17 +3828,17 @@ void Canvas::repaintObject( EmbeddedObject *obj )
 
  /* if ( !obj->isSelected() )
   {
-    KoRect g = obj->tqgeometry();
+    KoRect g = obj->geometry();
     g.moveBy( -xOffset(), -yOffset() );
-    TQRect tqgeometry( doc()->zoomRect( g ) );
+    TQRect geometry( doc()->zoomRect( g ) );
 
-    update( tqgeometry );
+    update( geometry );
   }
   else
   {
     TQPainter p(this);
     p.translate( -xOffset() * doc()->zoomedResolutionX() , -yOffset() * doc()->zoomedResolutionY() );
-    obj->draw(&p); //this goes faster than calling tqrepaint
+    obj->draw(&p); //this goes faster than calling repaint
     p.end();
   }*/
 }
@@ -3888,7 +3888,7 @@ void Canvas::copyOasisObjects()
       for( ; itObject.current(); ++itObject )
       {
         if ( itObject.current()->isSelected() )
-          p.drawPixmap( itObject.current()->tqgeometry().toTQRect().left() - r.left(), itObject.current()->tqgeometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
+          p.drawPixmap( itObject.current()->geometry().toTQRect().left() - r.left(), itObject.current()->geometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
       }
       p.end();
       if (!pixmap.isNull())
@@ -4202,7 +4202,7 @@ void Canvas::paintUpdates()
   paintHighlightedRanges(painter, unzoomedRect);
   paintNormalMarker(painter, unzoomedRect);
 
-  //restore clip region with tqchildren area
+  //restore clip region with children area
   painter.restore();
   //painter.setClipRegion( rgnComplete );
 }
@@ -4223,7 +4223,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const
   {
     if ( ( itObject.current() )->sheet() == activeSheet() )
     {
-	TQRect childGeometry = doc()->zoomRect( itObject.current()->tqgeometry());
+	TQRect childGeometry = doc()->zoomRect( itObject.current()->geometry());
 
 	//The clipping region is given in device coordinates
 	//so subtract the current offset (scroll position) of the canvas
@@ -4232,7 +4232,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const
 	if (painter.window().intersects(childGeometry))
 		rgn -= childGeometry;
 
-      //painter.fillRect( doc()->zoomRect( itObject.current()->tqgeometry() ), TQColor("red" ) );
+      //painter.fillRect( doc()->zoomRect( itObject.current()->geometry() ), TQColor("red" ) );
     }
   }
 
@@ -4263,11 +4263,11 @@ void Canvas::paintChildren( TQPainter& painter, TQWMatrix& /*matrix*/ )
 
   for( ; itObject.current(); ++itObject )
   {
-    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->tqgeometry() );
+    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->geometry() );
     if ( ( itObject.current() )->sheet() == activeSheet() &&
            zoomedWindowGeometry.intersects( zoomedObjectGeometry ) )
     {
-	    //To prevent unnecessary redrawing of the embedded object, we only tqrepaint
+	    //To prevent unnecessary redrawing of the embedded object, we only repaint
 	    //if one or more of the cells underneath the object has been marked as 'dirty'.
 
 	   TQRect canvasRelativeGeometry = zoomedObjectGeometry;
@@ -5036,9 +5036,9 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
 
     TQString tmpSize;
     if ( m_iResizePos != y )
-        tmpSize = i18n("Height: %1 %2").tqarg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
+        tmpSize = i18n("Height: %1 %2").arg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
                                                                m_pView->doc()->unit() ) )
-                                       .tqarg( m_pView->doc()->unitName() );
+                                       .arg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Row" );
 
@@ -5738,9 +5738,9 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     TQString tmpSize;
     if ( m_iResizePos != x )
         tmpSize = i18n("Width: %1 %2")
-                  .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
+                  .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
                                                                            m_pView->doc()->unit() )))
-                  .tqarg( m_pView->doc()->unitName() );
+                  .arg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Column" );
 
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index ce6c3feb..d8411791 100644
--- a/kspread/kspread_canvas.h
+++ b/kspread/kspread_canvas.h
@@ -444,7 +444,7 @@ private:
     TQRect cellsInArea( const TQRect area ) const;
     
     /**
-     * Paints the tqchildren
+     * Paints the children
      */
     void paintChildren( TQPainter& painter, TQWMatrix& matrix );
 
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index 705f77b4..0cbda2b4 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -1049,20 +1049,20 @@ TQString Cell::encodeFormula( bool _era, int _col, int _row ) const
                         int col = 0;
                         col = util_decodeColumnLabelText( buffer );
                         if ( fix1 )
-                            erg += TQString( "$%1" ).tqarg( col );
+                            erg += TQString( "$%1" ).arg( col );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1" ).tqarg( col );
+                                erg += TQChar(0xA7) + TQString( "%1" ).arg( col );
                             else
-                                erg += TQString( "#%1" ).tqarg( col - _col );
+                                erg += TQString( "#%1" ).arg( col - _col );
 
                         if ( fix2 )
-                            erg += TQString( "$%1#").tqarg( row );
+                            erg += TQString( "$%1#").arg( row );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1#" ).tqarg( row );
+                                erg += TQChar(0xA7) + TQString( "%1#" ).arg( row );
                             else
-                                erg += TQString( "#%1#" ).tqarg( row - _row );
+                                erg += TQString( "#%1#" ).arg( row - _row );
                     }
                 }
                 else
@@ -1687,7 +1687,7 @@ void Cell::offsetAlign( int _col, int _row )
   const double effTop = BORDER_SPACE + 0.5 * effTopBorderPen( _col, _row ).width();
   const double effBottom = h - BORDER_SPACE - 0.5 * effBottomBorderPen( _col, _row ).width();
 
-  // Calculate d->textY based on the vertical tqalignment and a few
+  // Calculate d->textY based on the vertical alignment and a few
   // other inputs.
   switch( ay )
   {
@@ -1846,7 +1846,7 @@ void Cell::offsetAlign( int _col, int _row )
     a = Format::Left;
   }
 
-  // Calculate d->textX based on tqalignment and textwidth.
+  // Calculate d->textX based on alignment and textwidth.
   switch ( a ) {
   case Format::Left:
     d->textX = 0.5 * effLeftBorderPen( _col, _row ).width() + BORDER_SPACE;
@@ -2052,7 +2052,7 @@ bool Cell::makeFormula()
     if (format()->sheet()->doc()->getShowMessageError())
     {
       TQString tmp(i18n("Error in cell %1\n\n"));
-      tmp = tmp.tqarg( fullName() );
+      tmp = tmp.arg( fullName() );
       KMessageBox::error( (TQWidget*)0L, tmp);
     }
     setFlag(Flag_ParseError);
@@ -2253,7 +2253,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
     selected = selected && !( markerArea.contains( cellRef ) );
 
     // Don't draw any selection at all when printing.
-    if ( painter.tqdevice()->isExtDev() || !drawCursor )
+    if ( painter.device()->isExtDev() || !drawCursor )
       selected = false;
   }
 
@@ -2299,7 +2299,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
 
   // 2. Paint the default borders if we are on screen or if we are printing
   //    and the checkbox to do this is checked.
-  if ( painter.tqdevice()->devType() != TQInternal::Printer
+  if ( painter.device()->devType() != TQInternal::Printer
        || format()->sheet()->print()->printGrid())
     paintDefaultBorders( painter, rect, cellRect, cellRef,
        paintBorderRight, paintBorderBottom,
@@ -2336,7 +2336,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
 
   // If we print pages, then we disable clipping, otherwise borders are
   // cut in the middle at the page borders.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     painter.setClipping( false );
 
   // Paint the borders if this cell is not part of another merged cell.
@@ -2350,7 +2350,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   }
 
   // Turn clipping back on.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     painter.setClipping( true );
 
   // 5. Paint diagonal lines and page borders.
@@ -2364,12 +2364,12 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   if ( !isObscured() ) {
 
     // 6a. Paint possible comment indicator.
-    if ( !painter.tqdevice()->isExtDev()
+    if ( !painter.device()->isExtDev()
    || format()->sheet()->print()->printCommentIndicator() )
       paintCommentIndicator( painter, cellRect, cellRef, backgroundColor );
 
     // 6b. Paint possible formula indicator.
-    if ( !painter.tqdevice()->isExtDev()
+    if ( !painter.device()->isExtDev()
    || format()->sheet()->print()->printFormulaIndicator() )
       paintFormulaIndicator( painter, cellRect, backgroundColor );
 
@@ -2389,7 +2389,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
     //  b) something indicates that the text should not be painted
     //  c) the sheet is protected and the cell is hidden.
     if ( !d->strOutText.isEmpty()
-   && ( !painter.tqdevice()->isExtDev()
+   && ( !painter.device()->isExtDev()
         || !format()->getDontprintText( cellRef.x(), cellRef.y() ) )
    && !( format()->sheet()->isProtected()
          && format()->isHideAll( cellRef.x(), cellRef.y() ) ) )
@@ -2402,7 +2402,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   //    cells, then paint the obscuring cell(s).  Otherwise don't do
   //    anything so that we don't cause an infinite loop.
   if ( isObscured() && paintingObscured == 0 &&
-       !( sheetDir == Sheet::RightToLeft && painter.tqdevice()->isExtDev() ) )
+       !( sheetDir == Sheet::RightToLeft && painter.device()->isExtDev() ) )
   {
 
     //kdDebug(36001) << "painting cells that obscure " << name() << endl;
@@ -2723,7 +2723,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
     TQColor bg( backgroundColor );
 
     // Handle printers separately.
-    if ( !painter.tqdevice()->isExtDev() ) {
+    if ( !painter.device()->isExtDev() ) {
       if ( bg.isValid() )
         painter.setBackgroundColor( bg );
       else
@@ -2742,7 +2742,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
   }
 
   // Erase the background of the cell.
-  if ( !painter.tqdevice()->isExtDev() )
+  if ( !painter.device()->isExtDev() )
     painter.eraseRect( zoomedCellRect );
 
   // Get a background brush
@@ -2791,7 +2791,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
   Doc* doc = sheet()->doc();
 
   Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
-  bool paintingToExternalDevice = painter.tqdevice()->isExtDev();
+  bool paintingToExternalDevice = painter.device()->isExtDev();
 
   // Each cell is responsible for drawing it's top and left portions
   // of the "default" grid. --Or not drawing it if it shouldn't be
@@ -2948,7 +2948,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() )     {
+    if ( painter.device()->isExtDev() )     {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( doc->zoomItX( TQMAX( rect.left(),   cellRect.x() ) ),
                           doc->zoomItY( TQMAX( rect.top(),    cellRect.y() + dt ) ),
@@ -2995,7 +2995,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       painter.drawLine( doc->zoomItX( TQMAX( rect.left(),   cellRect.x() + dl ) ),
                         doc->zoomItY( TQMAX( rect.top(),    cellRect.bottom() ) ),
                         doc->zoomItX( TQMIN( rect.right(),  cellRect.right() - dr ) ),
@@ -3026,7 +3026,7 @@ void Cell::paintCommentIndicator( TQPainter& painter,
        && cellRect.width() > 10.0
        && cellRect.height() > 10.0
        && ( sheet()->print()->printCommentIndicator()
-           || ( !painter.tqdevice()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) {
+           || ( !painter.device()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) {
     TQColor penColor = TQt::red;
 
     // If background has high red part, switch to blue.
@@ -3123,7 +3123,7 @@ void Cell::paintMoreTextIndicator( TQPainter& painter,
   // Show a red triangle when it's not possible to write all text in cell.
   // Don't print the red triangle if we're printing.
   if( testFlag( Flag_CellTooShortX ) &&
-      !painter.tqdevice()->isExtDev() &&
+      !painter.device()->isExtDev() &&
       cellRect.height() > 4.0  &&
       cellRect.width()  > 4.0 )
   {
@@ -3180,7 +3180,7 @@ void Cell::paintText( TQPainter& painter,
 
   // Resolve the text color if invalid (=default).
   if ( !textColorPrint.isValid() ) {
-    if ( painter.tqdevice()->isExtDev() )
+    if ( painter.device()->isExtDev() )
       textColorPrint = TQt::black;
     else
       textColorPrint = TQApplication::tqpalette().active().text();
@@ -3466,7 +3466,7 @@ void Cell::paintPageBorders( TQPainter& painter,
            bool paintBorderBottom )
 {
   // Not screen?  Return immediately.
-  if ( painter.tqdevice()->isExtDev() )
+  if ( painter.device()->isExtDev() )
     return;
 
   if ( ! format()->sheet()->isShowPageBorders() )
@@ -3628,7 +3628,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       // FIXME: There is probably Cut&Paste bugs here as well as below.
       //        The TQMIN/TQMAX and left/right pairs don't really make sense.
       //
@@ -3675,7 +3675,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                           TQMAX( zrect_top, zcellRect_top - top ),
@@ -3716,7 +3716,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( zcellRect_top >= zrect_top + top_penWidth / 2)
   painter.drawLine( TQMAX( zrect_left,   zcellRect_left ),
         zcellRect_top,
@@ -3738,7 +3738,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( zcellRect_bottom <= zrect_bottom + bottom_penWidth / 2)
   painter.drawLine( TQMAX( zrect_left,   zcellRect_left ),
         zcellRect_bottom,
@@ -3762,7 +3762,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 #if 0
   // Look at the cells on our corners. It may happen that we
   // just erased parts of their borders corner, so we might need
-  // to tqrepaint these corners.
+  // to repaint these corners.
   //
   TQPen  vert_pen, horz_pen;
   int   vert_penWidth, horz_penWidth;
@@ -3810,7 +3810,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
     painter.setPen( vert_pen );
     // If we are on paper printout, we limit the length of the lines.
     // On paper, we always have full cells, on screen not.
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_right ),
                           TQMAX( zrect_top, zcellRect_top ),
@@ -3860,7 +3860,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
     painter.setPen( vert_pen );
     //If we are on paper printout, we limit the length of the lines
     //On paper, we always have full cells, on screen not
-    if ( painter.tqdevice()->isExtDev() ) {
+    if ( painter.device()->isExtDev() ) {
       if ( sheetDir == Sheet::RightToLeft )
         painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                           TQMAX( zrect_top, zcellRect_top ),
@@ -3913,7 +3913,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
       painter.setPen( vert_pen );
       // If we are on paper printout, we limit the length of the lines.
       // On paper, we always have full cells, on screen not.
-      if ( painter.tqdevice()->isExtDev() ) {
+      if ( painter.device()->isExtDev() ) {
         if ( sheetDir == Sheet::RightToLeft )
           painter.drawLine( TQMAX( zrect_left, zcellRect_right ),
                             TQMAX( zrect_top, zcellRect_bottom - bottom ),
@@ -3965,7 +3965,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
       painter.setPen( vert_pen );
       // If we are on paper printout, we limit the length of the lines.
       // On paper, we always have full cells, on screen not.
-      if ( painter.tqdevice()->isExtDev() )      {
+      if ( painter.device()->isExtDev() )      {
         if ( sheetDir == Sheet::RightToLeft )
           painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                             TQMAX( zrect_top, zcellRect_bottom - bottom ),
@@ -5232,7 +5232,7 @@ TQDomElement Cell::save( TQDomDocument& doc,
         {
                 TQDomElement dateMin = doc.createElement( "datemin" );
                 TQString tmp("%1/%2/%3");
-                tmp = tmp.tqarg(d->extra()->validity->dateMin.year()).tqarg(d->extra()->validity->dateMin.month()).tqarg(d->extra()->validity->dateMin.day());
+                tmp = tmp.arg(d->extra()->validity->dateMin.year()).arg(d->extra()->validity->dateMin.month()).arg(d->extra()->validity->dateMin.day());
                 dateMin.appendChild( doc.createTextNode( tmp ) );
                 validity.appendChild( dateMin );
         }
@@ -5240,7 +5240,7 @@ TQDomElement Cell::save( TQDomDocument& doc,
         {
                 TQDomElement dateMax = doc.createElement( "datemax" );
                 TQString tmp("%1/%2/%3");
-                tmp = tmp.tqarg(d->extra()->validity->dateMax.year()).tqarg(d->extra()->validity->dateMax.month()).tqarg(d->extra()->validity->dateMax.day());
+                tmp = tmp.arg(d->extra()->validity->dateMax.year()).arg(d->extra()->validity->dateMax.month()).arg(d->extra()->validity->dateMax.day());
                 dateMax.appendChild( doc.createTextNode( tmp ) );
                 validity.appendChild( dateMax );
         }
@@ -5312,7 +5312,7 @@ bool Cell::saveCellResult( TQDomDocument& doc, TQDomElement& result,
           TQDate dd = value().asDateTime().date();
           dataType = "Date";
           str = "%1/%2/%3";
-          str = str.tqarg(dd.year()).tqarg(dd.month()).tqarg(dd.day());
+          str = str.arg(dd.year()).arg(dd.month()).arg(dd.day());
       }
       else if( isTime() )
       {
@@ -6048,25 +6048,25 @@ void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext&
             if ( !point.isValid() )
               continue;
 
-            KoRect tqgeometry = obj->tqgeometry();
-            tqgeometry.setLeft( tqgeometry.left() + sheet()->columnPos( d->column, 0 ) );
-            tqgeometry.setTop( tqgeometry.top() + sheet()->rowPos( d->row, 0 ) );
+            KoRect geometry = obj->geometry();
+            geometry.setLeft( geometry.left() + sheet()->columnPos( d->column, 0 ) );
+            geometry.setTop( geometry.top() + sheet()->rowPos( d->row, 0 ) );
 
             TQString str = e.attributeNS( KoXmlNS::table, "end-x", TQString() );
             if ( !str.isNull() )
             {
               uint end_x = (uint) KoUnit::parseValue( str );
-              tqgeometry.setRight( sheet()->columnPos( point.column(), 0) + end_x );
+              geometry.setRight( sheet()->columnPos( point.column(), 0) + end_x );
             }
 
             str = e.attributeNS( KoXmlNS::table, "end-y", TQString() );
             if ( !str.isNull() )
             {
               uint end_y = (uint) KoUnit::parseValue( str );
-              tqgeometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
+              geometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
             }
 
-            obj->setGeometry( tqgeometry );
+            obj->setGeometry( geometry );
           }
         }
     }
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index c277e991..8a580ecb 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -218,7 +218,7 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons
   if ( !name )
   {
       TQString tmp( "Document%1" );
-      tmp = tmp.tqarg( d->s_docId++ );
+      tmp = tmp.arg( d->s_docId++ );
       setName( tmp.local8Bit());//tmp.latin1() );
       dcopObject();
   }
@@ -998,7 +998,7 @@ bool Doc::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
         deleteLoadingInfo();
         return false;
     }
@@ -1086,7 +1086,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
   if ( spread.attribute( "mime" ) != "application/x-kspread" && spread.attribute( "mime" ) != "application/vnd.kde.kspread" )
   {
     d->isLoading = false;
-    setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).tqarg( spread.attribute("mime") ) );
+    setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).arg( spread.attribute("mime") ) );
     return false;
   }
 
@@ -1095,7 +1095,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
   {
       int ret = KMessageBox::warningContinueCancel(
           0, i18n("This document was created with a newer version of KSpread (syntax version: %1)\n"
-                  "When you open it with this version of KSpread, some information may be lost.").tqarg(d->syntaxVersion),
+                  "When you open it with this version of KSpread, some information may be lost.").arg(d->syntaxVersion),
           i18n("File Format Mismatch"), KStdGuiItem::cont() );
       if ( ret == KMessageBox::Cancel )
       {
@@ -1731,7 +1731,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
 			   const Sheet* sheet, bool /*drawCursor*/)
 {
   //
-  // Clip away tqchildren
+  // Clip away children
   //
 
   TQRegion rgn = painter.clipRegion();
@@ -1749,7 +1749,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
     matrix = painter.worldMatrix();
   }
 
-//   TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+//   TQPtrListIterator<KoDocumentChild> it( children() );
 //   for( ; it.current(); ++it ) {
 //     // if ( ((Child*)it.current())->sheet() == sheet &&
 //     //    !m_pView->hasDocumentInWindow( it.current()->document() ) )
@@ -2192,7 +2192,7 @@ void Doc::emitBeginOperation(bool waitCursor)
     //are expected to be completed in a short time anyway.
     TQCursor* activeOverride = static_cast<TQCursor*>(TQApplication::overrideCursor());
 
-    if (waitCursor && ( (!activeOverride) || (activeOverride->tqshape() != TQt::waitCursor.tqshape()) )  )
+    if (waitCursor && ( (!activeOverride) || (activeOverride->shape() != TQt::waitCursor.shape()) )  )
     {
         TQApplication::setOverrideCursor(TQt::waitCursor);
     }
@@ -2200,7 +2200,7 @@ void Doc::emitBeginOperation(bool waitCursor)
 //    /* just duplicate the current cursor on the stack, then */
 //  else if (TQApplication::overrideCursor() != NULL)
 //    {
-//        TQApplication::setOverrideCursor(TQApplication::overrideCursor()->tqshape());
+//        TQApplication::setOverrideCursor(TQApplication::overrideCursor()->shape());
 //    }
 
     KoDocument::emitBeginOperation();
@@ -2379,7 +2379,7 @@ KoPictureCollection *Doc::pictureCollection()
   return &d->m_pictureCollection;
 }
 
-void Doc::tqrepaint( const TQRect& rect )
+void Doc::repaint( const TQRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
@@ -2393,7 +2393,7 @@ void Doc::tqrepaint( const TQRect& rect )
   }
 }
 
-void Doc::tqrepaint( EmbeddedObject *obj )
+void Doc::repaint( EmbeddedObject *obj )
 {
   TQPtrListIterator<KoView> it( views() );
   for( ; it.current(); ++it )
@@ -2404,7 +2404,7 @@ void Doc::tqrepaint( EmbeddedObject *obj )
   }
 }
 
-void Doc::tqrepaint( const KoRect& rect )
+void Doc::repaint( const KoRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index 63320a96..64d1fbf5 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -565,7 +565,7 @@ public:
   virtual void emitBeginOperation();
 
   /**
-   * Mark the end of an operation and triggers a tqrepaint of any cells or regions of cells which
+   * Mark the end of an operation and triggers a repaint of any cells or regions of cells which
    * have been marked as 'dirty' via calls to Sheet::setRegionPaintDirty
    * See above comment to emitBeginOperation(bool).
    */
@@ -640,10 +640,10 @@ public:
   void loadConfigFromFile();
   bool configLoadFromFile() const;
 
-  // tqrepaint (update) all views
-  void tqrepaint( const TQRect& );
-  void tqrepaint( EmbeddedObject* );
-  void tqrepaint( const KoRect& );
+  // repaint (update) all views
+  void repaint( const TQRect& );
+  void repaint( EmbeddedObject* );
+  void repaint( const KoRect& );
 
   virtual void addShell( KoMainWindow *shell );
 
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 721412ca..44a3d178 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -828,7 +828,7 @@ void CellEditor::setEditorFont(TQFont const & font, bool updateSize)
     d->fontLength = fm.width('x');
 
     int mw = fm.width( d->textEdit->text() ) + d->fontLength;
-    // don't make it smaller: then we would have to tqrepaint the obscured cells
+    // don't make it smaller: then we would have to repaint the obscured cells
     if (mw < width())
       mw = width();
 
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index ecebff60..b0960735 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -2725,7 +2725,7 @@ void RowFormat::setBottomBorderPen( const TQPen & p )
     Format::setBottomBorderPen( p );
 }
 
-void RowFormat::setHide( bool _hide, bool tqrepaint )
+void RowFormat::setHide( bool _hide, bool repaint )
 {
     if ( _hide != m_bHide ) // only if we change the status
     {
@@ -2734,14 +2734,14 @@ void RowFormat::setHide( bool _hide, bool tqrepaint )
 	    // Lower maximum size by height of row
 	    m_pSheet->adjustSizeMaxY ( - dblHeight() );
 	    m_bHide = _hide; //hide must be set after we requested the height
-      m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
+      m_pSheet->emit_updateRow( this, m_iRow, repaint );
 	}
 	else
 	{
 	    // Rise maximum size by height of row
 	    m_bHide = _hide; //unhide must be set before we request the height
 	    m_pSheet->adjustSizeMaxY ( dblHeight() );
-            m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
+            m_pSheet->emit_updateRow( this, m_iRow, repaint );
 	}
     }
 }
diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h
index ed89807a..41e3f0ae 100644
--- a/kspread/kspread_format.h
+++ b/kspread/kspread_format.h
@@ -557,7 +557,7 @@ public:
     /**
      * Sets the hide flag
      */
-    void setHide( bool _hide, bool tqrepaint = true );
+    void setHide( bool _hide, bool repaint = true );
     bool isHide()const { return m_bHide;}
 
     bool operator==( const RowFormat& other ) const;
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc
index 52ae0f99..2a5775aa 100644
--- a/kspread/kspread_functions_information.cc
+++ b/kspread/kspread_functions_information.cc
@@ -158,8 +158,8 @@ Value func_info (valVector args, ValueCalc *calc, FuncExtra *)
     struct utsname name;
     if (uname (&name) >= 0)
     {
-       TQString os = TQString("%1 %2 (%3)").tqarg( name.sysname ).
-         tqarg( name.release ).tqarg( name.machine );
+       TQString os = TQString("%1 %2 (%3)").arg( name.sysname ).
+         arg( name.release ).arg( name.machine );
        return Value (os);
     }
   }
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc
index 73370e03..a24c8cf2 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cc
@@ -80,7 +80,7 @@ void Map::setProtected( TQCString const & passwd )
 Sheet* Map::createSheet()
 {
   TQString s( i18n("Sheet%1") );
-  s = s.tqarg( tableId++ );
+  s = s.arg( tableId++ );
   Sheet *t = new Sheet ( this, s , s.utf8());
   t->setSheetName( s, true ); // huh? (Werner)
   return t;
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 82ee585f..8c273700 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -55,8 +55,8 @@ class View;
  * EmbeddedObject
  *
  **********************************************************/
-EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry )
-  : m_tqgeometry( _tqgeometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine )
+EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry )
+  : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine )
 {
   angle = 0.0;
   inObjList = true;
@@ -66,23 +66,23 @@ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry )
 EmbeddedObject::~EmbeddedObject()
 {
 }
-KoRect EmbeddedObject::tqgeometry()
+KoRect EmbeddedObject::geometry()
 {
-    return m_tqgeometry;
+    return m_geometry;
 }
 void EmbeddedObject::setGeometry( const KoRect &rect )
 {
-    m_tqgeometry = rect;
+    m_geometry = rect;
 }
 
 void EmbeddedObject::moveBy( const KoPoint &_point )
 {
-  m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + _point );
+  m_geometry.moveTopLeft( m_geometry.topLeft() + _point );
 }
 
 void EmbeddedObject::moveBy( double _dx, double _dy )
 {
-  m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + KoPoint( _dx, _dy ) );
+  m_geometry.moveTopLeft( m_geometry.topLeft() + KoPoint( _dx, _dy ) );
 }
 
 void EmbeddedObject::resizeBy( const KoSize & _size )
@@ -92,7 +92,7 @@ void EmbeddedObject::resizeBy( const KoSize & _size )
 
 void EmbeddedObject::resizeBy( double _dx, double _dy)
 {
-  m_tqgeometry.setSize( KoSize( m_tqgeometry.width()+_dx, m_tqgeometry.height()+_dy) );
+  m_geometry.setSize( KoSize( m_geometry.width()+_dx, m_geometry.height()+_dy) );
 } // call (possibly reimplemented) setSize
 
 bool EmbeddedObject::load( const TQDomElement& /*element*/ )
@@ -105,10 +105,10 @@ void EmbeddedObject::loadOasis(const TQDomElement &element, KoOasisLoadingContex
 {
   if(element.hasAttributeNS( KoXmlNS::draw, "name" ))
     m_objectName = element.attributeNS( KoXmlNS::draw, "name", TQString());
-  m_tqgeometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) );
-  m_tqgeometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) );
-  m_tqgeometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) );
-  m_tqgeometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) );
+  m_geometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) );
+  m_geometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) );
+  m_geometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) );
+  m_geometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) );
     //kdDebug()<<" orig.x() :"<<orig.x() <<" orig.y() :"<<orig.y() <<"ext.width() :"<<ext.width()<<" ext.height(): "<<ext.height()<<endl;
   KoStyleStack &styleStack = context.styleStack();
 
@@ -126,15 +126,15 @@ void EmbeddedObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj )
 {
     xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) );
     //save all into pt
-    xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.x() : m_tqgeometry.x() + 20.0 );
-    xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.y() : m_tqgeometry.y() + 20.0 );
-    xmlWriter.addAttributePt( "svg:width", m_tqgeometry.width() );
-    xmlWriter.addAttributePt( "svg:height", m_tqgeometry.height() );
+    xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_geometry.x() : m_geometry.x() + 20.0 );
+    xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_geometry.y() : m_geometry.y() + 20.0 );
+    xmlWriter.addAttributePt( "svg:width", m_geometry.width() );
+    xmlWriter.addAttributePt( "svg:height", m_geometry.height() );
 
 //     if ( kAbs( angle ) > 1E-6 )
 //     {
 //         double value = -1 * ( ( double )angle* M_PI )/180.0;
-//         TQString str=TQString( "rotate (%1)" ).tqarg( value );
+//         TQString str=TQString( "rotate (%1)" ).arg( value );
 //         xmlWriter.addAttribute( "draw:transform", str );
 //     }
 }
@@ -187,7 +187,7 @@ TQPixmap EmbeddedObject::toPixmap(double /*xZoom*/ , double /*yZoom*/)
 
 void EmbeddedObject::calculateRequiredZoom( TQSize desiredSize, double& xZoom, double& yZoom)
 {
-	TQSize actualSize = tqgeometry().size().toTQSize();
+	TQSize actualSize = geometry().size().toTQSize();
 
 	xZoom = (double) desiredSize.width() / (double)actualSize.width();
 	yZoom = (double) desiredSize.height() / (double)actualSize.height();
@@ -199,8 +199,8 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
     return;
 
   _painter->save();
-  KoRect bound( tqgeometry().left(), tqgeometry().top(),
-                tqgeometry().width() , tqgeometry().height() );
+  KoRect bound( geometry().left(), geometry().top(),
+                geometry().width() , geometry().height() );
   TQRect zoomedBound = sheet()->doc()->zoomRect( bound ) ;
 
   //_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
@@ -261,14 +261,14 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
   _painter->restore();
 }
 
-TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry) const
+TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry) const
 {
     int px = /*sheet()->doc()->zoomItX*/(_point.x());
     int py = /*sheet()->doc()->zoomItY*/(_point.y());
-    int ox = /*sheet()->doc()->zoomItX*/(/*orig*/tqgeometry.x());
-    int oy = /*sheet()->doc()->zoomItY*/(/*orig*/tqgeometry.y());
-    int ow = /*sheet()->doc()->zoomItX*/(/*ext*/tqgeometry.width());
-    int oh = /*sheet()->doc()->zoomItY*/(/*ext*/tqgeometry.height());
+    int ox = /*sheet()->doc()->zoomItX*/(/*orig*/geometry.x());
+    int oy = /*sheet()->doc()->zoomItY*/(/*orig*/geometry.y());
+    int ow = /*sheet()->doc()->zoomItX*/(/*ext*/geometry.width());
+    int oh = /*sheet()->doc()->zoomItY*/(/*ext*/geometry.height());
 
 //     if ( angle != 0.0 )
 //     {
@@ -367,10 +367,10 @@ void EmbeddedObject::doDelete()
  * EmbeddedKOfficeObject
  *
  **********************************************************/
-EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
-    : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent)
+EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry )
+    : EmbeddedObject( _sheet, geometry ), m_parent(parent)
 {
-    m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.toTQRect() );
+    m_embeddedObject = new KoDocumentChild(parent, doc, geometry.toTQRect() );
 }
 
 EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet )
@@ -399,7 +399,7 @@ bool EmbeddedKOfficeObject::saveOasisObjectAttributes( KSpreadOasisSaveContext &
     kdDebug() << "EmbeddedKOfficeObject::saveOasisPart " << sc.partIndexObj << endl;
 
     sc.xmlWriter.startElement( "draw:object" );
-    const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 );
     ++sc.partIndexObj;
     m_embeddedObject->saveOasisAttributes( sc.xmlWriter, name );
 
@@ -417,7 +417,7 @@ bool EmbeddedKOfficeObject::load( const TQDomElement& element )
 {
     kdDebug() << "Loading EmbeddedKOfficeObject" << endl;
     bool result = embeddedObject()->load( element );
-    setGeometry( KoRect::fromTQRect( embeddedObject()->tqgeometry() ) );
+    setGeometry( KoRect::fromTQRect( embeddedObject()->geometry() ) );
     return result;
 }
 
@@ -436,7 +436,7 @@ void EmbeddedKOfficeObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 TQDomElement EmbeddedKOfficeObject::save( TQDomDocument& doc )
 {
     kdDebug() << "Saving EmbeddedKOfficeObject" << endl;
-    embeddedObject()->setGeometry( tqgeometry().toTQRect() );
+    embeddedObject()->setGeometry( geometry().toTQRect() );
     return m_embeddedObject->save( doc );
 }
 
@@ -446,21 +446,21 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
   int const penw = pen.width() ;
   KoRect bound( 0, 0,
-                tqgeometry().width() - ( 2 * penw ), tqgeometry().height() - ( 2 * penw ) );
+                geometry().width() - ( 2 * penw ), geometry().height() - ( 2 * penw ) );
   TQRect const zoomedBound = sheet()->doc()->zoomRect( bound );
 
   _painter->save();
-  int const xOffset = sheet()->doc()->zoomItX( tqgeometry().left() + penw);
-  int const yOffset = sheet()->doc()->zoomItY( tqgeometry().top() + penw );
+  int const xOffset = sheet()->doc()->zoomItX( geometry().left() + penw);
+  int const yOffset = sheet()->doc()->zoomItY( geometry().top() + penw );
 
-  TQRect new_tqgeometry = zoomedBound;
+  TQRect new_geometry = zoomedBound;
 
   //if ( translate )
   //{
   	_painter->translate( xOffset , yOffset );
 
-  	new_tqgeometry.moveBy(  xOffset , yOffset );
-  	new_tqgeometry.moveBy( -_painter->window().x(), -_painter->window().y() );
+  	new_geometry.moveBy(  xOffset , yOffset );
+  	new_geometry.moveBy( -_painter->window().x(), -_painter->window().y() );
   //}
 
   _painter->setClipRect( zoomedBound, TQPainter::CoordPainter );
@@ -477,7 +477,7 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
         zoomY );
 
 
-   embeddedObject()->setGeometry( new_tqgeometry );
+   embeddedObject()->setGeometry( new_geometry );
   _painter->restore();
 
   EmbeddedObject::draw( _painter );
@@ -485,10 +485,10 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
 TQPixmap EmbeddedKOfficeObject::toPixmap( double xZoom , double yZoom )
 {
-	TQPixmap pixmap( (int)( tqgeometry().width()*xZoom ), (int)( tqgeometry().height()*yZoom ) );
+	TQPixmap pixmap( (int)( geometry().width()*xZoom ), (int)( geometry().height()*yZoom ) );
 
 	TQPainter painter(&pixmap);
-	TQRect  bound( 0,0,(int)( tqgeometry().width()*xZoom ), (int)(tqgeometry().height()*yZoom) );
+	TQRect  bound( 0,0,(int)( geometry().width()*xZoom ), (int)(geometry().height()*yZoom) );
 	embeddedObject()->document()->paintEverything(painter,bound,
 					embeddedObject()->isTransparent(),
 					0,
@@ -516,10 +516,10 @@ void EmbeddedKOfficeObject::deactivate()
 void EmbeddedKOfficeObject::updateChildGeometry()
 {
 //   KoZoomHandler* zh = m_sheet->doc();
-//   embeddedObject()->setGeometry( zh->zoomRect( tqgeometry() ), true );
+//   embeddedObject()->setGeometry( zh->zoomRect( geometry() ), true );
 
 //   return;
-//   TQRect r = sheet()->doc()->zoomRect( tqgeometry() );
+//   TQRect r = sheet()->doc()->zoomRect( geometry() );
 //   if ( _canvas )
 //   {
 //     kdDebug() << "_canvas->xOffset():" << _canvas->xOffset() << endl;
@@ -537,8 +537,8 @@ void EmbeddedKOfficeObject::updateChildGeometry()
  *
  **********************************************************/
 
-EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
-  : EmbeddedKOfficeObject( _spread, _sheet, doc, tqgeometry )
+EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& geometry )
+  : EmbeddedKOfficeObject( _spread, _sheet, doc, geometry )
 {
     m_pBinding = 0;
 }
@@ -687,8 +687,8 @@ KoChart::Part* EmbeddedChart::chart()
  * EmbeddedPictureObject
  *
  **********************************************************/
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection )
-   : EmbeddedObject( _sheet, _tqgeometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection )
+   : EmbeddedObject( _sheet, _geometry )
 {
     imageCollection = _imageCollection;
     pen = KoPen( TQt::black, 1.0, Qt::NoPen );
@@ -706,8 +706,8 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqge
 }
 
 
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
-    : EmbeddedObject( _sheet, _tqgeometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
+    : EmbeddedObject( _sheet, _geometry )
 {
     imageCollection = _imageCollection;
 
@@ -1149,10 +1149,10 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 
 void EmbeddedPictureObject::drawShadow( TQPainter* /*_painter*/,  KoZoomHandler* /*_zoomHandler*/)
 {
-//     const double ox = /*orig*/m_tqgeometry.x();
-//     const double oy = /*orig*/m_tqgeometry.y();
-//     const double ow = /*ext*/m_tqgeometry.width();
-//     const double oh = /*ext*/m_tqgeometry.height();
+//     const double ox = /*orig*/m_geometry.x();
+//     const double oy = /*orig*/m_geometry.y();
+//     const double ow = /*ext*/m_geometry.width();
+//     const double oh = /*ext*/m_geometry.height();
 //
 //     _painter->save();
 //
@@ -1208,7 +1208,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
 {
     const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 );
 
-    TQSize size( _zoomHandler->zoomSize( m_tqgeometry.size() /*ext*/ ) );
+    TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) );
     //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl;
     TQPixmap pixmap(size);
     TQPainter paint;
@@ -1221,8 +1221,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
     paint.setBrush( getBrush() );
 
     TQRect rect( (int)( penw ), (int)( penw ),
-                 (int)( _zoomHandler->zoomItX( /*ext*/m_tqgeometry.width() ) - 2.0 * penw ),
-                 (int)( _zoomHandler->zoomItY( /*ext*/m_tqgeometry.height() ) - 2.0 * penw ) );
+                 (int)( _zoomHandler->zoomItX( /*ext*/m_geometry.width() ) - 2.0 * penw ),
+                 (int)( _zoomHandler->zoomItY( /*ext*/m_geometry.height() ) - 2.0 * penw ) );
 
 //      if ( getFillType() == FT_BRUSH || !gradient )
          paint.drawRect( rect );
@@ -1231,8 +1231,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler)
 //         gradient->setSize( size );
 //         paint.drawPixmap( (int)( penw ), (int)( penw ),
 //                           gradient->pixmap(), 0, 0,
-//                           (int)( _zoomHandler->zoomItX( m_tqgeometry/*ext*/.width() ) - 2 * penw ),
-//                           (int)( _zoomHandler->zoomItY( m_tqgeometry/*ext*/.height() ) - 2 * penw ) );
+//                           (int)( _zoomHandler->zoomItX( m_geometry/*ext*/.width() ) - 2 * penw ),
+//                           (int)( _zoomHandler->zoomItY( m_geometry/*ext*/.height() ) - 2 * penw ) );
 //    }
 
 
@@ -1260,10 +1260,10 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand
 //     if ( shadowDistance > 0 && !drawContour )
 //         drawShadow(_painter, _zoomHandler);
 
-    const double ox = /*orig*/m_tqgeometry.x();
-    const double oy = /*orig*/m_tqgeometry.y();
-    const double ow = /*ext*/m_tqgeometry.width();
-    const double oh = /*ext*/m_tqgeometry.height();
+    const double ox = /*orig*/m_geometry.x();
+    const double oy = /*orig*/m_geometry.y();
+    const double ow = /*ext*/m_geometry.width();
+    const double oh = /*ext*/m_geometry.height();
     //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 );
 
     _painter->save();
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index 46074109..b66d67ac 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -108,13 +108,13 @@ enum AlignType {
 class EmbeddedObject
 {
   public:
-    EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry );
+    EmbeddedObject( Sheet *_sheet, const KoRect& _geometry );
     virtual ~EmbeddedObject();
     virtual ObjType getType() const { return OBJECT_GENERAL; }
     virtual TQString getTypeString() const
         { return TQString(); }
 
-    KoRect tqgeometry();
+    KoRect geometry();
     void setGeometry( const KoRect &rect );
     virtual void moveBy( const KoPoint &_point );
     virtual void moveBy( double _dx, double _dy );
@@ -183,7 +183,7 @@ class EmbeddedObject
     
     
     void paintSelection( TQPainter *_painter, SelectionMode selectionMode );
-    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const;
+    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry ) const;
 
     virtual void removeFromObjList()
         { inObjList = false; }
@@ -217,7 +217,7 @@ class EmbeddedObject
      */
     void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom );
     
-    KoRect m_tqgeometry;
+    KoRect m_geometry;
     Sheet *m_sheet;
     Canvas *m_canvas;
     TQString m_objectName;
@@ -238,7 +238,7 @@ class EmbeddedObject
 class EmbeddedKOfficeObject : public EmbeddedObject
 {
   public:
-    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
+    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry );
     EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet );
     virtual ~EmbeddedKOfficeObject();
     virtual ObjType getType() const { return OBJECT_KOFFICE_PART; }
@@ -314,8 +314,8 @@ class EmbeddedChart : public EmbeddedKOfficeObject
 class EmbeddedPictureObject : public EmbeddedObject
 {
   public:
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection );
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
     EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection *_imageCollection );
     virtual ~EmbeddedPictureObject();
     EmbeddedPictureObject &operator=( const EmbeddedPictureObject & );
diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp
index 6f38c25e..3b84a3db 100644
--- a/kspread/kspread_propertyEditor.cpp
+++ b/kspread/kspread_propertyEditor.cpp
@@ -280,7 +280,7 @@ KCommand * PropertyEditor::getCommand()
                 TQPtrListIterator<EmbeddedObject> it( m_objects );
                 for ( ; it.current(); ++it )
                 {
-                    KoRect oldRect = it.current()->tqgeometry()/*getRect()*/;
+                    KoRect oldRect = it.current()->geometry()/*getRect()*/;
                     KoRect newRect = oldRect;
 
                     if ( change & GeneralProperty::Left )
@@ -446,7 +446,7 @@ GeneralProperty::GeneralValue PropertyEditor::getGeneralValue()
         generalValue.m_protect = protect ? STATE_ON : STATE_OFF;
         keepRatio = it.current()->isKeepRatio();
         generalValue.m_keepRatio = keepRatio ? STATE_ON : STATE_OFF;
-        generalValue.m_rect = it.current()->tqgeometry()/*getRect()*/;
+        generalValue.m_rect = it.current()->geometry()/*getRect()*/;
         ++it;
     }
 
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 0e7f7bcc..a888a392 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -151,7 +151,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ )
 	//Ensure display gets updated by marking all cells underneath the chart as
 	//dirty
 
-	const TQRect chartGeometry = m_child->tqgeometry().toTQRect();
+	const TQRect chartGeometry = m_child->geometry().toTQRect();
 
 	double tmp;
   	int left = sheet()->leftColumn( chartGeometry.left() , tmp );
@@ -201,7 +201,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ )
 
     // Force a redraw of the chart on all views
 
-    /** TODO - replace the call below with something that will tqrepaint this chart */
+    /** TODO - replace the call below with something that will repaint this chart */
 #endif
     //    sheet()->emit_polygonInvalidated( m_child->framePointArray() );
 }
@@ -1819,7 +1819,7 @@ struct SetSelectionFirstLetterUpperWorker : public Sheet::CellWorker
   cell->setDisplayDirtyFlag();
   TQString tmp = cell->text();
   int len = tmp.length();
-  cell->setCellText( (tmp.tqat(0).upper()+tmp.right(len-1)) );
+  cell->setCellText( (tmp.at(0).upper()+tmp.right(len-1)) );
   cell->clearDisplayDirtyFlag();
     }
 };
@@ -6129,7 +6129,7 @@ KoRect Sheet::getRealRect( bool all )
     {
 
         if ( all || ( it.current()->isSelected() && ! it.current()->isProtect() ) )
-            rect |= it.current()->tqgeometry();
+            rect |= it.current()->geometry();
     }
 
     return rect;
@@ -6149,12 +6149,12 @@ KCommand *Sheet::moveObject(View *_view, double diffx, double diffy)
         if ( it.current()->isSelected() && !it.current()->isProtect())
         {
             _objects.append( it.current() );
-            KoRect tqgeometry = it.current()->tqgeometry();
-            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect br = doc()->zoomRect( tqgeometry/*it.current()->tqgeometry()*/ );
+            KoRect geometry = it.current()->geometry();
+            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect br = doc()->zoomRect( geometry/*it.current()->geometry()*/ );
             br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) );
             br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) );
-            canvas->tqrepaint( br ); // Previous position
+            canvas->repaint( br ); // Previous position
             canvas->repaintObject( it.current() ); // New position
             createCommand=true;
         }
@@ -6179,18 +6179,18 @@ KCommand *Sheet::moveObject(View *_view,const KoPoint &_move,bool key)
     {
         if ( it.current()->isSelected() && !it.current()->isProtect()) {
 
-            KoRect tqgeometry = it.current()->tqgeometry();
-            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect oldBoundingRect = doc()->zoomRect( tqgeometry );
+            KoRect geometry = it.current()->geometry();
+            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect oldBoundingRect = doc()->zoomRect( geometry );
 
 
-            KoRect r = it.current()->tqgeometry();
+            KoRect r = it.current()->geometry();
             r.moveBy( _move.x(), _move.y() );
 
             it.current()->setGeometry( r );
             _objects.append( it.current() );
 
-            canvas->tqrepaint( oldBoundingRect );
+            canvas->repaint( oldBoundingRect );
             canvas->repaintObject( it.current() );
         }
     }
@@ -6235,7 +6235,7 @@ void Sheet::unifyObjectName( EmbeddedObject *object ) {
         if ( rx.search( objectName ) != -1 ) {
             objectName.remove( rx );
         }
-        objectName += TQString(" (%1)").tqarg( count );
+        objectName += TQString(" (%1)").arg( count );
         object->setObjectName( objectName );
     }
 }
@@ -6479,7 +6479,7 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
                     loadRowFormat( rowElement, rowIndex, oasisContext, /*rowNode.isNull() ,*/ styleMap );
                     kdDebug()<<" table-row found :index row after "<<rowIndex<<endl;
                 }
-                else if ( rowElement.localName() == "tqshapes" )
+                else if ( rowElement.localName() == "shapes" )
                     loadOasisObjects( rowElement, oasisContext );
             }
         }
@@ -6685,7 +6685,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
             kdDebug()<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
+    format = TQString( "%1x%2" ).arg( width ).arg( height );
     kdDebug()<<" format : "<<format<<endl;
     d->print->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -8071,7 +8071,7 @@ void Sheet::updateCell( Cell */*cell*/, int _column, int _row )
   updateCellArea(cellArea);
 }
 
-void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
+void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint )
 {
     if ( doc()->isLoading() )
         return;
@@ -8081,7 +8081,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
       if ( c->row() == _row )
           c->setLayoutDirtyFlag( true );
 
-    if ( tqrepaint )
+    if ( repaint )
     {
         //All the cells in this row, or below this row will need to be repainted
         //So add that region of the sheet to the paint dirty list.
@@ -8256,7 +8256,7 @@ bool Sheet::saveChildren( KoStore* _store, const TQString &_path )
     {
         if ( it.current()->sheet() == this && ( it.current()->getType() == OBJECT_KOFFICE_PART || it.current()->getType() == OBJECT_CHART ) )
         {
-            TQString path = TQString( "%1/%2" ).tqarg( _path ).tqarg( i++ );
+            TQString path = TQString( "%1/%2" ).arg( _path ).arg( i++ );
             if ( !dynamic_cast<EmbeddedKOfficeObject*>( it.current() )->embeddedObject()->document()->saveToStore( _store, path ) )
                 return false;
         }
@@ -8279,7 +8279,7 @@ bool Sheet::saveOasisObjects( KoStore */*store*/, KoXmlWriter &xmlWriter, KoGenS
     {
       if ( !objectFound )
       {
-        xmlWriter.startElement( "table:tqshapes" );
+        xmlWriter.startElement( "table:shapes" );
         objectFound = true;
       }
       if ( !it.current()->saveOasisObject(sc)  )
@@ -8565,7 +8565,7 @@ void Sheet::printDebug()
                 cellDescr += " | ";
                 cellDescr += cell->text();
                 if ( cell->isFormula() )
-                    cellDescr += TQString("  [result: %1]").tqarg( cell->value().asString() );
+                    cellDescr += TQString("  [result: %1]").arg( cell->value().asString() );
                 kdDebug(36001) << cellDescr << endl;
             }
         }
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 2947728c..ff6272ac 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -240,11 +240,11 @@ public:
     Doc* doc() const;
 
     /**
-     * Saves the sheet and all it's tqchildren in XML format
+     * Saves the sheet and all it's children in XML format
      */
     virtual TQDomElement saveXML( TQDomDocument& );
     /**
-     * Loads the sheet and all it's tqchildren in XML format
+     * Loads the sheet and all it's children in XML format
      */
     virtual bool loadXML( const TQDomElement& );
 
@@ -259,12 +259,12 @@ public:
     void saveOasisPrintStyleLayout( KoGenStyle &style ) const;
 
     /**
-     * Saves a tqchildren
+     * Saves a children
      */
     virtual bool saveChildren( KoStore* _store, const TQString &_path );
     bool saveOasisObjects( KoStore *store, KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, int & indexObj, int &partIndexObj );
     /**
-     * Loads a tqchildren
+     * Loads a children
      */
     virtual bool loadChildren( KoStore* _store );
 
@@ -991,9 +991,9 @@ public:
     void autofill( TQRect &src, TQRect &dest );
 
 
-    bool insertChild( const KoRect& _tqgeometry, KoDocumentEntry& );
+    bool insertChild( const KoRect& _geometry, KoDocumentEntry& );
 
-    bool insertChart( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data );
+    bool insertChart( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data );
 
 
     /**
@@ -1016,7 +1016,7 @@ public:
      */
     bool insertPicture( const KoPoint& point, const TQPixmap& pixmap );
 
-    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry );
+    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _geometry );
 
     const TQColorGroup& colorGroup() { return widget()->colorGroup(); }
 
@@ -1033,7 +1033,7 @@ public:
      * Checks if the argument _column is out of the current maximum range of the vertical border
      * If this is the case, the current maximum value m_iMaxColumn is adjusted and the vertical border
      * is resized.
-     * Use this function with care, as it involves a tqrepaint of the border, when it is out of range.
+     * Use this function with care, as it involves a repaint of the border, when it is out of range.
      */
     void checkRangeHBorder ( int _column );
 
@@ -1048,7 +1048,7 @@ public:
      * Checks if the argument _row is out of the current maximum range of the horizontal border
      * If this is the case, the current maximum value m_iMaxRow is adjusted and the horizontal border
      * is resized.
-     * Use this function with care, as it involves a tqrepaint of the border, when it is out of range.
+     * Use this function with care, as it involves a repaint of the border, when it is out of range.
      */
     void checkRangeVBorder ( int _row );
 
@@ -1102,7 +1102,7 @@ public:
      */
     void refreshView(const Region& region);
 
-    void emit_updateRow( RowFormat *_format, int _row, bool tqrepaint = true );
+    void emit_updateRow( RowFormat *_format, int _row, bool repaint = true );
     void emit_updateColumn( ColumnFormat *_format, int _column );
 
     /**
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index 6f9a4f8b..a70445eb 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -126,8 +126,8 @@ TQRect SheetPrint::cellsPrintRange()
         }
     }
 
-    // Now look at the tqchildren
-    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->tqchildren() );
+    // Now look at the children
+    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->children() );
     double dummy;
     int i;
     for( ; cit.current(); ++cit )
@@ -190,7 +190,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range )
 	    }
                // filled = true;
 
-    //Page empty, but maybe tqchildren on it?
+    //Page empty, but maybe children on it?
 
         TQRect intView = TQRect( TQPoint( m_pDoc->zoomItX( m_pSheet->dblColumnPos( page_range.left() ) ),
                                        m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.top() ) ) ),
@@ -199,7 +199,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range )
                                        m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.bottom() ) +
                                                         m_pSheet->rowFormat( page_range.bottom() )->dblHeight() ) ) );
 
-        TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
+        TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() );
         for( ;it.current(); ++it )
         {
             TQRect bound = it.current()->boundingRect();
@@ -295,7 +295,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer )
            ( obj->getType() == OBJECT_CHART && m_bPrintCharts ) ) )
         continue;
 
-      TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->tqgeometry() );
+      TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->geometry() );
       TQPixmap *p = new TQPixmap( zoomRect.size() );
       TQPainter painter(p);
       painter.fillRect( p->rect(), TQColor("white") );
@@ -575,24 +575,24 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft,
     }
 
     //
-    // Draw the tqchildren
+    // Draw the children
     //
     TQRect zoomedView = m_pDoc->zoomRect( view );
-    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
+    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() );
     //TQPtrListIterator<EmbeddedObject> itObject( m_pDoc->embeddedObjects() );
 
     TQValueList<PrintObject *>::iterator itObject;
     for ( itObject = m_printObjects.begin(); itObject != m_printObjects.end(); ++itObject ) {
           EmbeddedObject *obj = (*itObject)->obj;
 //        TQString tmp=TQString("Testing child %1/%2 %3/%4 against view %5/%6 %7/%8")
-//        .tqarg(it.current()->contentRect().left())
-//        .tqarg(it.current()->contentRect().top())
-//        .tqarg(it.current()->contentRect().right())
-//        .tqarg(it.current()->contentRect().bottom())
-//        .tqarg(view.left()).tqarg(view.top()).tqarg(zoomedView.right()).tqarg(zoomedView.bottom());
+//        .arg(it.current()->contentRect().left())
+//        .arg(it.current()->contentRect().top())
+//        .arg(it.current()->contentRect().right())
+//        .arg(it.current()->contentRect().bottom())
+//        .arg(view.left()).arg(view.top()).arg(zoomedView.right()).arg(zoomedView.bottom());
 //        kdDebug(36001)<<tmp<<" offset "<<_childOffset.x()<<"/"<<_childOffset.y()<<endl;
 
-          KoRect const bound = obj->tqgeometry();
+          KoRect const bound = obj->geometry();
           TQRect zoomedBound = m_pDoc->zoomRect( KoRect(bound.left(), bound.top(),
               bound.width(),
               bound.height() ) );
@@ -614,14 +614,14 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft,
                                 -zoomedView.top() + m_pDoc->zoomItY( topLeft.y() ) );
 
             //obj->draw( &painter );
-            painter.drawPixmap( m_pDoc->zoomRect( obj->tqgeometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
+            painter.drawPixmap( m_pDoc->zoomRect( obj->geometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
 
             //painter.fillRect(zoomedBound, TQBrush("red")); //for debug purpose
             painter.restore();
         }
     }
 
-    //Don't let obscuring cells and tqchildren overpaint this area
+    //Don't let obscuring cells and children overpaint this area
     clipRegion -= TQRegion ( m_pDoc->zoomItX( leftBorderPts() + topLeft.x() ),
                             m_pDoc->zoomItY( topBorderPts() + topLeft.y() ),
                             m_pDoc->zoomItX( xpos ),
@@ -1303,7 +1303,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ
  	full_name=p->pw_gecos;
 
     if( email_addr.isEmpty())
-	email_addr = TQString("%1@%2").tqarg(p->pw_name).tqarg(hostname);
+	email_addr = TQString("%1@%2").arg(p->pw_name).arg(hostname);
 
     tmp = _data;
     int pos = 0;
diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h
index 0062476d..94affb99 100644
--- a/kspread/kspread_sheetprint.h
+++ b/kspread/kspread_sheetprint.h
@@ -449,7 +449,7 @@ private:
      *             the printing frame.
      *
      * @param _childOffset KoPoint used to calculate the correct position of
-     *                     tqchildren, if there are repeated columns/rows.
+     *                     children, if there are repeated columns/rows.
      */
     void printPage( TQPainter &_painter, const TQRect& page_range,
                     const KoRect& view, const KoPoint _childOffset );
@@ -492,7 +492,7 @@ private:
 
     /**
      * Returns a rect, which contains the cols and rows to be printed.
-     * It respects the printrange and the tqchildren
+     * It respects the printrange and the children
      */
     TQRect cellsPrintRange();
 
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index 8a483154..b868d913 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -102,7 +102,7 @@ void ToolBox::childEvent( TQChildEvent* ev )
 
 void ToolBox::mousePressEvent( TQMouseEvent* ev )
 {
-    m_startPos = tqgeometry().topLeft();
+    m_startPos = geometry().topLeft();
     m_mousePos = ev->globalPos();
 }
 
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc
index 47edd2ac..2bbbd0a0 100644
--- a/kspread/kspread_util.cc
+++ b/kspread/kspread_util.cc
@@ -76,16 +76,16 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col )
 TQString KSpread::util_rangeColumnName( const TQRect &_area)
 {
     return TQString("%1:%2")
-        .tqarg( Cell::columnName( _area.left()))
-        .tqarg( Cell::columnName(_area.right()));
+        .arg( Cell::columnName( _area.left()))
+        .arg( Cell::columnName(_area.right()));
 }
 
 //used in dialogs/kspread_dlg_papertqlayout.cc
 TQString KSpread::util_rangeRowName( const TQRect &_area)
 {
     return TQString("%1:%2")
-        .tqarg( _area.top())
-        .tqarg(_area.bottom());
+        .arg( _area.top())
+        .arg(_area.bottom());
 }
 
 TQString KSpread::util_rangeName(const TQRect &_area)
@@ -933,7 +933,7 @@ TQString KSpread::convertOasisPenToString( const TQPen & pen )
     //              a fast algorithm for diagonals. A line width of 1 will
     //              also produce a 1 pixel wide line, but uses a slower more
     //              accurate algorithm for diagonals.
-    TQString s = TQString( "%1pt " ).tqarg( (pen.width() == 0) ? 1 : pen.width() );
+    TQString s = TQString( "%1pt " ).arg( (pen.width() == 0) ? 1 : pen.width() );
     switch( pen.style() )
     {
     case TQt::NoPen:
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 89c5ff35..b54932da 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -237,7 +237,7 @@ public:
 
     TQPopupMenu *popupRow;
     TQPopupMenu *popupColumn;
-    TQPopupMenu* popupChild;       // for embedded tqchildren
+    TQPopupMenu* popupChild;       // for embedded children
     TQPopupMenu* popupListChoose;  // for list of choose
 
     // the child for which the popup menu has been opened.
@@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/)
 
 TQString KPSheetSelectPage::printOptionForIndex(unsigned int index)
 {
-  return TQString("sheetprintorder%1").tqarg(index);
+  return TQString("sheetprintorder%1").arg(index);
 }
 
 void KPSheetSelectPage::prependAvailableSheet(const TQString& sheetname)
@@ -1880,7 +1880,7 @@ View::~View()
     // of embedded child documents possible repaints in Sheet are not
     // performed. The repains can happen if you delete an embedded document,
     // which leads to an regionInvalidated() signal emission in KoView, which calls
-    // tqrepaint, etc.etc. :-) (Simon)
+    // repaint, etc.etc. :-) (Simon)
 
     delete d->selection;
     delete d->choice;
@@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet )
   if ( updateSheet )
   {
     d->tabBar->setActiveTab( _t->sheetName() );
-    d->vBorderWidget->tqrepaint();
-    d->hBorderWidget->tqrepaint();
+    d->vBorderWidget->repaint();
+    d->hBorderWidget->repaint();
     d->activeSheet->setRegionPaintDirty(TQRect(TQPoint(0,0), TQPoint(KS_colMax, KS_rowMax)));
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
@@ -3914,8 +3914,8 @@ void View::changeSheet( const TQString& _name )
     updateBorderButton();
 
     //update visible area
-    d->vBorderWidget->tqrepaint();
-    d->hBorderWidget->tqrepaint();
+    d->vBorderWidget->repaint();
+    d->hBorderWidget->repaint();
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
     t->setRegionPaintDirty( t->visibleRect( d->canvas ) );
@@ -4971,7 +4971,7 @@ void View::print( KPrinter &prt )
         Sheet* sheet = doc()->map()->findSheet(*sheetlistiterator);
         if (sheet == NULL)
         {
-          kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*sheetlistiterator) << endl;
+          kdWarning() << i18n("Sheet %1 could not be found for printing").arg(*sheetlistiterator) << endl;
           continue;
         }
 
@@ -5038,7 +5038,7 @@ void View::print( KPrinter &prt )
             if( !prt.previewOnly() )
             {
                 KMessageBox::information( 0,
-                i18n("Nothing to print for sheet %1.").tqarg(
+                i18n("Nothing to print for sheet %1.").arg(
                 d->activeSheet->sheetName()) );
                 //@todo: make sure we really can comment this out,
                 //       what to do with partially broken printouts?
@@ -5051,13 +5051,13 @@ void View::print( KPrinter &prt )
     this->setActiveSheet(selectedsheet);
 }
 
-void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
+void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e )
 {
     if ( !d->activeSheet )
       return;
 
     // Transform the view coordinates to document coordinates
-    KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
+    KoRect unzoomedRect = doc()->unzoomRect( _geometry );
     unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
     InsertObjectCommand *cmd = 0;
@@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
     cmd->execute();
 }
 
-void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e )
+void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e )
 {
   if ( !d->activeSheet )
     return;
 
   // Transform the view coordinates to document coordinates
-  KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
+  KoRect unzoomedRect = doc()->unzoomRect( _geometry );
   unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
   InsertObjectCommand *cmd = new InsertObjectCommand( unzoomedRect, _e, d->canvas );
@@ -5135,11 +5135,11 @@ void View::slotUpdateChildGeometry( EmbeddedKOfficeObject */*_child*/ )
   assert( f != 0L );
 
   // Are we already up to date ?
-  if ( _child->tqgeometry() == f->partGeometry() )
+  if ( _child->geometry() == f->partGeometry() )
     return;
 
   // TODO zooming
-  f->setPartGeometry( _child->tqgeometry() );
+  f->setPartGeometry( _child->geometry() );
     */
 }
 
@@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ )
 //                 return 0;
 //     }
 //
-//     TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() );
+//     TQPtrListIterator<KoDocumentChild> it( doc()->children() );
 //     for (; it.current(); ++it )
 //     {
 //         // Is the child document on the visible sheet ?
@@ -6401,7 +6401,7 @@ void View::styleDialog()
     d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) );
   }
   if ( d->canvas )
-    d->canvas->tqrepaint();
+    d->canvas->repaint();
 }
 
 void View::paperLayoutDlg()
@@ -6748,9 +6748,9 @@ void View::zoomMinus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 
 void View::zoomPlus()
@@ -6763,9 +6763,9 @@ void View::zoomPlus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 */
 
@@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet )
 void View::slotRefreshView()
 {
   refreshView();
-  d->canvas->tqrepaint();
-  d->vBorderWidget->tqrepaint();
-  d->hBorderWidget->tqrepaint();
+  d->canvas->repaint();
+  d->vBorderWidget->repaint();
+  d->hBorderWidget->repaint();
 }
 
 void View::slotUpdateView( Sheet *_sheet )
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index 2dfecfa5..f9ce1bdd 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -253,22 +253,22 @@ public:
 
     /**
      *
-     * @param _tqgeometry is the zoomed tqgeometry of the new child.
+     * @param _geometry is the zoomed geometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
+    void insertChart( const TQRect& _geometry, KoDocumentEntry& _entry );
     /**
      *
-     * @param _tqgeometry is the tqgeometry of the new child.
+     * @param _geometry is the geometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
+    void insertChild( const TQRect& _geometry, KoDocumentEntry& _entry );
 
-   // void insertPicture( const TQRect& _tqgeometry, KURL& _file );
+   // void insertPicture( const TQRect& _geometry, KURL& _file );
 
     virtual void print( KPrinter &printer );
     virtual void setupPrinter( KPrinter &printer );
@@ -321,7 +321,7 @@ public:
     void updateShowSheetMenu();
 
     /**
-     * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint)
+     * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a repaint)
      * They will be repainted on the next call to paintUpdates()
      */
     void markSelectionAsDirty();
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index bed111ba..57e52fcf 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r
   if ( cell->textWidth() > long_max )
   {
     double indent = 0.0;
-    Format::Align tqalignment = cell->format()->align(cell->column(), cell->row());
-    if (tqalignment == Format::Undefined)
+    Format::Align alignment = cell->format()->align(cell->column(), cell->row());
+    if (alignment == Format::Undefined)
     {
       if (cell->value().isNumber() || cell->isDate() || cell->isTime())
       {
-        tqalignment = Format::Right;
+        alignment = Format::Right;
       }
       else
       {
-        tqalignment = Format::Left;
+        alignment = Format::Left;
       }
     }
 
-    if (tqalignment == Format::Left)
+    if (alignment == Format::Left)
     {
       indent = cell->format()->getIndent( cell->column(), cell->row() );
     }
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 730cd404..e1a1d4c3 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry()
     s.setWidth(mSmallPage->fontMetrics().width("MMM"));
     s.setHeight(mSmallPage->fontMetrics().lineSpacing());
 
-    l = (TQObjectList*)mSmallPage->tqchildren(); // silence please
+    l = (TQObjectList*)mSmallPage->children(); // silence please
 
     for(uint i=0; i < l->count(); i++)
     {
@@ -593,7 +593,7 @@ void TQtCalculator::updateGeometry()
         }
     }
 
-    l = (TQObjectList*)mLargePage->tqchildren(); // silence please
+    l = (TQObjectList*)mLargePage->children(); // silence please
 
     int h1 = pbF->minimumSize().height();
     int h2 = (int)((((float)h1 + 4.0) / 5.0));
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index 1bb16a95..c0d5c1ca 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -194,7 +194,7 @@ void PluginInsertCalendar::slotInsertCalendar(const TQDate &start, const TQDate
   int row = selection.y();
   int col = selection.x();
   int colstart = col; //this is where we get back after each week
-  sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(end.toString()));
+  sheet->setText(row,colstart,i18n("Calendar from %1 to %2").arg(start.toString()).arg(end.toString()));
 
   TQDate current(start);
 //   TQDate previous(current);
diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
index 108516dc..9f67dfbb 100644
--- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
+++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
@@ -45,9 +45,9 @@ using namespace Kross::KSpreadCore;
 KSpreadCoreModule::KSpreadCoreModule(Kross::Api::Manager* manager)
     : Kross::Api::Module("kspreadcore") , m_manager(manager)
 {
-    TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
-    kdDebug() << " 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() << " there are " << children.size() << endl;
+    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
     {
         kdDebug() << it.key() << " " << it.data() << endl;
     }
diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc
index 17179793..d44b7bf3 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cc
@@ -65,7 +65,7 @@ static TQString boolAsString( bool b )
 
 static TQString longAsHexstring( long l )
 {
-    return TQString("%1").tqarg(l, 8, 16);
+    return TQString("%1").arg(l, 8, 16);
 }
 
 static TQString dirAsString( Sheet::LayoutDirection dir )
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index 0c9e9e97..5b4864ad 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -108,7 +108,7 @@ void TestRunner::runTest()
   if( tester )
   {
     d->logView->clear();
-    d->logView->append( TQString("Test: %1").tqarg( testName ) );
+    d->logView->append( TQString("Test: %1").arg( testName ) );
 
     TQApplication::setOverrideCursor(TQt::waitCursor);
     tester->run();
@@ -117,13 +117,13 @@ void TestRunner::runTest()
     TQStringList errorList = tester->errors();
     if( tester->failed() )
     {
-      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( tester->count() ).
+      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").arg( tester->count() ).
         arg(  tester->failed() ) );
       for( unsigned k = 0; k < errorList.count(); k++ )
         d->logView->append( errorList[k] );
     }
     else
-      d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) );
+      d->logView->append( TQString( "%1 tests, everything is OK. ").arg( tester->count() ) );
 
     d->logView->append( "Test finished." );
   }
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc
index 9e3c57da..1eda41da 100644
--- a/kspread/valueformatter.cc
+++ b/kspread/valueformatter.cc
@@ -358,15 +358,15 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType)
         diff = fabs(result - calc);
       }
     }
-    if( index1 == 0 ) return TQString("%1").tqarg( floor(value) );
-    if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 );
+    if( index1 == 0 ) return TQString("%1").arg( floor(value) );
+    if( index1 == index ) return TQString("%1").arg( floor(value)+1 );
     if( floor(value) == 0)
-      return TQString("%1/%2").tqarg( index1 ).tqarg( index );
+      return TQString("%1/%2").arg( index1 ).arg( index );
 
     return TQString("%1 %2/%3")
-        .tqarg( floor(value) )
-        .tqarg( index1 )
-        .tqarg( index );
+        .arg( floor(value) )
+        .arg( index1 )
+        .arg( index );
   }
 
 
@@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType)
   else
   {
     if ( floor(value) == 0 )
-      return TQString("%1/%2").tqarg(numerator).tqarg(denominator);
+      return TQString("%1/%2").arg(numerator).arg(denominator);
     else
       return TQString("%1 %2/%3")
-        .tqarg(floor(value))
-        .tqarg(numerator)
-        .tqarg(denominator);
+        .arg(floor(value))
+        .arg(numerator)
+        .arg(denominator);
   }
 }
 
@@ -436,35 +436,35 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType)
 
   if (fmtType == Time_format1) {  // 9 : 01 AM
     return TQString("%1:%2 %3")
-      .tqarg((pm ? h - 12 : h),2)
-      .tqarg(minute,2)
-      .tqarg(AMPM);
+      .arg((pm ? h - 12 : h),2)
+      .arg(minute,2)
+      .arg(AMPM);
   }
 
   if (fmtType == Time_format2) {  //9:01:05 AM
     return TQString("%1:%2:%3 %4")
-      .tqarg((pm ? h-12 : h),2)
-      .tqarg(minute,2)
-      .tqarg(second,2)
-      .tqarg(AMPM);
+      .arg((pm ? h-12 : h),2)
+      .arg(minute,2)
+      .arg(second,2)
+      .arg(AMPM);
   }
 
   if (fmtType == Time_format3) {
     return TQString("%1 %2 %3 %4 %5 %6")      // 9 h 01 min 28 s
-      .tqarg(hour,2)
-      .tqarg(i18n("h"))
-      .tqarg(minute,2)
-      .tqarg(i18n("min"))
-      .tqarg(second,2)
-      .tqarg(i18n("s"));
+      .arg(hour,2)
+      .arg(i18n("h"))
+      .arg(minute,2)
+      .arg(i18n("min"))
+      .arg(second,2)
+      .arg(i18n("s"));
   }
 
   if (fmtType == Time_format4) {  // 9:01
-    return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2);
+    return TQString("%1:%2").arg(hour, 2).arg(minute, 2);
   }
 
   if (fmtType == Time_format5) {  // 9:01:12
-    return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(second, 2);
+    return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2);
   }
 
   TQDate d1(dt.date());
@@ -476,15 +476,15 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType)
   if (fmtType == Time_format6)
   {  // [mm]:ss
     m += (h * 60);
-    return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2);
+    return TQString("%1:%2").arg(m, 1).arg(second, 2);
   }
   if (fmtType == Time_format7) {  // [h]:mm:ss
-    return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2);
+    return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2);
   }
   if (fmtType == Time_format8)
   {  // [h]:mm
     m += (h * 60);
-    return TQString("%1:%2").tqarg(h, 1).tqarg(minute, 2);
+    return TQString("%1:%2").arg(h, 1).arg(minute, 2);
   }
 
   return converter->locale()->formatTime( dt.time(), false );
@@ -540,7 +540,7 @@ TQString ValueFormatter::dateFormat (const TQDate &date, FormatType fmtType)
     tmp += TQString::number(date.year());
   }
   else if (fmtType == date_format10) {  /*F-99 */
-    tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-";
+    tmp = converter->locale()->calendar()->monthString(date, false).at(0) + "-";
     tmp += TQString::number(date.year()).right(2);
   }
   else if (fmtType == date_format11) {  /*18/Feb */
diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp
index d486ae9d..3d4ba603 100644
--- a/kugar/kudesigner_lib/canvas.cpp
+++ b/kugar/kudesigner_lib/canvas.cpp
@@ -162,11 +162,11 @@ bool Canvas::loadXML( const TQDomNode &report )
     templ->props[ "RightMargin" ].setValue( attributes.namedItem( "RightMargin" ).nodeValue().toInt() );
 
     // Get all the child report elements
-    TQDomNodeList tqchildren = report.childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = report.childNodes();
+    int childCount = children.length();
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = tqchildren.item( j );
+        TQDomNode child = children.item( j );
 
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
@@ -301,12 +301,12 @@ void Canvas::setDetailFooterAttributes( TQDomNode *node )
 
 void Canvas::addReportItems( TQDomNode *node, Band *section )
 {
-    TQDomNodeList tqchildren = node->childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = node->childNodes();
+    int childCount = children.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = tqchildren.item( j );
+        TQDomNode child = children.item( j );
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
             if ( child.nodeName() == "Line" )
diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp
index db3765f8..a9f2faa5 100644
--- a/kugar/kudesigner_lib/detail.cpp
+++ b/kugar/kudesigner_lib/detail.cpp
@@ -39,7 +39,7 @@ Detail::Detail( int x, int y, int width, int height, int level, Canvas *canvas )
 
 void Detail::draw( TQPainter &painter )
 {
-    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail" ) ).tqarg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).arg( i18n( "Detail" ) ).arg( props[ "Level" ].value().toInt() );
     painter.drawText( rect(), AlignVCenter | AlignLeft, str );
     Band::draw( painter );
 }
diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp
index 14b5e13f..b1715920 100644
--- a/kugar/kudesigner_lib/detailfooter.cpp
+++ b/kugar/kudesigner_lib/detailfooter.cpp
@@ -36,7 +36,7 @@ DetailFooter::DetailFooter( int x, int y, int width, int height, int level, Canv
 
 void DetailFooter::draw( TQPainter &painter )
 {
-    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Footer" ) ).tqarg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Footer" ) ).arg( props[ "Level" ].value().toInt() );
     painter.drawText( rect(), AlignVCenter | AlignLeft, str );
     Band::draw( painter );
 }
diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp
index 071dea72..d43ce942 100644
--- a/kugar/kudesigner_lib/detailheader.cpp
+++ b/kugar/kudesigner_lib/detailheader.cpp
@@ -36,7 +36,7 @@ DetailHeader::DetailHeader( int x, int y, int width, int height, int level, Canv
 
 void DetailHeader::draw( TQPainter &painter )
 {
-    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Header" ) ).tqarg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Header" ) ).arg( props[ "Level" ].value().toInt() );
     painter.drawText( rect(), AlignVCenter | AlignLeft, str );
     Band::draw( painter );
 }
diff --git a/kugar/kudesigner_lib/propertyserializer.cpp b/kugar/kudesigner_lib/propertyserializer.cpp
index 32ebe470..ae9f30d7 100644
--- a/kugar/kudesigner_lib/propertyserializer.cpp
+++ b/kugar/kudesigner_lib/propertyserializer.cpp
@@ -40,7 +40,7 @@ TQString PropertySerializer::toString( Property *prop )
     switch ( prop->type() )
     {
     case KoProperty::Color:
-        return TQString( "%1,%2,%3" ).tqarg( val.toColor().red() ).tqarg( val.toColor().green() ).tqarg( val.toColor().blue() );
+        return TQString( "%1,%2,%3" ).arg( val.toColor().red() ).arg( val.toColor().green() ).arg( val.toColor().blue() );
     case KoProperty::Boolean:
         return val.toBool() ? "true" : "false";
     case KoProperty::Font:
@@ -67,7 +67,7 @@ TQVariant PropertySerializer::fromString( Property *prop, const TQString &str )
     case KoProperty::LineStyle:
         return TQVariant( str.toInt() );
     case KoProperty::Symbol:
-        return TQVariant( str.tqat( 0 ).latin1() );
+        return TQVariant( str.at( 0 ).latin1() );
     default:
         return TQVariant( str );
     }
diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp
index 7ad4ac1b..01b4289e 100644
--- a/kugar/kudesigner_lib/structurewidget.cpp
+++ b/kugar/kudesigner_lib/structurewidget.cpp
@@ -142,7 +142,7 @@ void StructureWidget::refreshSection( Kudesigner::Band *section, StructureItem *
         break;
     }
     if ( level > 0 )
-        name += tqtr( " (level %1)" ).tqarg( level );
+        name += tqtr( " (level %1)" ).arg( level );
     StructureItem *item = new StructureItem( root, name );
     m_items[ section ] = item;
 
@@ -165,18 +165,18 @@ void StructureWidget::refreshSectionContents( Kudesigner::Band *section, Structu
         switch ( box->rtti() )
         {
         case Kudesigner::Rtti_Label:
-            name = tqtr( "Label: %1" ).tqarg( box->props[ "Text" ].value().toString() );
+            name = tqtr( "Label: %1" ).arg( box->props[ "Text" ].value().toString() );
             break;
         case Kudesigner::Rtti_Field:
-            name = tqtr( "Field: %1" ).tqarg( box->props[ "Field" ].value().toString() );
+            name = tqtr( "Field: %1" ).arg( box->props[ "Field" ].value().toString() );
             break;
         case Kudesigner::Rtti_Calculated:
-            name = tqtr( "Calculated Field: %1" ).tqarg( box->props[ "Field" ].value().toString() );
+            name = tqtr( "Calculated Field: %1" ).arg( box->props[ "Field" ].value().toString() );
             break;
         case Kudesigner::Rtti_Special:
             idx = box->props[ "Type" ].listData()->keys.findIndex(
                       box->props[ "Type" ].value().toInt() );
-            name = tqtr( "Special Field: %1" ).tqarg( box->props[ "Type" ].listData()->keys[ idx ].toString() );
+            name = tqtr( "Special Field: %1" ).arg( box->props[ "Type" ].listData()->keys[ idx ].toString() );
             break;
         case Kudesigner::Rtti_Line:
             name = tqtr( "Line" );
@@ -198,7 +198,7 @@ void StructureWidget::selectionMade()
         {
             StructureItem * item = static_cast<StructureItem*>( m_items[ *it ] );
             item->setBold( true );
-            item->tqrepaint();
+            item->repaint();
             m_selected.append( item );
         }
     }
@@ -211,7 +211,7 @@ void StructureWidget::selectionClear()
         if ( ( *it ) == 0 )
             continue;
         ( *it ) ->setBold( false );
-        ( *it ) ->tqrepaint();
+        ( *it ) ->repaint();
     }
     m_selected.clear();
 }
diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp
index 6a0db974..fecbd560 100644
--- a/kugar/lib/mlabelobject.cpp
+++ b/kugar/lib/mlabelobject.cpp
@@ -29,7 +29,7 @@ MLabelObject::MLabelObject() : MReportObject(), xMargin( 0 ), yMargin( 0 )
     fontWeight = MLabelObject::Normal;
     fontItalic = false;
 
-    // Set the default tqalignment
+    // Set the default alignment
     hAlignment = MLabelObject::Left;
     vAlignment = MLabelObject::Top;
     wordWrap = false;
@@ -76,13 +76,13 @@ void MLabelObject::setFont( const TQString family, int size, int weight, bool it
     fontItalic = italic;
 }
 
-/** Sets the label's horizontal tqalignment */
+/** Sets the label's horizontal alignment */
 void MLabelObject::setHorizontalAlignment( int a )
 {
     hAlignment = a;
 }
 
-/** Sets the label's vertical tqalignment */
+/** Sets the label's vertical alignment */
 void MLabelObject::setVerticalAlignment( int a )
 {
     vAlignment = a;
@@ -113,7 +113,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset )
     p->setFont( font );
     TQFontMetrics fm = p->fontMetrics();
 
-    // Set the text tqalignment flags
+    // Set the text alignment flags
 
     //Qt::Horizontal
     switch ( hAlignment )
@@ -165,7 +165,7 @@ void MLabelObject::copy( const MLabelObject* mLabelObject )
     fontWeight = mLabelObject->fontWeight;
     fontItalic = mLabelObject->fontItalic;
 
-    // Copy the label's tqalignment data
+    // Copy the label's alignment data
     vAlignment = mLabelObject->vAlignment;
     hAlignment = mLabelObject->hAlignment;
     wordWrap = mLabelObject->wordWrap;
diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h
index 2b35f233..3526552e 100644
--- a/kugar/lib/mlabelobject.h
+++ b/kugar/lib/mlabelobject.h
@@ -27,9 +27,9 @@ class MLabelObject : public MReportObject
 public:
     /** Font weight constants */
     enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 };
-    /**Qt::Horizontal tqalignment constants */
+    /**Qt::Horizontal alignment constants */
     enum HAlignment { Left = 0, Center, Right };
-    /** Vertial tqalignment constants */
+    /** Vertial alignment constants */
     enum VAlignment { Top = 0, Middle, Bottom };
 
     /** Constructor */
@@ -52,9 +52,9 @@ protected:
     int fontWeight;
     /** Label text font italic flag */
     bool fontItalic;
-    /** Lable text horizontal tqalignment */
+    /** Lable text horizontal alignment */
     int hAlignment;
-    /** Label text vertical tqalignment  */
+    /** Label text vertical alignment  */
     int vAlignment;
     /** Label text word wrap flag  */
     bool wordWrap;
@@ -70,9 +70,9 @@ public:
     virtual void setText( const TQString txt );
     /** Sets the label's text font - default is Times,10,Normal,false */
     void setFont( const TQString family, int size, int weight, bool italic );
-    /** Sets the label's horizontal tqalignment -default is Left */
+    /** Sets the label's horizontal alignment -default is Left */
     void setHorizontalAlignment( int a );
-    /** Sets the label's vertical tqalignment - default is Top */
+    /** Sets the label's vertical alignment - default is Top */
     void setVerticalAlignment( int a );
     /** Sets the label's word wrap flag - default is false */
     void setWordWrap( bool state );
diff --git a/kugar/lib/mlineobject.cpp b/kugar/lib/mlineobject.cpp
index 2a4a0bc9..abd7927c 100644
--- a/kugar/lib/mlineobject.cpp
+++ b/kugar/lib/mlineobject.cpp
@@ -14,7 +14,7 @@ namespace Kugar
 /** Constructor */
 MLineObject::MLineObject() : TQObject()
 {
-    // Set the object's default tqgeometry
+    // Set the object's default geometry
     xpos1 = 0;
     ypos1 = 0;
     xpos2 = 0;
@@ -104,7 +104,7 @@ void MLineObject::drawBase( TQPainter* p, int xoffset, int yoffset )
     Used by the copy constructor and assignment operator */
 void MLineObject::copy( const MLineObject* mLineObject )
 {
-    // Copy the object's tqgeometry
+    // Copy the object's geometry
     xpos1 = mLineObject->xpos1;
     ypos1 = mLineObject->ypos1;
     xpos2 = mLineObject->xpos2;
diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp
index 77f402ed..2263ba61 100644
--- a/kugar/lib/mreportengine.cpp
+++ b/kugar/lib/mreportengine.cpp
@@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions()
     recalcAttribute( "LeftMargin", rattributes );
     recalcAttribute( "RightMargin", rattributes );
 
-    TQDomNodeList tqchildren = report.childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = report.childNodes();
+    int childCount = children.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        child = tqchildren.item( j );
+        child = children.item( j );
         TQDomNamedNodeMap attributes = child.attributes();
 
-        TQDomNodeList tqchildren2 = child.childNodes();
-        int childCount2 = tqchildren2.length();
+        TQDomNodeList children2 = child.childNodes();
+        int childCount2 = children2.length();
         recalcAttribute( "Height", attributes );
 
         for ( int k = 0; k < childCount2; k++ )
         {
-            TQDomNode child2 = tqchildren2.item( k );
+            TQDomNode child2 = children2.item( k );
             TQDomNamedNodeMap attributes = child2.attributes();
             recalcAttribute( "X", attributes );
             recalcAttribute( "Y", attributes );
@@ -685,7 +685,7 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att
 {
     if ( !attributes.namedItem( name ).isNull() )
     {
-        attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
+        attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
     }
 }
 
@@ -712,12 +712,12 @@ void MReportEngine::initTemplate()
     setReportAttributes( &report );
 
     // Get all the child report elements
-    TQDomNodeList tqchildren = report.childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = report.childNodes();
+    int childCount = children.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        child = tqchildren.item( j );
+        child = children.item( j );
 
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
@@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re
     section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() );
 
     // Process the sections labels
-    TQDomNodeList tqchildren = report->childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = report->childNodes();
+    int childCount = children.length();
 
     // For each label, extract the attr list and add the new label
     // to the sections's label collection
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = tqchildren.item( j );
+        TQDomNode child = children.item( j );
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
             if ( child.nodeName() == "Line" )
@@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report )
     detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" );
 
     // Process the report detail labels
-    TQDomNodeList tqchildren = report->childNodes();
-    int childCount = tqchildren.length();
+    TQDomNodeList children = report->childNodes();
+    int childCount = children.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = tqchildren.item( j );
+        TQDomNode child = children.item( j );
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
             if ( child.nodeName() == "Line" )
diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp
index 7fec9dd9..7a9366f6 100644
--- a/kugar/lib/mreportobject.cpp
+++ b/kugar/lib/mreportobject.cpp
@@ -16,7 +16,7 @@ namespace Kugar
 /** Constructor */
 MReportObject::MReportObject() : TQObject()
 {
-    // Set the object's default tqgeometry
+    // Set the object's default geometry
     xpos = 0;
     ypos = 0;
     width = 40;
@@ -166,7 +166,7 @@ void MReportObject::setBorderStyle( int style )
     Used by the copy constructor and assignment operator */
 void MReportObject::copy( const MReportObject* mReportObject )
 {
-    // Copy the object's tqgeometry
+    // Copy the object's geometry
     xpos = mReportObject->xpos;
     ypos = mReportObject->ypos;
     width = mReportObject->width;
diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp
index 5040d64c..b412d332 100644
--- a/kugar/lib/mreportsection.cpp
+++ b/kugar/lib/mreportsection.cpp
@@ -17,7 +17,7 @@ namespace Kugar
 /** Constructor */
 MReportSection::MReportSection()
 {
-    // Set tqgeometry
+    // Set geometry
     height = 50;
 
     // Set print frequency
@@ -293,7 +293,7 @@ void MReportSection::drawObjects( TQPainter* p, int xoffset, int yoffset )
       Used by the copy constructor and assignment operator */
 void MReportSection::copy( const MReportSection* mReportSection )
 {
-    // Copy the section's tqgeometry
+    // Copy the section's geometry
     height = mReportSection->height;
 
     // Copy the print frequency
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index 9e7f02d1..5cbacf58 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage()
     if ( ( page = report->getFirstPage() ) != 0 )
     {
         display->setPage( page );
-        display->tqrepaint();
+        display->repaint();
     }
 }
 
@@ -192,7 +192,7 @@ void MReportViewer::slotNextPage()
     if ( ( page = report->getNextPage() ) != 0 )
     {
         display->setPage( page );
-        display->tqrepaint();
+        display->repaint();
     }
     else
         report->setCurrentPage( index );
@@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage()
     if ( ( page = report->getPreviousPage() ) != 0 )
     {
         display->setPage( page );
-        display->tqrepaint();
+        display->repaint();
     }
     else
         report->setCurrentPage( index );
@@ -228,7 +228,7 @@ void MReportViewer::slotLastPage()
     if ( ( page = report->getLastPage() ) != 0 )
     {
         display->setPage( page );
-        display->tqrepaint();
+        display->repaint();
     }
 }
 
diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp
index f70b67bf..e53c1ef2 100644
--- a/kugar/lib/mutil.cpp
+++ b/kugar/lib/mutil.cpp
@@ -40,40 +40,40 @@ TQString MUtil::formatDate( const TQDate& value, int format )
     switch ( format )
     {
     case MUtil::MDY_SLASH:
-        string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
+        string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( year );
         break;
     case MUtil::MDY_DASH:
-        string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
+        string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year );
         break;
     case MUtil::MMDDY_SLASH:
-        string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year );
+        string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year );
         break;
     case MUtil::MMDDY_DASH:
-        string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year );
+        string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year );
         break;
     case MUtil::MDYYYY_SLASH:
-        string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
+        string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
         break;
     case MUtil::MDYYYY_DASH:
-        string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
+        string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
         break;
     case MUtil::MMDDYYYY_SLASH:
-        string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
+        string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() );
         break;
     case MUtil::MMDDYYYY_DASH:
-        string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
+        string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() );
         break;
     case MUtil::YYYYMD_SLASH:
-        string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
+        string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
         break;
     case MUtil::YYYYMD_DASH:
-        string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
+        string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
         break;
     case MUtil::DDMMYY_PERIOD:
-        string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year );
+        string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year );
         break;
     case MUtil::DDMMYYYY_PERIOD:
-        string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() );
+        string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() );
         break;
     default:
         string = value.toString();
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 38ac5257..894dd1eb 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -89,19 +89,19 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ )
                 }
             }
             if ( !ok )
-                KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) );
+                KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).arg( m_file ) );
         }
         else
         {
             ok = false;
-            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) );
+            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) );
         }
 
     }
     else
     {
         ok = false;
-        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( m_file ) );
+        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) );
     }
 
     return ok;
@@ -166,7 +166,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                 if ( KIO::NetAccess::download( tmpURL, localtpl ) )
                     isTemp = true;
                 else
-                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
             }
             else
                 localtpl = tpl;
@@ -183,7 +183,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                 if ( KIO::NetAccess::download( tmpURL, localtpl ) )
                     isTemp = true;
                 else
-                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
             }
         }
     }
@@ -192,7 +192,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
         if ( KIO::NetAccess::download( url, localtpl ) )
             isTemp = true;
         else
-            KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
+            KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
     }
 
 /*    kdDebug() << "localtpl: " << localtpl.latin1() << endl;*/
@@ -215,7 +215,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
 /*                    kdDebug() << "RawXML" << endl;*/
                     f.open( IO_ReadOnly );
                     if ( !m_reportEngine -> setReportTemplate( TQT_TQIODEVICE(&f) ) )
-                        KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).arg( localtpl ) );
                     else
                     {
                         m_templateOk = true;
@@ -229,13 +229,13 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                     if ( tmpStore->open( "maindoc.xml" ) )
                     {
                         if ( !m_reportEngine -> setReportTemplate( tmpStore->device() ) )
-                            KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) );
+                            KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) );
                         else
                             m_templateOk = true;
                         tmpStore->close();
                     }
                     else
-                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) );
 
                     delete tmpStore;
                 }
@@ -244,12 +244,12 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
             else
             {
                 f.close();
-                KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) );
+                KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).arg( localtpl ) );
             }
 
         }
         else
-            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) );
+            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) );
 
         if ( isTemp )
             KIO::NetAccess::removeTempFile( localtpl );
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index ddd8dfe1..2b5cc63b 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -90,12 +90,12 @@ bool KugarPart::openFile()
                 ok = true;
         }
         else
-            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) );
+            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) );
 
         f.close();
     }
     else
-        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) );
+        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) );
 
     return ok;
 }
diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp
index 11136e3d..6e99f0c9 100644
--- a/kword/KWAnchor.cpp
+++ b/kword/KWAnchor.cpp
@@ -234,7 +234,7 @@ void KWAnchor::resize()
         if ( parag )
         {
             kdDebug(32001) << "KWAnchor::resize invalidating parag " << parag->paragId() << endl;
-            parag->tqinvalidate( 0 );
+            parag->invalidate( 0 );
         }
     }
 }
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 00fe2a85..58baa44b 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -201,7 +201,7 @@ void KWCanvas::repaintChanged( KWFrameSet * fs, bool resetChanged )
 void KWCanvas::repaintAll( bool erase /* = false */ )
 {
     //kdDebug(32002) << "KWCanvas::repaintAll erase=" << erase << endl;
-    viewport()->tqrepaint( erase );
+    viewport()->repaint( erase );
 }
 
 void KWCanvas::viewportResizeEvent( TQResizeEvent * )
@@ -2231,7 +2231,7 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint
         sizeRect.setX( TQMAX(0, sizeRect.x()) ); // otherwise it would get wider than the page
     }
 
-    // each frame in m_frames should be retqshaped from the original size stored in the
+    // each frame in m_frames should be reshaped from the original size stored in the
     // m_frameResize data to a size that equals the reshaping of m_boundingrect to sizeRect
     class Converter {
       public:
diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h
index 955ea605..c2020697 100644
--- a/kword/KWCanvas.h
+++ b/kword/KWCanvas.h
@@ -76,13 +76,13 @@ public:
 
     void repaintAll( bool erase = false );
     /**
-     * Only tqrepaint the frameset @p fs.
+     * Only repaint the frameset @p fs.
      * @p resetChanged should only be true for the last view
      * (see KWFrameSet::drawContents)
      */
     void repaintChanged( KWFrameSet * fs, bool resetChanged );
 
-    /** We need to tqrepaint if the window is resized. */
+    /** We need to repaint if the window is resized. */
     void viewportResizeEvent( TQResizeEvent * );
 
     void print( TQPainter *painter, KPrinter *printer );
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index 47fda3e6..8c1d0e69 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -179,7 +179,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
             parag->setFormat( 0, len, parag->paragFormat(), TRUE );
             parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) );
         }
-        parag->tqinvalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo)
+        parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo)
         parag->setChanged( TRUE );
         parag = static_cast<KWTextParag *>(parag->next());
         //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl;
@@ -1746,7 +1746,7 @@ KWInsertRemovePageCommand::~KWInsertRemovePageCommand() {
 TQString KWInsertRemovePageCommand::name() const
 {
     return m_cmd == Insert ? i18n("Insert Page") // problem with after/before page
-                  : i18n("Delete Page %1").tqarg(m_pgNum);
+                  : i18n("Delete Page %1").arg(m_pgNum);
 }
 
 void KWInsertRemovePageCommand::execute() {
@@ -1977,7 +1977,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet
     if (  m_var->numberingType()== KWFootNoteVariable::Manual)
     {
         m_var->resize();
-        m_var->paragraph()->tqinvalidate(0);
+        m_var->paragraph()->invalidate(0);
         m_var->paragraph()->setChanged( true );
     }
 
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index d0a45a01..b368af2e 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -803,7 +803,7 @@ ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, cha
     labelStartingPage->setBuddy( m_variableNumberOffset );
 
     TQHBox* hbTabStop = new TQHBox( gbDocumentSettings );
-    tabStop = new TQLabel(i18n("Tab stop (%1):").tqarg(doc->unitName()), hbTabStop);
+    tabStop = new TQLabel(i18n("Tab stop (%1):").arg(doc->unitName()), hbTabStop);
     m_tabStopWidth = new KoUnitDoubleSpinBox( hbTabStop,
                                               MM_TO_POINT(2),
                                               doc->pageManager()->page(doc->startPage())->width(),
diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index f710e12d..2577e0f5 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -58,7 +58,7 @@ void KWDeleteDia::setupTab1() {
         message = m_type == deleteRow ? i18n("Delete all selected rows?") : i18n("Delete all selected cells?");
     else if ( count == 1 ) {
         message = m_type == deleteRow ? i18n( "Delete row number %1?" ) : i18n( "Delete column number %1?" );
-        message = message.tqarg( m_toRemove.first() + 1 ); // +1 because humans count from 1
+        message = message.arg( m_toRemove.first() + 1 ); // +1 because humans count from 1
     }
     else {
         message = m_type == deleteRow ? i18n( "Delete rows: %1 ?" ) : i18n( "Delete columns: %1 ?" );
@@ -70,7 +70,7 @@ void KWDeleteDia::setupTab1() {
                 rows += ", ";
             rows += TQString().setNum((*items) +1);
         }
-        message = message.tqarg( rows );
+        message = message.arg( rows );
     }
 
     TQLabel *rc = new TQLabel( message , tab1 );
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index 5fe52cf6..26d99146 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -385,12 +385,12 @@ void KWDocStructTextFrameSetItem::setupTextFrames()
         if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP )
         {
             if ( dok->numColumns() == 1 )
-                name=i18n( "Page %1" ).tqarg(TQString::number(j + 1));
+                name=i18n( "Page %1" ).arg(TQString::number(j + 1));
             else
-                name=i18n( "Column %1" ).tqarg(TQString::number(j + 1));
+                name=i18n( "Column %1" ).arg(TQString::number(j + 1));
         }
         else
-            name=i18n( "Text Frame %1" ).tqarg(TQString::number(j + 1));
+            name=i18n( "Text Frame %1" ).arg(TQString::number(j + 1));
         KWDocStructTextFrameItem* child = findTextFrameItem(frame);
         if (child)
             child->setText(0, name);
@@ -899,7 +899,7 @@ void KWDocStructRootItem::setupFormulaFrames()
         if ( frameset->type() == FT_FORMULA &&
             frameset->frameCount()>0  )
         {
-            _name=i18n("Formula Frame %1").tqarg(TQString::number(i+1));
+            _name=i18n("Formula Frame %1").arg(TQString::number(i+1));
             child = new KWDocStructFormulaItem(this, _name, dynamic_cast<KWFormulaFrameSet*>( frameset ));
         }
     }
@@ -977,7 +977,7 @@ void KWDocStructRootItem::setupPictures()
         frameset = dok->frameSet( i );
         if ( frameset->type() == FT_PICTURE && frameset->frameCount()>0)
         {
-            _name=i18n("Picture (%1) %2").tqarg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).tqarg(++j);
+            _name=i18n("Picture (%1) %2").arg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).arg(++j);
             child = new KWDocStructPictureItem(this, _name, dynamic_cast<KWPictureFrameSet*>( frameset ));
         }
     }
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 5a60f326..271359ba 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -643,7 +643,7 @@ void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& c
 
     if ( updateViews )
     {
-        // Invalidate document tqlayout, for proper tqrepaint
+        // Invalidate document tqlayout, for proper repaint
         this->tqlayout();
         emit pageLayoutChanged( m_pageLayout );
         updateContentsSize();
@@ -996,7 +996,7 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla
 bool KWDocument::loadChildren( KoStore *store )
 {
     //kdDebug(32001) << "KWDocument::loadChildren" << endl;
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
         if ( !it.current()->loadDocument( store ) )
             return FALSE;
@@ -1060,7 +1060,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
         return false;
     }
 
@@ -1141,7 +1141,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles
           styleStack.setTypeProperties( "page-tqlayout" );
           frame->loadBorderProperties( styleStack );
         }
-        fs->renumberFootNotes( false /*no tqrepaint*/ );
+        fs->renumberFootNotes( false /*no repaint*/ );
 
     } else {
         // DTP mode: the items in the body are page-sequence and then frames
@@ -1309,7 +1309,7 @@ bool KWDocument::loadMasterPageStyle( const TQString& masterPageName, KoOasisCon
         if ( properties.hasAttributeNS( "http://www.w3.org/1999/XSL/Format", "page-width" ) )
             setErrorMessage( i18n( "Invalid document. 'fo' has the wrong namespace. The application which produced this document is not OASIS-compliant." ) );
         else
-            setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).tqarg( m_pageLayout.ptWidth ).tqarg( m_pageLayout.ptHeight ) );
+            setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).arg( m_pageLayout.ptWidth ).arg( m_pageLayout.ptHeight ) );
         return false;
     }
 
@@ -1484,7 +1484,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc )
     else if ( value != "application/x-kword" && value != "application/vnd.kde.kword" )
     {
         kdError(32001) << "Unknown mime type " << value << endl;
-        setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).tqarg( value ) );
+        setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).arg( value ) );
         return false;
     }
     m_syntaxVersion = KWDocument::getAttribute( word, "syntaxVersion", 0 );
@@ -1492,7 +1492,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc )
     {
         int ret = KMessageBox::warningContinueCancel(
             0, i18n("This document was created with a newer version of KWord (syntax version: %1)\n"
-                    "Opening it in this version of KWord will lose some information.").tqarg(m_syntaxVersion),
+                    "Opening it in this version of KWord will lose some information.").arg(m_syntaxVersion),
             i18n("File Format Mismatch"), KStdGuiItem::cont() );
         if ( ret == KMessageBox::Cancel )
         {
@@ -1535,7 +1535,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc )
             if ( pgLayout.ptWidth <= 0 || pgLayout.ptHeight <= 0 )
             {
                 setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" )
-                    .tqarg( pgLayout.ptWidth ).tqarg( pgLayout.ptHeight ) );
+                    .arg( pgLayout.ptWidth ).arg( pgLayout.ptHeight ) );
                 return false;
             }
         }
@@ -1928,7 +1928,7 @@ void KWDocument::endOfLoading() // called by both oasis and oldxml
     // Renumber footnotes
     KWTextFrameSet *frameset = dynamic_cast<KWTextFrameSet *>( m_lstFrameSet.getFirst() );
     if ( frameset  )
-        frameset->renumberFootNotes( false /*no tqrepaint*/ );
+        frameset->renumberFootNotes( false /*no repaint*/ );
 
     emit sigProgress(-1);
 
@@ -2499,7 +2499,7 @@ void KWDocument::processAnchorRequests()
         KWFrameSet * fs = frameSetByName( fsname );
         Q_ASSERT( fs );
         if ( fs )
-            fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't tqrepaint yet*/ );
+            fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't repaint yet*/ );
     }
     m_anchorRequests.clear();
 }
@@ -2533,7 +2533,7 @@ bool KWDocument::processFootNoteRequests()
     if ( ret ) {
         KWFrameSet *frameset = m_lstFrameSet.getFirst();
         if ( frameset && frameset->type() == FT_TEXT )
-            static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no tqrepaint*/ );
+            static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no repaint*/ );
     }
     return ret;
 }
@@ -2545,13 +2545,13 @@ TQString KWDocument::uniqueFramesetName( const TQString& oldName )
     {
         // make up a new name for the frameset, use Copy[digits]-[oldname] as template.
         // Fully translatable naturally :)
-        TQString searchString( "^(" + i18n("Copy%1-%2").tqarg("\\d*").tqarg("){0,1}") );
+        TQString searchString( "^(" + i18n("Copy%1-%2").arg("\\d*").arg("){0,1}") );
         searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-'
         TQRegExp searcher(searchString);
         int count=0;
         do {
             newName=oldName;
-            newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg(""));
+            newName.replace(searcher,i18n("Copy%1-%2").arg(count > 0? TQString("%1").arg(count):"").arg(""));
             count++;
         } while ( frameSetByName( newName ) );
     }
@@ -2762,7 +2762,7 @@ void KWDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCom
                     kdDebug() << "KWDocument::insertEmbedded loading embedded object" << endl;
                     part->load( settings );
                     if ( offset != 0 ) {
-                        TQRect r = ch->tqgeometry();
+                        TQRect r = ch->geometry();
                         r.moveBy( (int)offset, (int)offset );
                         ch->setGeometry( r );
                     }
@@ -3601,7 +3601,7 @@ TQDomDocument KWDocument::saveXML()
     }
 
     // Save embedded objects
-    saveEmbeddedObjects( kwdoc, tqchildren() );
+    saveEmbeddedObjects( kwdoc, children() );
     return doc;
 }
 
@@ -3811,7 +3811,7 @@ TQPixmap KWDocument::generatePreview( const TQSize& size )
     double oldZoomY = zoomedResolutionY();
 
     // Sometimes (due to the different resolution?) the tqlayout creates a new page
-    // while saving the preview. If this happens, we don't want to tqrepaint the real views
+    // while saving the preview. If this happens, we don't want to repaint the real views
     // (due to KWCanvas::slotNewContentsSize)
     // ##### One day when we have real doc/view separation in kotextparag, we shouldn't mess with
     // the real view's resolution, we should instead create a fake view for the preview itself.
@@ -3887,7 +3887,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e
     KWCreateFrameCommand *cmd = new KWCreateFrameCommand( i18n("Create Part Frame"), frame);
     addCommand(cmd);
 
-    frameChanged( frame ); // tqrepaint etc.
+    frameChanged( frame ); // repaint etc.
 
     return frameset;
 }
@@ -4210,7 +4210,7 @@ TQString KWDocument::generateFramesetName( const TQString & templateName )
     int num = 1;
     bool exists;
     do {
-        name = templateName.tqarg( num );
+        name = templateName.arg( num );
         exists = frameSetByName( name );
         ++num;
     } while ( exists );
@@ -4568,12 +4568,12 @@ void KWDocument::tqlayout()
             it.current()->tqlayout();
 }
 
-void KWDocument::tqinvalidate(const KWFrameSet *skipThisFrameSet)
+void KWDocument::invalidate(const KWFrameSet *skipThisFrameSet)
 {
     TQPtrListIterator<KWFrameSet> it = framesetsIterator();
     for (; it.current(); ++it )
         if(it.current()!=skipThisFrameSet)
-            it.current()->tqinvalidate();
+            it.current()->invalidate();
 }
 
 KFormula::Document* KWDocument::formulaDocument( bool init )
@@ -4835,7 +4835,7 @@ void KWDocument::slotChapterParagraphFormatted( KoTextParag* /*parag*/ )
 {
     // Attempt at invalidating from the parag's page only
     // But that's not good enough - if a header gets moved down,
-    // we also need to tqinvalidate the previous page, from where the paragraph disappeared.
+    // we also need to invalidate the previous page, from where the paragraph disappeared.
     /*
       KoPoint p;
     KWFrame* frame = internalToDocument( parag->rect().topLeft(), p );
@@ -5033,7 +5033,7 @@ void KWDocument::displayFootNoteFieldCode()
             KoTextParag * parag = it.current()->paragraph();
             if ( parag )
             {
-                parag->tqinvalidate( 0 );
+                parag->invalidate( 0 );
                 parag->setChanged( true );
             }
         }
@@ -5058,7 +5058,7 @@ void KWDocument::changeFootNoteConfig()
             KoTextParag * parag = footNoteVar->paragraph();
             if ( parag )
             {
-                parag->tqinvalidate( 0 );
+                parag->invalidate( 0 );
                 parag->setChanged( true );
             }
             KoTextDocument* textdoc = parag->textDocument();
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index fcda863f..26cfe37a 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -268,7 +268,7 @@ public:
 
 
     /**
-     * schedule a tqrepaint of all views but don't execute immediately
+     * schedule a repaint of all views but don't execute immediately
      */
     void delayedRepaintAllViews();
 
@@ -796,8 +796,8 @@ public slots:
     void slotRepaintChanged( KWFrameSet * frameset );
     void framesChanged( const TQValueList<KWFrame*> &frames);
 
-    /** calls tqinvalidate() on all framesets  */
-    void tqinvalidate(const KWFrameSet *skipThisFrameSet=0);
+    /** calls invalidate() on all framesets  */
+    void invalidate(const KWFrameSet *skipThisFrameSet=0);
 
     virtual void initEmpty();
 
diff --git a/kword/KWFindReplace.cpp b/kword/KWFindReplace.cpp
index f1168ba3..6b9ce223 100644
--- a/kword/KWFindReplace.cpp
+++ b/kword/KWFindReplace.cpp
@@ -55,8 +55,8 @@ void KWFindReplace::emitNewCommand(KCommand *cmd)
 void KWFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *textdocument, KDialogBase* dialog)
 {
     KWTextDocument *textdoc=static_cast<KWTextDocument *>(textdocument);
-    bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
-    textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog );
+    bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
+    textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, repaint, dialog );
 }
 
 #include "KWFindReplace.moc"
diff --git a/kword/KWFrame.cpp b/kword/KWFrame.cpp
index a559b892..e1cdb9d8 100644
--- a/kword/KWFrame.cpp
+++ b/kword/KWFrame.cpp
@@ -166,7 +166,7 @@ void KWFrame::copySettings(KWFrame *frm)
 
 void KWFrame::frameBordersChanged() {
     if (frameSet()->isFloating())
-        frameSet()->anchorFrameset()->tqinvalidate();
+        frameSet()->anchorFrameset()->invalidate();
 }
 
 
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index ab0bea65..ba6f6276 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -102,7 +102,7 @@ KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame)
         kdDebug() << "ERROR: KWFrameDia::constructor no frame.."<<endl;
         return;
     }
-    setCaption( i18n( "Frame Properties for %1" ).tqarg( m_frame->frameSet()->name() ) );
+    setCaption( i18n( "Frame Properties for %1" ).arg( m_frame->frameSet()->name() ) );
     KWFrameSet *fs = m_frame->frameSet()->groupmanager();
     if(fs==0L) fs=m_frame->frameSet();
     m_frameType = fs->type();
@@ -149,7 +149,7 @@ KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDi
         return;
     }
     if ( listOfFrames.count() == 1 )
-        setCaption( i18n( "Frame Settings for %1" ).tqarg( f->frameSet()->name() ) );
+        setCaption( i18n( "Frame Settings for %1" ).arg( f->frameSet()->name() ) );
 
     KWFrameSet *fs = f->frameSet()->groupmanager();
     if(fs==0L) fs=f->frameSet();
@@ -518,13 +518,13 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         m_grid1->addWidget(m_sideHeads, row, 0);
 
         m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() );
-        sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
+        sideTitle1 = new TQLabel ( i18n("Size (%1):").arg(m_doc->unitName()),m_sideHeads);
         sideTitle1->resize(sideTitle1->sizeHint());
         m_sideGrid->addWidget(sideTitle1,1,0);
         m_sideWidth= new TQLineEdit(m_sideHeads,"");
         m_sideWidth->setMaxLength(6);
         m_sideGrid->addWidget(m_sideWidth,1,1);
-        sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
+        sideTitle2 = new TQLabel( i18n("Gap size (%1):").arg(m_doc->unitName()),m_sideHeads);
         sideTitle2->resize(sideTitle2->sizeHint());
         m_sideGrid->addWidget(sideTitle2,2,0);
         m_sideGap = new TQLineEdit(m_sideHeads,"");
@@ -853,7 +853,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
         if ( fs->isDeleted() )
             continue;
         TQListViewItem *item = new TQListViewItem( m_lFrameSList );
-        item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
+        item->setText( 0, TQString( "%1" ).arg( i + 1 ) );
         item->setText( 1, fs->name() );
         amount++;
         if( m_frame && m_frame->frameSet() == fs ) {
@@ -1627,7 +1627,7 @@ void KWFrameDia::updateBrushPreview()
     } else {
         brushPreview->show();
         brushPreview->setBrush(frameBrushStyle());
-        brushPreview->tqrepaint(true);
+        brushPreview->repaint(true);
     }
 }
 #endif
@@ -1857,11 +1857,11 @@ bool KWFrameDia::applyChanges()
                                             i18n( "A new frameset with the name '%1' "
                                                   "can not be made because a frameset with that name "
                                                   "already exists. Please enter another name or select "
-                                                  "an existing frameset from the list.").tqarg(name));
+                                                  "an existing frameset from the list.").arg(name));
                     else
                         KMessageBox::sorry( this,
                                             i18n( "A frameset with the name '%1' "
-                                                  "already exists. Please enter another name." ).tqarg(name) );
+                                                  "already exists. Please enter another name." ).arg(name) );
                     m_eFrameSetName->setText(m_oldFrameSetName);
                     return false;
                 }
@@ -2374,7 +2374,7 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) {
            i18n( "You are about to reconnect the last frame of the "
            "frameset '%1'. "
            "The contents of this frameset will be deleted.\n"
-           "Are you sure you want to do that?").tqarg(fs->name()),
+           "Are you sure you want to do that?").arg(fs->name()),
            i18n("Reconnect Frame"), i18n("&Reconnect"));
         if (result != KMessageBox::Continue)
             return false;
diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp
index 5a484198..685f81e6 100644
--- a/kword/KWFrameLayout.cpp
+++ b/kword/KWFrameLayout.cpp
@@ -492,10 +492,10 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
         KWTextFrameSet* fs = static_cast<KWTextFrameSet *>(mainTextFrameSet);
 
         // Not right now, this could be called during formatting...
-        //m_doc->tqinvalidate();
+        //m_doc->invalidate();
         // ### This means the tqlayout will be done during painting. Not good.
-        // What about mainTextFrameSet->tqinvalidate() or even tqlayout()?
-        //TQTimer::singleShot( 0, m_doc, TQT_SLOT( tqinvalidate() ) );
+        // What about mainTextFrameSet->invalidate() or even tqlayout()?
+        //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) );
 
         // Invalidate main textframeset only, and from top of page only.
         // Otherwise loading a long document (with headers/footers) takes ages,
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index d1129b1f..9a1d43ba 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -303,15 +303,15 @@ void KWFrameSet::setProtectSize( bool b)
     m_protectSize = b;
 }
 
-void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool tqrepaint )
+void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool repaint )
 {
     KWTextParag * parag = static_cast<KWTextParag *>( textfs->textDocument()->paragAt( paragId ) );
     Q_ASSERT( parag );
     if ( parag )
-        setAnchored( textfs, parag, index, placeHolderExists, tqrepaint );
+        setAnchored( textfs, parag, index, placeHolderExists, repaint );
 }
 
-void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool tqrepaint )
+void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool repaint )
 {
     kdDebug(32001) << "KWFrameSet::setAnchored " << textfs << " " << parag->paragId() << " " << index << " " << placeHolderExists << endl;
     Q_ASSERT( textfs );
@@ -321,7 +321,7 @@ void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int in
     m_anchorTextFs = textfs;
     KWFrameList::createFrameList(textfs, m_doc); // remove ourselves from others list now we are inline
     if ( parag )
-        createAnchors( parag, index, placeHolderExists, tqrepaint );
+        createAnchors( parag, index, placeHolderExists, repaint );
 
     if ( !placeHolderExists ) // i.e. not while loading
     {
@@ -381,7 +381,7 @@ KWAnchor * KWFrameSet::createAnchor( KoTextDocument *txt, int frameNum )
 }
 
 void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/,
-                                bool tqrepaint )
+                                bool repaint )
 {
     kdDebug(32001) << "KWFrameSet::createAnchors" << endl;
     Q_ASSERT( m_anchorTextFs );
@@ -398,7 +398,7 @@ void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolder
         }
     }
     parag->setChanged( true );
-    if ( tqrepaint )
+    if ( repaint )
         emit repaintChanged( m_anchorTextFs );
 }
 
@@ -460,7 +460,7 @@ void KWFrameSet::moveFloatingFrame( int frameNum, const KoPoint &position )
         if( frame->frameStack() )
             frame->frameStack()->updateAfterMove( oldPageNum );
     }
-    tqinvalidate();
+    invalidate();
 }
 
 KoRect KWFrameSet::floatingFrameRect( int frameNum )
@@ -828,7 +828,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc
             kdDebug(32001) << "  translating by " << translationOffset.x() << ", " << translationOffset.y() << " before drawFrameContents" << endl;
 #endif
             doubleBufPainter->translate( translationOffset.x(), translationOffset.y() ); // This assume that viewToNormal() is only a translation
-            // We can't "tqrepaint changed parags only" if we just drew the underlying frames, hence the "false"
+            // We can't "repaint changed parags only" if we just drew the underlying frames, hence the "false"
             drawFrameContents( frame, doubleBufPainter, fcrect, frameColorGroup, false, resetChanged, edit, viewMode );
             doubleBufPainter->restore();
 
diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h
index 7218abe7..50294045 100644
--- a/kword/KWFrameSet.h
+++ b/kword/KWFrameSet.h
@@ -199,7 +199,7 @@ public:
      * The way this "onlyChanged/resetChanged" works is: when something changes,
      * all views are asked to redraw themselves with onlyChanged=true.
      * But all views except the last one shouldn't reset the changed flag to false,
-     * otherwise the other views wouldn't tqrepaint anything.
+     * otherwise the other views wouldn't repaint anything.
      * So resetChanged is called with "false" for all views except the last one,
      * and with "true" for the last one, so that it resets the flag.
      *
@@ -312,7 +312,7 @@ public:
 
     /** retqlayout text in frames, so that it flows correctly around other frames */
     virtual void tqlayout() {}
-    virtual void tqinvalidate() {}
+    virtual void invalidate() {}
 
     /// save to XML - when saving
     virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true ) = 0;
@@ -359,11 +359,11 @@ public:
      * Make this frameset anchored, with the anchor at @p paragId,@p index in the text frameset @p textfs.
      * Also used during OASIS loading (placeHolderExists=true)
      */
-    void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool tqrepaint = true );
+    void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool repaint = true );
     /** Make this frameset floating, with the anchor at @p paragId,@p index in the text frameset @p textfs.
      * \deprecated
      */
-    void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool tqrepaint = true );
+    void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool repaint = true );
     /** Note that this frameset has been made floating already, and store anchor position */
     void setAnchored( KWTextFrameSet* textfs );
     /// Make this frameset fixed, i.e. not anchored
@@ -455,7 +455,7 @@ public:
 signals:
 
     /// Emitted when something has changed in this frameset,
-    /// so that all views tqrepaint it. KWDocument connects to it,
+    /// so that all views repaint it. KWDocument connects to it,
     /// and KWCanvas connects to KWDocument.
     void repaintChanged( KWFrameSet * frameset );
 
@@ -478,7 +478,7 @@ protected:
 
     void deleteAnchor( KWAnchor * anchor );
     virtual void deleteAnchors();
-    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true );
+    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true );
 
 
     KWDocument *m_doc;            // Document
diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp
index 70930860..19ad2b00 100644
--- a/kword/KWFrameStyleManager.cpp
+++ b/kword/KWFrameStyleManager.cpp
@@ -90,7 +90,7 @@ void KWFrameStylePreview::setFrameStyle( KWFrameStyle *_frameStyle )
 
     frameStyle = _frameStyle;
 
-    tqrepaint( true );
+    repaint( true );
 }
 
 /******************************************************************/
@@ -383,7 +383,7 @@ void KWFrameStyleManager::addStyle()
 {
     save();
 
-    TQString str = i18n( "New Framestyle Template (%1)" ).tqarg(numFrameStyles++);
+    TQString str = i18n( "New Framestyle Template (%1)" ).arg(numFrameStyles++);
     if ( m_currentFrameStyle )
     {
         m_currentFrameStyle = new KWFrameStyle( *m_currentFrameStyle ); // Create a new style, initializing from the current one
@@ -598,7 +598,7 @@ void KWFrameStyleBackgroundTab::updateBrushConfiguration( const TQColor & _color
     m_backgroundColor.setColor( _color );
     brushPreview->show();
     brushPreview->setBrush( m_backgroundColor );
-    brushPreview->tqrepaint(true);
+    brushPreview->repaint(true);
 }
 
 TQString KWFrameStyleBackgroundTab::tabName()
diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h
index f261b2cd..32420f31 100644
--- a/kword/KWFrameStyleManager.h
+++ b/kword/KWFrameStyleManager.h
@@ -60,11 +60,11 @@ public:
 protected:
     void paintEvent( TQPaintEvent *e );
 
-    void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); tqrepaint( true ); }
-    void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); tqrepaint( true ); }
-    void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); tqrepaint( true ); }
-    void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); tqrepaint( true ); }
-    void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); tqrepaint( true ); }
+    void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); repaint( true ); }
+    void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); repaint( true ); }
+    void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); repaint( true ); }
+    void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); repaint( true ); }
+    void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); repaint( true ); }
 
     KWFrameStyle *frameStyle;
 };
diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp
index c4349ae8..a0070584 100644
--- a/kword/KWFrameViewManager.cpp
+++ b/kword/KWFrameViewManager.cpp
@@ -283,14 +283,14 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c
     }
 
     if(view == 0)
-        return TQCursor(); // default arrow tqshape
+        return TQCursor(); // default arrow shape
 
     KWFrameSet*frameSet = view->frame()->frameSet();
     switch ( meaning ) {
         case MEANING_NONE:
             return TQt::ibeamCursor; // default cursor in margins
         case MEANING_MOUSE_INSIDE:
-            return TQCursor(); // default arrow tqshape
+            return TQCursor(); // default arrow shape
         case MEANING_MOUSE_INSIDE_TEXT:
             return TQt::ibeamCursor;
         case MEANING_MOUSE_OVER_LINK:
@@ -327,7 +327,7 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c
         case MEANING_FORBIDDEN:
             return KCursor::handCursor();
     }
-    return TQCursor(); // default arrow tqshape
+    return TQCursor(); // default arrow shape
 }
 
 MouseMeaning KWFrameViewManager::mouseMeaning( const KoPoint &point, int keyState) const {
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp
index 725c932e..1b2666df 100644
--- a/kword/KWImportStyleDia.cpp
+++ b/kword/KWImportStyleDia.cpp
@@ -196,7 +196,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat
     int num = 1;
     bool exists;
     do {
-        name = templateName.tqarg( num );
+        name = templateName.arg( num );
         exists = (m_list.findIndex( name )!=-1);
         ++num;
     } while ( exists );
diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp
index 4b5f3daa..1194b052 100644
--- a/kword/KWInsertPicDia.cpp
+++ b/kword/KWInsertPicDia.cpp
@@ -62,7 +62,7 @@ public:
             m_size = picture.getOriginalSize();
             m_picture = picture;
             resizeContents( m_size.width(), m_size.height() );
-            tqrepaint( false );
+            repaint( false );
             return true;
         }
         else
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index 6c9851fe..33cb2399 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -199,7 +199,7 @@ KoTextCursor * KWInsertTOCCommand::removeTOC( KWTextFrameSet *fs, KoTextCursor *
         }
         p = p->prev();
     }
-    textdoc->tqinvalidate();
+    textdoc->invalidate();
     if(posOfToc)
     {
          posOfTable=new KoTextCursor( textdoc );
@@ -217,8 +217,8 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int
     TQString displayName;
     if ( depth >= 0 ) {
         // Don't add i18n to this one, those are internal names and must have no spaces.
-        name = TQString( "Contents_Head_%1" ).tqarg( depth+1 );
-        displayName = i18n( "Contents Head %1" ).tqarg( depth+1 );
+        name = TQString( "Contents_Head_%1" ).arg( depth+1 );
+        displayName = i18n( "Contents Head %1" ).arg( depth+1 );
     } else {
         name = "Contents_Title";
         displayName = i18n( "Contents Title" );
@@ -238,7 +238,7 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int
             // (not the whole line anymore), so we need the 4 borders.
             style->paragLayout().leftBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 );
             style->paragLayout().rightBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 );
-            style->paragLayout().tqalignment = TQt::AlignHCenter;
+            style->paragLayout().alignment = TQt::AlignHCenter;
         }
         else
         {
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index ee4b919f..9ee21416 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -116,7 +116,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
 {
     version=0;
     KWMailMergeDataSource *ret=0;
-    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
+    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
     kdDebug()<<constrain<<endl;
     KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
 
@@ -162,7 +162,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name)
       KLibrary *lib = loader->library(TQFile::encodeName(libname));
       if (lib) {
           // get the create_ function
-          TQString factory=TQString("create_%1").tqarg(name);
+          TQString factory=TQString("create_%1").arg(name);
           void *create = lib->symbol(TQFile::encodeName(factory));
 
           if (create)
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index fc257709..33203d0b 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -137,9 +137,9 @@ void KWPartFrameSet::slotChildChanged()
     KWFrame *frame = listFrame.current();
     if ( frame )
     {
-        frame->setRect( KoRect::fromTQRect( getChild()->tqgeometry() ) );
+        frame->setRect( KoRect::fromTQRect( getChild()->geometry() ) );
 
-        //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's tqgeometry " << getChild()->tqgeometry()
+        //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's geometry " << getChild()->geometry()
         //               << " frame set to " << *frame << endl;
         m_doc->frameChanged( frame );
         //there is just a frame
@@ -237,7 +237,7 @@ void KWPartFrameSet::printDebug()
             kdDebug() << "     Url : " << getChild()->document()->url().url()<<endl;
         else
             kdWarning() << "NO DOCUMENT" << endl;
-        kdDebug() << "     Rectangle : " << getChild()->tqgeometry().x() << "," << getChild()->tqgeometry().y() << " " << getChild()->tqgeometry().width() << "x" << getChild()->tqgeometry().height() << endl;
+        kdDebug() << "     Rectangle : " << getChild()->geometry().x() << "," << getChild()->geometry().y() << " " << getChild()->geometry().width() << "x" << getChild()->geometry().height() << endl;
     } else
         kdWarning() << "NO CHILD" << endl;
 }
@@ -335,12 +335,12 @@ KWDocumentChild::~KWDocumentChild()
 {
 }
 
-void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
+void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry )
 {
     // When hitTest returns true, we want to activate the part right away.
     // PartManager supports selecting parts, but not in a doc/view separated way.
     doc->setSelectable( false );
-    KoDocumentChild::setDocument( doc, tqgeometry );
+    KoDocumentChild::setDocument( doc, geometry );
 }
 
 KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix )
diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h
index 25609c1a..d486b298 100644
--- a/kword/KWPartFrameSet.h
+++ b/kword/KWPartFrameSet.h
@@ -53,7 +53,7 @@ public:
     void setChild( KWDocumentChild* child );
 
     /**
-     * Update the tqgeometry of m_child based on the tqgeometry of the frame.
+     * Update the geometry of m_child based on the geometry of the frame.
      */
     void updateChildGeometry();
 
@@ -157,7 +157,7 @@ public:
     KWDocument* parent()const
     { return m_pKWordDoc; }
 
-    virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
+    virtual void setDocument( KoDocument *doc, const TQRect &geometry );
 
     void setPartFrameSet( KWPartFrameSet* fs ) { m_partFrameSet = fs; }
     KWPartFrameSet * partFrameSet() const { return m_partFrameSet; }
diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp
index e8cd0e92..cc1bdf0d 100644
--- a/kword/KWStatisticsDialog.cpp
+++ b/kword/KWStatisticsDialog.cpp
@@ -206,7 +206,7 @@ bool KWStatisticsDialog::calcStats( TQLabel **resultLabel, bool selection, bool
     TQString flesch = locale->formatNumber( f , 1 );
     if( words < 200 ) {
         // a kind of warning if too few words:
-        flesch = i18n("approximately %1").tqarg( flesch );
+        flesch = i18n("approximately %1").arg( flesch );
     }
     resultLabel[6]->setText( flesch );
     return true;
@@ -295,7 +295,7 @@ void KWStatisticsDialog::addBox( TQFrame *page, TQLabel **resultLabel, bool calc
     grid->addRowSpacing( 0, fHeight );
 
     //maximum size for result column (don't know how to do this better..)
-    TQString init = i18n("approximately %1").tqarg( "00000000" );
+    TQString init = i18n("approximately %1").arg( "00000000" );
 
     // insert labels
     TQLabel *label1 = new TQLabel( i18n( "Characters including spaces:" ), box );
diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h
index 09dff25a..bf0f835f 100644
--- a/kword/KWTableDia.h
+++ b/kword/KWTableDia.h
@@ -52,8 +52,8 @@ public:
     KWTablePreview( TQWidget *_parent, int _rows, int _cols )
         : TQWidget( _parent ), rows( _rows ), cols( _cols ) {}
 
-    void setRows( int _rows ) { rows = _rows; tqrepaint( true ); }
-    void setCols( int _cols ) { cols = _cols; tqrepaint( true ); }
+    void setRows( int _rows ) { rows = _rows; repaint( true ); }
+    void setCols( int _cols ) { cols = _cols; repaint( true ); }
 
 protected:
     void paintEvent( TQPaintEvent *e );
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index f108573b..2c27dc04 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -143,7 +143,7 @@ KWAnchor * KWTableFrameSet::createAnchor( KoTextDocument *txt, int frameNum )
 }
 
 void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/,
-                                     bool tqrepaint )
+                                     bool repaint )
 {
     //kdDebug(32004) << "KWTableFrameSet::createAnchors" << endl;
     // TODO make one rect per page, and create one anchor per page
@@ -154,7 +154,7 @@ void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeH
     parag->setCustomItem( index, anchor, 0 );
     kdDebug(32004) << "KWTableFrameSet::createAnchors setting anchor" << endl;
     parag->setChanged( true );
-    if ( tqrepaint )
+    if ( repaint )
         emit repaintChanged( m_anchorTextFs );
 }
 
@@ -1454,7 +1454,7 @@ void KWTableFrameSet::validate()
              for(uint j = cells->firstColumn(); j < cells->columnAfter(); ++j) {
                   if( cell(i,j) != cells.current() ) {
 
-                      TQString str = TQString("| 0x%1 ").tqarg( (unsigned long)cells.current(), 0, 16 );
+                      TQString str = TQString("| 0x%1 ").arg( (unsigned long)cells.current(), 0, 16 );
                       kdDebug(32004) << " KWTableFrameSet::validate() failed " << endl;
                       kdDebug(32004) << "at row:  "<< i << " col: "<< j << " cell: "<<  str << endl;
                       kdDebug(32004) << cells->firstRow() << " " << cells->firstColumn() << " " << cells->rowSpan()
@@ -2189,10 +2189,10 @@ void KWTableFrameSet::tqlayout()
         cells->tqlayout();
 }
 
-void KWTableFrameSet::tqinvalidate()
+void KWTableFrameSet::invalidate()
 {
     for (TableIter cells(this) ; cells ; ++cells)
-        cells->tqinvalidate();
+        cells->invalidate();
 }
 
 void KWTableFrameSet::setVisible( bool v )
@@ -2291,9 +2291,9 @@ void KWTableFrameSet::printArrayDebug() {
     kdDebug(32004) << " |  Row/Cell arrays" << endl;
     Q_ASSERT( m_rows == m_rowArray.size() );
     for ( unsigned int row = 0; row < m_rows; ++row )  {
-        TQString str = TQString( " | Row %1: " ).tqarg( row );
+        TQString str = TQString( " | Row %1: " ).arg( row );
         for ( unsigned int col = 0; col < getColumns(); ++col )
-            str += TQString("| 0x%1 ").tqarg( (unsigned long)(*m_rowArray[row])[col], 0, 16 );
+            str += TQString("| 0x%1 ").arg( (unsigned long)(*m_rowArray[row])[col], 0, 16 );
         kdDebug(32004) << str<< " |" << endl;
     }
 }
@@ -2319,7 +2319,7 @@ KWTableFrameSet::Cell::Cell( KWTableFrameSet *table, unsigned int row, unsigned
     KWTextFrameSet( table->m_doc,
                     // Generate frameset name from table_name+row+col
                     i18n("Hello dear translator :), 1 is the table name, 2 and 3 are row and column", "%1 Cell %2,%3")
-                    .tqarg( table->name() ).tqarg(row).tqarg(col) )
+                    .arg( table->name() ).arg(row).arg(col) )
 {
     m_row = row;
     m_col = col;
@@ -2829,7 +2829,7 @@ KWTableFrameSet::MarkedIterator::MarkedIterator(KWTableFrameSet *table) :
 
     if ( current() ) {
 //      kdDebug() << "MarkedIterator: visit: "
-//          << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl;
+//          << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl;
         current()->setMark();
     }
 }
@@ -2844,7 +2844,7 @@ KWTableFrameSet::MarkedIterator::operator++()
     }
     if ( current() ) {
 //      kdDebug() << "MarkedIterator: visit: "
-//          << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl;
+//          << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl;
         current()->setMark();
     }
     return ret;
diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h
index e379f3b6..f2a5803c 100644
--- a/kword/KWTableFrameSet.h
+++ b/kword/KWTableFrameSet.h
@@ -472,7 +472,7 @@ public:
         ulong & sentences, ulong & syllables,ulong & lines, bool selected );
 
     virtual void finalize();
-    virtual void tqinvalidate();
+    virtual void invalidate();
     virtual void tqlayout();
 
     virtual void updateFrames( int flags = 0xff );
@@ -520,7 +520,7 @@ protected:
     /// \overload KWFrameSet::deleteAnchors
     virtual void deleteAnchors();
     /// \overload KWFrameSet::createAnchors
-    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true );
+    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true );
 
 private:
     void addCellToArray( Cell* cell );
diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 0a939087..a08a6bc7 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -118,13 +118,13 @@ void KWTableStylePreview::drawContents( TQPainter *p )
     {
         // For centering to work, and to even get word wrapping when the thing is too big :)
         m_textdoc->setWidth( widthLU );
-        parag->tqinvalidate(0);
+        parag->invalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag tqalignment working,
+    // Center vertically, but not horizontally, to keep the parag alignment working,
     textRect.moveTopLeft( TQPoint( fr.x(), fr.y() + ( fr.height() - textRect.height() ) / 2 ) );
 
     p->setClipRect( textRect.intersect( fr ) );
@@ -145,7 +145,7 @@ void KWTableStylePreview::setTableStyle( KWTableStyle *_tableStyle )
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( tableStyle->paragraphStyle() );
 
-    tqrepaint(true);
+    repaint(true);
 }
 
 /******************************************************************/
@@ -412,7 +412,7 @@ void KWTableStyleManager::addStyle()
     save();
     KWTableStyleCollection* collection = m_doc->tableStyleCollection();
 
-    TQString str = i18n( "New Tablestyle Template (%1)" ).tqarg(numTableStyles++);
+    TQString str = i18n( "New Tablestyle Template (%1)" ).arg(numTableStyles++);
     if ( m_currentTableStyle )
     {
         m_currentTableStyle = new KWTableStyle( *m_currentTableStyle );
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index c36743df..e99083c4 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -190,7 +190,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con
     {
         // For centering to work, and to even get word wrapping when the thing is too big :)
         m_textdoc->setWidth( widthLU );
-        parag->tqinvalidate(0);
+        parag->invalidate(0);
     }
     double x_add = ( (rb < ts->frameStyle()->rightBorder().width()) ?
         ts->frameStyle()->rightBorder().width() : rb ) +1;
@@ -403,7 +403,7 @@ void KWTableTemplatePreview::setTableTemplate( KWTableTemplate *_tableTemplate )
 
     setSpecialCells(_tableTemplate);
 
-    tqrepaint( true );
+    repaint( true );
 }
 
 void KWTableTemplatePreview::fillContents()
@@ -447,7 +447,7 @@ void KWTableTemplatePreview::cbFirstRowChanged( bool enable )
     if ( (!enable) && ( origTableTemplate->pTopRightCorner()==origTableTemplate->pFirstRow() ) )
         tableTemplate->setTopRightCorner( tableTemplate->pBodyCell() );
     if ( !m_disableRepaint )
-        tqrepaint( true );
+        repaint( true );
 }
 
 void KWTableTemplatePreview::cbFirstColChanged( bool enable )
@@ -470,7 +470,7 @@ void KWTableTemplatePreview::cbFirstColChanged( bool enable )
         tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        tqrepaint( true );
+        repaint( true );
 }
 
 void KWTableTemplatePreview::cbLastRowChanged( bool enable )
@@ -493,7 +493,7 @@ void KWTableTemplatePreview::cbLastRowChanged( bool enable )
         tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        tqrepaint( true );
+        repaint( true );
 }
 
 void KWTableTemplatePreview::cbLastColChanged( bool enable )
@@ -516,7 +516,7 @@ void KWTableTemplatePreview::cbLastColChanged( bool enable )
         tableTemplate->setBottomRightCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        tqrepaint( true );
+        repaint( true );
 }
 
 void KWTableTemplatePreview::cbBodyChanged( bool enable )
@@ -533,7 +533,7 @@ void KWTableTemplatePreview::cbBodyChanged( bool enable )
     delete oldTemplate;
 
     if ( !m_disableRepaint )
-        tqrepaint( true );
+        repaint( true );
 
 }
 
@@ -648,7 +648,7 @@ void KWTableTemplateSelector::initPreview()
     preview->cbLastColChanged( cbLastCol->isChecked() );
     preview->cbBodyChanged( cbBody->isChecked() );
     preview->disableRepaint(false);
-    preview->tqrepaint();
+    preview->repaint();
 }
 
 int KWTableTemplateSelector::getFormatType() const
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index 7f7a78a3..54f9f97d 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -615,7 +615,7 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c
                 var->resize();
                 TQSize newSize( var->width, var->height );
                 if ( oldSize != newSize )
-                    var->paragraph()->tqinvalidate( 0 ); // size has changed -> need reformatting !
+                    var->paragraph()->invalidate( 0 ); // size has changed -> need reformatting !
                 var->paragraph()->setChanged( true );
             }
         }
@@ -826,16 +826,16 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
 
 void KWTextFrameSet::tqlayout()
 {
-    tqinvalidate();
+    invalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KWTextFrameSet::tqinvalidate()
+void KWTextFrameSet::invalidate()
 {
-    //kdDebug() << "KWTextFrameSet::tqinvalidate " << name() << endl;
+    //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
-    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
+    textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint
 }
 
 void KWTextFrameSet::slotRepaintChanged()
@@ -2388,7 +2388,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int /
     Q_ASSERT(frame(0) && frame(0)->frameStack());
     frame(0)->frameStack()->update();
     /// We don't want to start from the beginning every time !
-    ////m_doc->tqinvalidate();
+    ////m_doc->invalidate();
 
     // Reformat the last paragraph. If it's over the two pages, it will need
     // the new page (e.g. for inline frames that need internalToDocument to work)
@@ -2400,7 +2400,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int /
     if ( lastFormatted )
     {
         m_textobj->setLastFormattedParag( lastFormatted );
-        lastFormatted->tqinvalidate( 0 );
+        lastFormatted->invalidate( 0 );
         //This was a way to format the rest from here (recursively), but it didn't help much ensureCursorVisible()
         //So instead I fixed formatMore to return formatMore(2) itself.
         //m_textobj->formatMore( 2 );
@@ -2487,9 +2487,9 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
     // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
     if ( invalidateLayout )
-        m_doc->tqinvalidate(this);
+        m_doc->invalidate(this);
 
-    // Can't tqrepaint directly, we might be in a paint event already
+    // Can't repaint directly, we might be in a paint event already
     m_doc->delayedRepaintAllViews();
 }
 
@@ -2819,13 +2819,13 @@ TQString KWTextFrameSet::toPlainText() const
     return m_textobj->textDocument()->plainText();
 }
 
-void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint, KDialogBase* dialog )
+void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint, KDialogBase* dialog )
 {
     Q_ASSERT( isVisible() );
     Q_ASSERT( m_textobj->isVisible() );
-    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " tqrepaint=" << tqrepaint << endl;
-    m_textobj->highlightPortion( parag, index, length, tqrepaint );
-    if ( tqrepaint ) {
+    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " repaint=" << repaint << endl;
+    m_textobj->highlightPortion( parag, index, length, repaint );
+    if ( repaint ) {
         // Position the cursor
         canvas->editTextFrameSet( this, parag, index );
         // Ensure text is fully visible
@@ -2843,9 +2843,9 @@ void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int lengt
     }
 }
 
-void KWTextFrameSet::removeHighlight( bool tqrepaint )
+void KWTextFrameSet::removeHighlight( bool repaint )
 {
-    m_textobj->removeHighlight( tqrepaint );
+    m_textobj->removeHighlight( repaint );
 }
 
 void KWTextFrameSet::clearUndoRedoInfo()
@@ -2920,7 +2920,7 @@ protected:
     }
 };
 
-void KWTextFrameSet::renumberFootNotes( bool tqrepaint )
+void KWTextFrameSet::renumberFootNotes( bool repaint )
 {
     KWFootNoteVarList lst;
     TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() );
@@ -2986,17 +2986,17 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint )
                 if ( var->numberingType()== KWFootNoteVariable::Manual)
                     var->frameSet()->setName( m_doc->generateFramesetName(fsName));
                 else
-                    var->frameSet()->setName( fsName.tqarg( var->text() ) );
+                    var->frameSet()->setName( fsName.arg( var->text() ) );
                 var->frameSet()->setCounterText( var->text() );
             }
             var->resize();
-            var->paragraph()->tqinvalidate(0);
+            var->paragraph()->invalidate(0);
             var->paragraph()->setChanged( true );
             needRepaint = true;
         }
         ++vit;
     }
-    if ( needRepaint && tqrepaint )
+    if ( needRepaint && repaint )
         m_doc->slotRepaintChanged( this );
 }
 
@@ -3048,7 +3048,7 @@ TQByteArray KWTextFrameSet::sortText(SortType type) const
 
 // This is used when loading (KWTextDocument::loadOasisFootnote)
 // and when inserting from the GUI (KWTextFrameSetEdit::insertFootNote),
-// so don't add any 'tqrepaint' or 'recalc' code here
+// so don't add any 'repaint' or 'recalc' code here
 KWFootNoteFrameSet * KWTextFrameSet::insertFootNote( NoteType noteType, KWFootNoteVariable::Numbering numType, const TQString &manualString )
 {
      kdDebug() << "KWTextFrameSetEdit::insertFootNote " << endl;
@@ -3984,9 +3984,9 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force )
     // Paragraph settings
     KWTextParag * parag = static_cast<KWTextParag *>(cursor()->parag());
 
-    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.tqalignment = parag->resolveAlignment();
-        m_canvas->gui()->getView()->showAlign( m_paragLayout.tqalignment );
+    if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.alignment = parag->resolveAlignment();
+        m_canvas->gui()->getView()->showAlign( m_paragLayout.alignment );
     }
 
     // Counter
@@ -4034,8 +4034,8 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force )
         m_paragLayout.margins[TQStyleSheetItem::MarginRight] = parag->margin(TQStyleSheetItem::MarginRight);
         if ( m_rtl != parag->string()->isRightToLeft() && parag->counter() )
         {
-            parag->counter()->tqinvalidate();
-            parag->setChanged( true ); // tqrepaint
+            parag->counter()->invalidate();
+            parag->setChanged( true ); // repaint
         }
         m_rtl = parag->string()->isRightToLeft();
         m_canvas->gui()->getView()->showRulerIndent( m_paragLayout.margins[TQStyleSheetItem::MarginLeft], m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine], m_paragLayout.margins[TQStyleSheetItem::MarginRight], m_rtl );
diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h
index ef83a3c8..7cc4efb5 100644
--- a/kword/KWTextFrameSet.h
+++ b/kword/KWTextFrameSet.h
@@ -215,8 +215,8 @@ public:
     void findPosition( const KoPoint &dPoint, KoTextParag * & parag, int & index );
 
     /** Highlighting support (for search/replace, spellchecking etc.) */
-    void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint = true, KDialogBase* dialog = 0 );
-    void removeHighlight( bool tqrepaint = true );
+    void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint = true, KDialogBase* dialog = 0 );
+    void removeHighlight( bool repaint = true );
 
     virtual void addTextFrameSets( TQPtrList<KWTextFrameSet> &lst, bool onlyReadWrite=false );
 
@@ -239,7 +239,7 @@ public:
     /** Invalidate all paragraphs and start re-formatting */
     virtual void tqlayout();
     /** Invalidate all paragraphs (causes a re-flow of the text upon next redraw) */
-    virtual void tqinvalidate();
+    virtual void invalidate();
 
     virtual int paragraphs();
     virtual int paragraphsSelected();
@@ -287,7 +287,7 @@ public:
     virtual KCommand *setChangeCaseOfTextCommand(KoChangeCaseDia::TypeOfCase _type);
 
     /** (Assuming this==main frameset), recalc the foot note numbers */
-    void renumberFootNotes( bool tqrepaint = true );
+    void renumberFootNotes( bool repaint = true );
 
     /**
      * Iteration over text objects - used by KWBgSpellCheck
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index d50e98a0..0b1aaa9b 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -109,9 +109,9 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
 void KWTextParag::setPageBreaking( int pb )
 {
     m_layout.pageBreaking = pb;
-    tqinvalidate(0);
+    invalidate(0);
     if ( next() && ( pb & KoParagLayout::HardFrameBreakAfter ) )
-        next()->tqinvalidate(0);
+        next()->invalidate(0);
 }
 
 KWTextDocument * KWTextParag::kwTextDocument() const
@@ -385,7 +385,7 @@ void KWTextParag::save( TQDomElement &parentElem, int from /* default 0 */,
     TQDomElement layoutElem = doc.createElement( "LAYOUT" );
     paragElem.appendChild( layoutElem );
 
-    // save with the real tqalignment (left or right, not auto)
+    // save with the real alignment (left or right, not auto)
     m_layout.saveParagLayout( layoutElem, resolveAlignment() );
 
     // Paragraph's format
@@ -601,7 +601,7 @@ void KWTextParag::load( TQDomElement &attributes )
     loadFormatting( attributes );
 
     setChanged( true );
-    tqinvalidate( 0 );
+    invalidate( 0 );
 }
 
 void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loadFootNote )
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 5b82b220..304d5191 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -351,7 +351,7 @@ void KWFootNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& contex
 
     writer.startElement( "text:note-citation" );
     if ( m_numberingType == Auto )
-        writer.addTextNode( TQString( "%1" ).tqarg( m_numDisplay ) );
+        writer.addTextNode( TQString( "%1" ).arg( m_numDisplay ) );
     else
     {
         writer.addAttribute( "text:label", m_varValue.toString() );
@@ -478,7 +478,7 @@ TQString KWFootNoteVariable::text(bool realValue)
 void KWFootNoteVariable::setNumDisplay( int val )
 {
     m_numDisplay = val;
-    if ( val != -1 ) // -1 is used to 'tqinvalidate so that renumberFootNotes recalcs'
+    if ( val != -1 ) // -1 is used to 'invalidate so that renumberFootNotes recalcs'
         formatedNote();
 }
 
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index d8d36c66..b39cac7f 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -404,7 +404,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
 
     // Determine initial scroll position
     // We do this delayed, so that the GUI has been fully constructed
-    // (and e.g. the statusbar can tqrepaint).
+    // (and e.g. the statusbar can repaint).
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) );
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) );
 }
@@ -1000,7 +1000,7 @@ void KWView::setupActions()
         // This approach allows to edit toolbars and extract separate actions from this menu
         KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/
                                                 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ),
-                                                actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() );
         act->setExclusiveGroup( "counterstyle" );
         // Add to the right menu: both for "none", bullet for bullets, numbers otherwise
         if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) {
@@ -1491,7 +1491,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f
                             TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() );
                             KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ),
                                                          actionCollection(),
-                                                         TQString("expression-action_%1").tqarg(i).latin1() );
+                                                         TQString("expression-action_%1").arg(i).latin1() );
                             if ( personalShortCut.contains(text) )
                                 act->setShortcut( personalShortCut[text] );
                             i++;
@@ -1542,7 +1542,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts,
             KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ),
                                          actionCollection(), actionName );
             // Mainly for KEditToolbar
-            act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) );
+            act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) );
             m_variableDefMap.insert( act, v );
             parentMenu->insert( act );
         }
@@ -1583,7 +1583,7 @@ void KWView::refreshCustomMenu()
             if ( !lst.contains( varName) )
             {
                  lst.append( varName );
-                 TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
+                 TQCString name = TQString("custom-action_%1").arg(i).latin1();
                  act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name );
                  act->setGroup( "custom-variable-action" );
                  m_actionInsertCustom->insert( act );
@@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu()
     if(state)
         m_actionInsertCustom->popupMenu()->insertSeparator();
 
-    act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(i).latin1());
+    act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1());
     act->setGroup( "custom-variable-action" );
 
 
@@ -1653,15 +1653,15 @@ void KWView::updatePageInfo()
         TQString oldText = m_sbPageLabel->text();
         TQString newText;
         if ( viewMode()->hasPages() )
-            newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber())
-                .tqarg(m_doc->pageCount()) + ' ';
+            newText = ' ' + i18n( "Page %1 of %2" ).arg(m_currentPage->pageNumber())
+                .arg(m_doc->pageCount()) + ' ';
 
         if ( newText != oldText )
         {
             m_sbPageLabel->setText( newText );
-            // Need to tqrepaint immediately. Otherwise when deleting 100 pages
+            // Need to repaint immediately. Otherwise when deleting 100 pages
             // at once, there's no feedback.
-            m_sbPageLabel->tqrepaint();
+            m_sbPageLabel->repaint();
         }
     }
     slotUpdateRuler();
@@ -1688,16 +1688,16 @@ void KWView::updateFrameStatusBarItem()
             TQString unitName = m_doc->unitName();
             KWFrame * frame = frameViewManager()->selectedFrames()[0]->frame();
             m_sbFramesLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" )
-                    .tqarg( frame->frameSet()->name() )
-                    .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
+                    .arg( frame->frameSet()->name() )
+                    .arg( KoUnit::toUserStringValue( frame->left(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
                                 m_doc->pageManager()->pageNumber(frame->rect()) ), unit) )
-                    .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) );
+                    .arg( KoUnit::toUserStringValue( frame->right(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->bottom(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->height(), unit ) ) );
         } else
-            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) );
+            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) );
     }
     else if ( sb && m_sbFramesLabel )
         m_sbFramesLabel->setText( TQString() );
@@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt )
         m_doc->recalcVariables(  VT_ALL );
     }
 
-// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc
+// Don't repaint behind the print dialog until we're done zooming/unzooming the doc
     m_gui->canvasWidget()->setUpdatesEnabled(false);
     m_gui->canvasWidget()->viewport()->setCursor( waitCursor );
 
@@ -2784,7 +2784,7 @@ void KWView::deleteFrame( bool warning )
                           "Frameset '%1'. "
                           "The contents of this Frameset will not appear "
                           "anymore!\n"
-                          "Are you sure you want to do that?").tqarg(fs->name()),
+                          "Are you sure you want to do that?").arg(fs->name()),
                     i18n("Delete Frame"), KStdGuiItem::del());
 
                 if (result != KMessageBox::Continue)
@@ -3074,22 +3074,22 @@ void KWView::changeZoomMenu( int zoom )
         qHeapSort( list );
 
         for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-            lst.append( i18n("%1%").tqarg(*it) );
+            lst.append( i18n("%1%").arg(*it) );
     }
     else
     {
-        lst << i18n("%1%").tqarg("33");
-        lst << i18n("%1%").tqarg("50");
-        lst << i18n("%1%").tqarg("75");
-        lst << i18n("%1%").tqarg("100");
-        lst << i18n("%1%").tqarg("125");
-        lst << i18n("%1%").tqarg("150");
-        lst << i18n("%1%").tqarg("200");
-        lst << i18n("%1%").tqarg("250");
-        lst << i18n("%1%").tqarg("350");
-        lst << i18n("%1%").tqarg("400");
-        lst << i18n("%1%").tqarg("450");
-        lst << i18n("%1%").tqarg("500");
+        lst << i18n("%1%").arg("33");
+        lst << i18n("%1%").arg("50");
+        lst << i18n("%1%").arg("75");
+        lst << i18n("%1%").arg("100");
+        lst << i18n("%1%").arg("125");
+        lst << i18n("%1%").arg("150");
+        lst << i18n("%1%").arg("200");
+        lst << i18n("%1%").arg("250");
+        lst << i18n("%1%").arg("350");
+        lst << i18n("%1%").arg("400");
+        lst << i18n("%1%").arg("450");
+        lst << i18n("%1%").arg("500");
     }
     m_actionViewZoom->setItems( lst );
 }
@@ -3097,7 +3097,7 @@ void KWView::changeZoomMenu( int zoom )
 void KWView::showZoom( int zoom )
 {
     TQStringList list = m_actionViewZoom->items();
-    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
+    TQString zoomStr( i18n("%1%").arg( zoom ) );
     m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr)  );
 }
 
@@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged()
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
         showCounter( counter );
-        int align = paragLayout->tqalignment;
+        int align = paragLayout->alignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         showAlign( align );
@@ -6038,7 +6038,7 @@ TQWidget* KWView::canvas() const
 {
     // used to be ->viewport(), but this makes no sense.
     // active embedded objects must be positioned relative to the real view,
-    // to scroll around with it, instead of being tqchildren of the fixed viewport.
+    // to scroll around with it, instead of being children of the fixed viewport.
     return m_gui->canvasWidget();
 }
 
@@ -6144,7 +6144,7 @@ void KWView::savePicture()
                             if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                               KMessageBox::sorry( this, i18n(
-                                  "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ),
+                                  "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
                                   i18n("Save Failed") );
                             }
                         }
@@ -6155,12 +6155,12 @@ void KWView::savePicture()
                     }
                     else
                         KMessageBox::sorry( this, i18n(
-                            "Error during saving. Could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
+                            "Error during saving. Could not create temporary file: %1.").arg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
             else
-                KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") );
+                KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") );
         }
     }
 }
@@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode()
             hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             hRuler->changeFlags(0);
-        hRuler->tqrepaint();
+        hRuler->repaint();
     }
 }
 
diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd
index f673d49c..c9e7fb03 100644
--- a/kword/demos/framestest.kwd
+++ b/kword/demos/framestest.kwd
@@ -262,7 +262,7 @@
     </LAYOUT>
    </PARAGRAPH>
    <PARAGRAPH>
-    <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, tqgeometry=894x723+0+0] doc = 0x8133470</TEXT>
+    <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, geometry=894x723+0+0] doc = 0x8133470</TEXT>
     <LAYOUT>
      <NAME value="Standard" />
      <FLOW align="left" />
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 1af6b0ad..f54e529c 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -107,7 +107,7 @@ void KWClassicSerialDataSource::removeRecord( int i )
     if ( (i < 0) || (i > (int)db.count() - 1) )
         return;
 
-	kdDebug()<<TQString("Removing record %1").tqarg(i)<<endl;
+	kdDebug()<<TQString("Removing record %1").arg(i)<<endl;
 
     Db::Iterator it = db.at( i);
     db.remove( it );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 7b8feb70..1886207c 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
 
     if( !uidAvailable )
     {
-        return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) );
+        return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) );
     }
 
 
@@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
         TQString lat;
         TQString longi;
         if(  geo.latitude()<0 )
-            lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() );
+            lat = TQString( i18n("%1 South") ).arg( -geo.latitude() );
         else
-            lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() );
+            lat = TQString( i18n("%1 North") ).arg( geo.latitude() );
 
         if(  geo.longitude()<0 )
             // There is something going wrong, because "W" is replaced by "q ".
             // Needs fix.
-            longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() );
+            longi = TQString( i18n("%1 West") ).arg( -geo.longitude() );
         else
-            longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() );
+            longi = TQString( i18n("%1 East") ).arg( geo.longitude() );
 
         return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi );
     }
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index d1c03809..24daac3f 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList()
         KMessageBox::information( 0,
                                   i18n( "<qt>Distribution list with the given name <b>%1</b> "
                                         "already exists. Please select a different name.</qt>" )
-                                  .tqarg( listName ) );
+                                  .arg( listName ) );
         return;
     }
     KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName );
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index e9d389ad..46ced301 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -217,7 +217,7 @@
             <property name="text">
                 <string>&amp;Address Book</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -236,7 +236,7 @@
             <property name="text">
                 <string>&amp;Selected Addresses</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 1a477737..025e9a4e 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -53,7 +53,7 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const
   if ( cell )
     return cellText( cell );
   else
-    return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
+    return i18n( "Unkown mail merge variable: %1" ).arg( name );
 }
 
 void KWMailMergeKSpread::load( TQDomElement& parentElem )
diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h
index 4a25323b..8919cc9a 100644
--- a/kword/mailmerge/sql/KWMySqlCursor.h
+++ b/kword/mailmerge/sql/KWMySqlCursor.h
@@ -59,9 +59,9 @@ TQSqlCursor( TQString(), autopopulate )
 TQSqlIndex() ) { return exec( lastQuery() ); }
     TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return
 TQSqlIndex(); }
-    int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
-    int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
-    int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int insert( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int update( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int del( bool /*invalidate*/ = TRUE ) { return FALSE; }
     void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
 };
 
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index d5e9b4ac..466ac182 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -68,7 +68,7 @@ void KWQtSqlPowerSerialDataSource::refresh(bool force)
 		myquery=new KWMySqlCursor(query,true,database);
 		myquery->setMode(TQSqlCursor::ReadOnly);
 	}
-	kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
+	kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl;
 }
 
 TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const
@@ -79,7 +79,7 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
 	if ( num < 0 || num > (int)myquery->size() )
 		return name;
 	if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name);
 	return (myquery->value(name)).toString();
 }
 
@@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute()
 	cur->setMode(TQSqlCursor::ReadOnly);
 
 	db->clearSampleRecord();
-	kdDebug()<<TQString("Fieldname count %1").tqarg(cur->count())<<endl;
+	kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl;
 	for (uint i=0;i<cur->count();i++)
 		db->addSampleRecordEntry(cur->fieldName(i));
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 2181c172..14c3640e 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -59,7 +59,7 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
         if ( num < 0 || num > (int)myquery->size() )
                 return name;
         if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name);
         return (myquery->value(name)).toString();
 }
 
@@ -146,7 +146,7 @@ void KWQtSqlSerialDataSource::refresh(bool force)
                 myquery->setMode(TQSqlCursor::ReadOnly);
 		myquery->select(filter);
         }
-        kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
+        kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl;
 
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index f31a431a..9a333a8d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0;
 KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
 	port=i18n("default");
 }
 
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN
index 3402d9ee..a6a7eccb 100644
--- a/lib/kformula/DESIGN
+++ b/lib/kformula/DESIGN
@@ -19,21 +19,21 @@ objects from it.
 Responsebilities
 (This goes for every derived element and therefore for each one.)
 
-- knows its tqchildren. Actually BasicElement doesn't have any. But it
-  already defines that tqchildren must be known by their parent.
-- knows its bounding rectangle (its size.) The tqchildren are included
+- knows its children. Actually BasicElement doesn't have any. But it
+  already defines that children must be known by their parent.
+- knows its bounding rectangle (its size.) The children are included
   in this rect. (The position is relative to the parent.)
-//- knows its middle line. (for tqalignment)
-- knows it's zero point for midline (vertical tqalignment) and 
+//- knows its middle line. (for alignment)
+- knows it's zero point for midline (vertical alignment) and 
   keep open the possibility of negative positions (out of bounding rect)
-- draws itself (given a painter); tqchildren are drawn, too
+- draws itself (given a painter); children are drawn, too
 - knows all positions where the cursor is allowed to be. (see below)
 - knows its parent; The topmost element has no parent; there is a
   implicit guaranty that the topmost element is always a
   SequenceElement.
 - can save and load itself. different formates. (see below)
-- all tqchildren must be a SequenceElement. Except for SequenceElement's
-  tqchildren that might be of any type.
+- all children must be a SequenceElement. Except for SequenceElement's
+  children that might be of any type.
 - might have its own color.
 - might have its own font size (see below).
 
@@ -41,14 +41,14 @@ Responsebilities
 SequenceElement from BasicElement
 ---------------
 
-Manages a list of tqchildren. The tqchildren are aligned horizontally at
+Manages a list of children. The children are aligned horizontally at
 one middle line. No gaps, no overlaps.
 
-Has no own look. It just draws all its tqchildren and is done. Except if
+Has no own look. It just draws all its children and is done. Except if
 its empty. It looks like an empty space then (i.e. a little square)
 
 Has n+1 valid cursor positions where n is the number of
-tqchildren. These are before, between and after the tqchildren.
+children. These are before, between and after the children.
 
 May contain any (type of) element as child 
 
@@ -73,20 +73,20 @@ FormulaElement we get a chance to pass messages to the outside world.
 RootElement from BasicElement
 -----------
 
-contains two tqchildren. content and index. index is optional.
+contains two children. content and index. index is optional.
 
 
 IndexElement from BasicElement
 ------------
 
-contains five tqchildren. content and four indexes. all indexes are
+contains five children. content and four indexes. all indexes are
 optional. If there is no index the element might be replaced by its content.
 
 
 TextElement from BasicElement
 -----------
 
-contains one char and no tqchildren at all.
+contains one char and no children at all.
 
 
 Might have its own font and size. But preferes to use a reasonalbe
@@ -104,7 +104,7 @@ choose with.
 FractionElement from BasicElement
 ---------------
 
-2 tqchildren: numerator, denominator
+2 children: numerator, denominator
 
 
 DecorationElement from BasicElement
@@ -121,7 +121,7 @@ the other side of the decoration.
 SumIntegralElement from BasicElement  //PrefixedElement
 ------------------
 
-draws all sorts of mathematical symbols with three tqchildren. Above,
+draws all sorts of mathematical symbols with three children. Above,
 below (or whereever the indices and limits go)and to the right.
 
 
@@ -142,7 +142,7 @@ typical of a math formula.
 MatrixElement from BasicElement
 -------------
 
-A matrix of tqchildren.
+A matrix of children.
 With all align stuff, internal borders etc, matrix dots handling (i.e.
 those dots or lines that complete the matrix, not well handled in TeX),
 etc..
@@ -150,7 +150,7 @@ etc..
 SpaceElement from BasicElement
 ------------
 
-No tqchildren at all. Provides the facility to insert horizontal spaces
+No children at all. Provides the facility to insert horizontal spaces
 in the formula. (therefore it is similar to TextElement.)
 
 
@@ -184,14 +184,14 @@ If the cursor points into an element this element is said to own the
 cursor. There are a few rules that describe how new cursor positions
 are calculated given the current key:
 
-- An elements cursor positions are its tqchildren. The element might not
-own the cursor except when it is owned by one of its tqchildren. The
+- An elements cursor positions are its children. The element might not
+own the cursor except when it is owned by one of its children. The
 only exception is SequenceElement which has valid cursor positions
-before, between and after its tqchildren, too.
+before, between and after its children, too.
 
 (Therefore the cursor is always owned by a SequenceElement.)
 
-- Each element's tqchildren are ordered. If the cursor leaves one child
+- Each element's children are ordered. If the cursor leaves one child
 the next child it. The direction depends on the key that moved the
 cursor. If there is child left the cursor is passed to the parent.
 
@@ -344,7 +344,7 @@ We want a formula to look different according to its
 surroundings. (Most obviosly according to the available height and/or width.)
 
 It would be great to get something like automatic operator
-tqalignment. So if you type some formulas each on its own line the
+alignment. So if you type some formulas each on its own line the
 assigment operators should be automatically in a column. (If the user
 turns this on.)
 
diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cc
index d4ef8ec4..e1dce937 100644
--- a/lib/kformula/actionelement.cc
+++ b/lib/kformula/actionelement.cc
@@ -69,7 +69,7 @@ void ActionElement::writeMathMLAttributes( TQDomElement& element ) const
         element.setAttribute( "actiontype", m_actionType );
     }
     if ( m_selection ) {
-        element.setAttribute( "selection", TQString( "%1" ).tqarg( m_selection ) );
+        element.setAttribute( "selection", TQString( "%1" ).arg( m_selection ) );
     }
 }
 
diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index 1fe46cc1..73d031e1 100644
--- a/lib/kformula/basicelement.h
+++ b/lib/kformula/basicelement.h
@@ -53,7 +53,7 @@ class StyleElement;
  * Basis of every formula element. An element is used basically by
  * other elements and by the @ref FormulaCursor .
  *
- * Each element knows its size (a rect that includes all tqchildren)
+ * Each element knows its size (a rect that includes all children)
  * and how to draw itself. See @ref calcSizes and @ref draw .
  *
  * An element might contain valid cursor position. If the cursor
@@ -63,11 +63,11 @@ class StyleElement;
  * cursor that tell how it wants to move. See @ref moveLeft ,
  * @ref moveRight , @ref moveUp , @ref moveDown .
  *
- * To build a tree an element must own tqchildren. If there are tqchildren
+ * To build a tree an element must own children. If there are children
  * there must be a main child. This is the child that might be used to
  * replace the element. See @ref getMainChild().
  *
- * If there can be tqchildren you might want to @ref insert and @ref remove
+ * If there can be children you might want to @ref insert and @ref remove
  * them. After a removal the element might be senseless.
  * (See @ref isSenseless )
  * If it is it must be removed.
@@ -81,10 +81,10 @@ class BasicElement
 public:
 
     /*
-     * Each element might contain tqchildren. Each child needs
+     * Each element might contain children. Each child needs
      * its own unique number. It is not guaranteed, however,
      * that the number stays the same all the time.
-     * (The SequenceElement's tqchildren are simply counted.)
+     * (The SequenceElement's children are simply counted.)
      */
 
     BasicElement(BasicElement* parent = 0);
@@ -102,7 +102,7 @@ public:
 
     /**
      * @returns whether the child should be read-only. The idea is
-     * that a read-only parent has read-only tqchildren.
+     * that a read-only parent has read-only children.
      */
     virtual bool readOnly( const BasicElement* child ) const;
 
@@ -158,7 +158,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -166,7 +166,7 @@ public:
 							StyleAttributes& style ) = 0;
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -179,7 +179,7 @@ public:
 
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* /*cmd*/ ) {}
 
@@ -243,7 +243,7 @@ public:
      */
     virtual void entered( SequenceElement* /*child*/ );
 
-    // tqchildren
+    // children
 
     /**
      * Removes the child. If this was the main child this element might
@@ -257,7 +257,7 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild() { return 0; }
     //virtual void setMainChild(SequenceElement*) {}
@@ -265,10 +265,10 @@ public:
 
     // editing
     //
-    // Insert and remove tqchildren.
+    // Insert and remove children.
 
     /**
-     * Inserts all new tqchildren at the cursor position. Places the
+     * Inserts all new children at the cursor position. Places the
      * cursor according to the direction.
      *
      * The list will be emptied but stays the property of the caller.
@@ -276,8 +276,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction) {}
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      */
     virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction) {}
 
@@ -290,7 +290,7 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * tqchildren (except its main child) and should therefore
+     * children (except its main child) and should therefore
      * be replaced by its main child's content.
      */
     virtual bool isSenseless() { return false; }
@@ -316,7 +316,7 @@ public:
 
 
     /**
-     * Callback for the tabs among our tqchildren. Needed for tqalignment.
+     * Callback for the tabs among our children. Needed for alignment.
      */
     virtual void registerTab( BasicElement* /*tab*/ ) {}
 
@@ -368,7 +368,7 @@ public:
 
     /**
      * @return a TQDomElement that contain as DomChildren the
-     * tqchildren, and as attribute the attribute of this
+     * children, and as attribute the attribute of this
      * element.
      */
     TQDomElement getElementDom( TQDomDocument& doc);
@@ -380,13 +380,13 @@ public:
     virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
     /**
-     * Set this element attribute, build tqchildren and
+     * Set this element attribute, build children and
      * call their buildFromDom.
      */
     bool buildFromDom(TQDomElement element);
 
     /**
-     * Set this element attribute, build tqchildren and call 
+     * Set this element attribute, build children and call 
      * their builFromMathMLDom.
      * Returns the number of nodes processed or -1 if it failed.
      */
@@ -445,7 +445,7 @@ protected:
      * Returns if the SequenceElement could be constructed from the nodes first child.
      * The node name must match the given name.
      *
-     * This is a service for all subclasses that contain tqchildren.
+     * This is a service for all subclasses that contain children.
      */
     bool buildChild( SequenceElement* child, TQDomNode node, TQString name );
 
@@ -467,7 +467,7 @@ protected:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -521,7 +521,7 @@ private:
      * along this line.
      *
      * There are elements (like matrix) that don't have a base line. It is
-     * -1 in this case. The tqalignment is done using the middle line.
+     * -1 in this case. The alignment is done using the middle line.
      */
     luPixel m_baseline;
 
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index df51ffa8..a3714e60 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cc
@@ -281,7 +281,7 @@ BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void BracketElement::calcSizes( const ContextStyle& context,
                                 ContextStyle::TextStyle tstyle,
@@ -360,7 +360,7 @@ void BracketElement::calcSizes( const ContextStyle& context,
 
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -707,7 +707,7 @@ int BracketElement::operatorType( TQDomNode& node, bool open )
             TQString s =  e.text();
             if ( s.isNull() )
                 return -1;
-            *type = static_cast<SymbolType>( TQString::number( s.tqat( 0 ).latin1() ).toInt() );
+            *type = static_cast<SymbolType>( TQString::number( s.at( 0 ).latin1() ).toInt() );
         }
     }
     else {
diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h
index 83879aac..baf0ff1e 100644
--- a/lib/kformula/bracketelement.h
+++ b/lib/kformula/bracketelement.h
@@ -62,7 +62,7 @@ public:
                                    const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -95,8 +95,8 @@ public:
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      *
      * We remove ourselve if we are requested to remove our content.
      */
@@ -110,7 +110,7 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild();
 
@@ -200,7 +200,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -208,7 +208,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -254,7 +254,7 @@ protected:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -322,7 +322,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -330,7 +330,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -343,7 +343,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -389,7 +389,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -397,7 +397,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -410,7 +410,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h
index be4a8bcf..11a103dd 100644
--- a/lib/kformula/contextstyle.h
+++ b/lib/kformula/contextstyle.h
@@ -312,7 +312,7 @@ private:
 
     /**
      * true means to center the symbol between its indexes.
-     * false means tqalignment to the right.
+     * false means alignment to the right.
      */
     bool centerSymbol;
 
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc
index 7a685f86..cb1f6c54 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cc
@@ -27,7 +27,7 @@ ErrorElement::ErrorElement( BasicElement* parent ) : SequenceElement( parent ) {
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h
index cfc2735d..d52f949a 100644
--- a/lib/kformula/errorelement.h
+++ b/lib/kformula/errorelement.h
@@ -30,7 +30,7 @@ public:
     ErrorElement( BasicElement* parent = 0 );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc
index 0e37028a..0df68fcb 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cc
@@ -53,7 +53,7 @@ class FontList {
 public:
     FontList() {
         TQFontDatabase db;
-        const TQStringList lst = db.tqfamilies();
+        const TQStringList lst = db.families();
         for ( TQStringList::const_iterator it = lst.begin(), end = lst.end() ; it != end ; ++it ) {
             const TQString name = *it;
             int i = name.find('[');
diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc
index 9fe3afbd..2257d262 100644
--- a/lib/kformula/formulacursor.cc
+++ b/lib/kformula/formulacursor.cc
@@ -301,21 +301,21 @@ void FormulaCursor::insert(BasicElement* child, Direction direction)
     insert(list, direction);
 }
 
-void FormulaCursor::insert(TQPtrList<BasicElement>& tqchildren,
+void FormulaCursor::insert(TQPtrList<BasicElement>& children,
                            Direction direction)
 {
     assert( !isReadOnly() );
     BasicElement* element = getElement();
-    element->insert(this, tqchildren, direction);
+    element->insert(this, children, direction);
 }
 
 
 /**
- * Removes the current selected tqchildren and returns them.
+ * Removes the current selected children and returns them.
  * The cursor needs to be normal (that is be inside a SequenceElement)
  * for this to have any effect.
  */
-void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren,
+void FormulaCursor::remove(TQPtrList<BasicElement>& children,
                            Direction direction)
 {
     assert( !isReadOnly() );
@@ -328,12 +328,12 @@ void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren,
             BasicElement* parent = sequence->getParent();
             if (parent != 0) {
                 parent->selectChild(this, sequence);
-                parent->remove(this, tqchildren, direction);
+                parent->remove(this, children, direction);
                 return;
             }
         }
         else {
-            sequence->remove(this, tqchildren, direction);
+            sequence->remove(this, children, direction);
         }
     }
 }
@@ -383,18 +383,18 @@ void FormulaCursor::replaceSelectionWith(BasicElement* element,
 BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction)
 {
     assert( !isReadOnly() );
-    TQPtrList<BasicElement> tqchildrenList;
+    TQPtrList<BasicElement> childrenList;
     TQPtrList<BasicElement> list;
     BasicElement* element = getElement();
     SequenceElement* mainChild = element->getMainChild();
     if ((mainChild != 0) && (mainChild->countChildren() > 0)) {
         mainChild->selectAllChildren(this);
-        remove(tqchildrenList);
+        remove(childrenList);
     }
     element->getParent()->selectChild(this, element);
     setSelection(false);
     remove(list);
-    insert(tqchildrenList, direction);
+    insert(childrenList, direction);
     if (list.count() > 0) {
         return list.take(0);
     }
@@ -582,7 +582,7 @@ MatrixElement* FormulaCursor::getActiveMatrixElement()
 }
 
 /**
- * The element is going to leave the formula with and all its tqchildren.
+ * The element is going to leave the formula with and all its children.
  */
 void FormulaCursor::elementWillVanish(BasicElement* element)
 {
diff --git a/lib/kformula/formulacursor.h b/lib/kformula/formulacursor.h
index 9843abfa..cca6cf1a 100644
--- a/lib/kformula/formulacursor.h
+++ b/lib/kformula/formulacursor.h
@@ -152,7 +152,7 @@ public:
     void insert(BasicElement*, Direction = beforeCursor);
 
     /**
-     * Inserts the listed tqchildren at the current position.
+     * Inserts the listed children at the current position.
      * Ignores the selection.
      * The list will be emptied.
      */
@@ -160,7 +160,7 @@ public:
                 Direction = beforeCursor);
 
     /**
-     * Removes the current selected tqchildren and returns them.
+     * Removes the current selected children and returns them.
      * The cursor needs to be normal (that is be inside a SequenceElement)
      * for this to have any effect.
      */
@@ -341,7 +341,7 @@ public:
     void setCursorData(CursorData* data);
 
     /**
-     * The element is going to leave the formula with and all its tqchildren.
+     * The element is going to leave the formula with and all its children.
      */
     void elementWillVanish(BasicElement* element);
 
@@ -409,7 +409,7 @@ private:
 
     /**
      * The position the cursor in on inside the element.
-     * Might be anything from 0 to current->tqchildren->size().
+     * Might be anything from 0 to current->children->size().
      *
      * This is where new elements are put in.
      */
diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h
index e6702668..a7e83e4c 100644
--- a/lib/kformula/formulaelement.h
+++ b/lib/kformula/formulaelement.h
@@ -34,7 +34,7 @@ class SymbolTable;
 
 /**
  * The main element.
- * A formula consists of a FormulaElement and its tqchildren.
+ * A formula consists of a FormulaElement and its children.
  * The only element that has no parent.
  */
 class FormulaElement : public SequenceElement {
@@ -113,7 +113,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -121,7 +121,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -159,7 +159,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index 1230bb60..77d93076 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cc
@@ -121,7 +121,7 @@ BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void FractionElement::calcSizes( const ContextStyle& context, 
                                  ContextStyle::TextStyle tstyle,
@@ -155,7 +155,7 @@ void FractionElement::calcSizes( const ContextStyle& context,
 
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -332,8 +332,8 @@ void FractionElement::insert(FormulaCursor* cursor,
 
 
 /**
- * Removes all selected tqchildren and returns them. Places the
- * cursor to where the tqchildren have been.
+ * Removes all selected children and returns them. Places the
+ * cursor to where the children have been.
  *
  * We remove ourselve if we are requested to remove our numerator.
  *
@@ -362,7 +362,7 @@ void FractionElement::remove(FormulaCursor* cursor,
 
 /**
  * Returns wether the element has no more useful
- * tqchildren (except its main child) and should therefore
+ * children (except its main child) and should therefore
  * be replaced by its main child's content.
  */
 bool FractionElement::isSenseless()
@@ -373,7 +373,7 @@ bool FractionElement::isSenseless()
 
 // main child
 //
-// If an element has tqchildren one has to become the main one.
+// If an element has children one has to become the main one.
 
 SequenceElement* FractionElement::getMainChild()
 {
@@ -581,13 +581,13 @@ void FractionElement::writeMathMLAttributes( TQDomElement& element ) const
 {
     switch ( m_lineThicknessType ) {
     case AbsoluteSize:
-        element.setAttribute( "linethickness", TQString( "%1pt" ).tqarg( m_lineThickness ) );
+        element.setAttribute( "linethickness", TQString( "%1pt" ).arg( m_lineThickness ) );
         break;
     case RelativeSize:
-        element.setAttribute( "linethickness", TQString( "%1%" ).tqarg( m_lineThickness * 100.0 ) );
+        element.setAttribute( "linethickness", TQString( "%1%" ).arg( m_lineThickness * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "linethickness", TQString( "%1px" ).tqarg( m_lineThickness ) );
+        element.setAttribute( "linethickness", TQString( "%1px" ).arg( m_lineThickness ) );
         break;
     default:
         break;
diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h
index cef69c13..408c3f3e 100644
--- a/lib/kformula/fractionelement.h
+++ b/lib/kformula/fractionelement.h
@@ -70,7 +70,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -78,7 +78,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -90,7 +90,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -128,8 +128,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      *
      * We remove ourselve if we are requested to remove our numerator.
      *
@@ -141,7 +141,7 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild();
 
@@ -150,7 +150,7 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * tqchildren (except its main child) and should therefore
+     * children (except its main child) and should therefore
      * be replaced by its main child's content.
      */
     virtual bool isSenseless();
@@ -182,7 +182,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc
index 9d0b26e6..db509eef 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cc
@@ -69,7 +69,7 @@ bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element )
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void GlyphElement::calcSizes( const ContextStyle& context, 
                               ContextStyle::TextStyle tstyle, 
@@ -105,7 +105,7 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index e3934fce..68833dd0 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -31,7 +31,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -39,7 +39,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index 25b8997a..a540a7e1 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cc
@@ -341,7 +341,7 @@ void IndexElement::setMiddleX(int xOffset, int middleWidth)
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void IndexElement::calcSizes(const ContextStyle& context, 
 							 ContextStyle::TextStyle tstyle,
@@ -542,7 +542,7 @@ void IndexElement::calcSizes(const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -885,12 +885,12 @@ void IndexElement::moveDown(FormulaCursor* cursor, BasicElement* from)
 }
 
 
-// tqchildren
+// children
 
 
 // main child
 //
-// If an element has tqchildren one has to become the main one.
+// If an element has children one has to become the main one.
 
 // void IndexElement::setMainChild(SequenceElement* child)
 // {
@@ -902,7 +902,7 @@ void IndexElement::moveDown(FormulaCursor* cursor, BasicElement* from)
 
 
 /**
- * Inserts all new tqchildren at the cursor position. Places the
+ * Inserts all new children at the cursor position. Places the
  * cursor according to the direction.
  *
  * You only can insert one index at a time. So the list must contain
@@ -954,8 +954,8 @@ void IndexElement::insert(FormulaCursor* cursor,
 
 
 /**
- * Removes all selected tqchildren and returns them. Places the
- * cursor to where the tqchildren have been.
+ * Removes all selected children and returns them. Places the
+ * cursor to where the children have been.
  *
  * The cursor has to be inside one of our indexes which is supposed
  * to be empty. The index will be removed and the cursor will
@@ -1032,7 +1032,7 @@ void IndexElement::normalize(FormulaCursor* cursor, Direction direction)
 
 /**
  * Returns wether the element has no more useful
- * tqchildren (except its main child) and should therefore
+ * children (except its main child) and should therefore
  * be replaced by its main child's content.
  */
 bool IndexElement::isSenseless()
@@ -1659,13 +1659,13 @@ void IndexElement::writeMathMLAttributes( TQDomElement& element ) const
     if ( tag == "msub" || tag == "msubsup" ) {
         switch ( m_subScriptShiftType ) {
         case AbsoluteSize:
-            element.setAttribute( "subscriptshift", TQString( "%1pt" ).tqarg( m_subScriptShift ) );
+            element.setAttribute( "subscriptshift", TQString( "%1pt" ).arg( m_subScriptShift ) );
             break;
         case RelativeSize:
-            element.setAttribute( "subscriptshift", TQString( "%1%" ).tqarg( m_subScriptShift * 100.0 ) );
+            element.setAttribute( "subscriptshift", TQString( "%1%" ).arg( m_subScriptShift * 100.0 ) );
             break;
         case PixelSize:
-            element.setAttribute( "subscriptshift", TQString( "%1px" ).tqarg( m_subScriptShift ) );
+            element.setAttribute( "subscriptshift", TQString( "%1px" ).arg( m_subScriptShift ) );
             break;
         default:
             break;
@@ -1674,13 +1674,13 @@ void IndexElement::writeMathMLAttributes( TQDomElement& element ) const
     if ( tag == "msup" || tag == "msubsup" ) {
         switch ( m_superScriptShiftType ) {
         case AbsoluteSize:
-            element.setAttribute( "superscriptshift", TQString( "%1pt" ).tqarg( m_superScriptShift ) );
+            element.setAttribute( "superscriptshift", TQString( "%1pt" ).arg( m_superScriptShift ) );
             break;
         case RelativeSize:
-            element.setAttribute( "superscriptshift", TQString( "%1%" ).tqarg( m_superScriptShift * 100.0 ) );
+            element.setAttribute( "superscriptshift", TQString( "%1%" ).arg( m_superScriptShift * 100.0 ) );
             break;
         case PixelSize:
-            element.setAttribute( "superscriptshift", TQString( "%1px" ).tqarg( m_superScriptShift ) );
+            element.setAttribute( "superscriptshift", TQString( "%1px" ).arg( m_superScriptShift ) );
             break;
         default:
             break;
diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h
index f3fc1acb..b8e567b8 100644
--- a/lib/kformula/indexelement.h
+++ b/lib/kformula/indexelement.h
@@ -77,7 +77,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -85,7 +85,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -97,7 +97,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -137,7 +137,7 @@ public:
      */
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
-    // tqchildren
+    // children
 
     /**
      * Removes the child. If this was the main child this element might
@@ -151,7 +151,7 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild() { return content; }
     //SequenceElement* upperLeft;
@@ -163,7 +163,7 @@ public:
 
 
     /**
-     * Inserts all new tqchildren at the cursor position. Places the
+     * Inserts all new children at the cursor position. Places the
      * cursor according to the direction.
      *
      * You only can insert one index at a time. So the list must contain
@@ -175,8 +175,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      *
      * The cursor has to be inside one of our indexes which is supposed
      * to be empty. The index will be removed and the cursor will
@@ -212,7 +212,7 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * tqchildren (except its main child) and should therefore
+     * children (except its main child) and should therefore
      * be replaced by its main child's content.
      */
     virtual bool isSenseless();
@@ -259,7 +259,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 267038c4..65bfa6c3 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cc
@@ -556,10 +556,10 @@ void CharStyleCommand::execute()
     TQMap<SequenceElement*, int> parentCollector;
 
     styleList.clear();
-    uint count = tqchildrenList().count();
+    uint count = childrenList().count();
     styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = tqchildrenList().at( i );
+        TextElement* child = childrenList().at( i );
         styleList[i] = child->getCharStyle();
         child->setCharStyle( charStyle );
         parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
@@ -571,10 +571,10 @@ void CharStyleCommand::execute()
 void CharStyleCommand::unexecute()
 {
     TQMap<SequenceElement*, int> parentCollector;
-    uint count = tqchildrenList().count();
+    uint count = childrenList().count();
     //styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = tqchildrenList().at( i );
+        TextElement* child = childrenList().at( i );
         child->setCharStyle( styleList[i] );
         parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
@@ -595,10 +595,10 @@ void CharFamilyCommand::execute()
     TQMap<SequenceElement*, int> parentCollector;
 
     familyList.clear();
-    uint count = tqchildrenList().count();
+    uint count = childrenList().count();
     familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = tqchildrenList().at( i );
+        TextElement* child = childrenList().at( i );
         familyList[i] = child->getCharFamily();
         child->setCharFamily( charFamily );
         parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
@@ -610,10 +610,10 @@ void CharFamilyCommand::execute()
 void CharFamilyCommand::unexecute()
 {
     TQMap<SequenceElement*, int> parentCollector;
-    uint count = tqchildrenList().count();
+    uint count = childrenList().count();
     //familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = tqchildrenList().at( i );
+        TextElement* child = childrenList().at( i );
         child->setCharFamily( familyList[i] );
         parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h
index 09001040..bc1703be 100644
--- a/lib/kformula/kformulacommand.h
+++ b/lib/kformula/kformulacommand.h
@@ -495,13 +495,13 @@ public:
     void addTextElement( TextElement* element ) { list.append(element); }
 
     /**
-     * Collects all parent elements those tqchildren are to be changend.
+     * Collects all parent elements those children are to be changend.
      */
     void addElement( BasicElement* element ) { elementList.append( element ); }
 
 protected:
 
-    TQPtrList<TextElement>& tqchildrenList() { return list; }
+    TQPtrList<TextElement>& childrenList() { return list; }
 
     void collectChildren();
 
@@ -520,7 +520,7 @@ private:
 
 
 /**
- * Changes the char style of a number of elements an their tqchildren.
+ * Changes the char style of a number of elements an their children.
  */
 class CharStyleCommand : public FontCommand {
 public:
@@ -539,7 +539,7 @@ private:
 
 
 /**
- * Changes the char family of a number of elements an their tqchildren.
+ * Changes the char family of a number of elements an their children.
  */
 class CharFamilyCommand : public FontCommand {
 public:
diff --git a/lib/kformula/kformulacontainer.h b/lib/kformula/kformulacontainer.h
index d87e8184..f40f915b 100644
--- a/lib/kformula/kformulacontainer.h
+++ b/lib/kformula/kformulacontainer.h
@@ -347,7 +347,7 @@ signals:
     void errorMsg( const TQString& );
 
     /**
-     * The element is going to leave the formula with and all its tqchildren.
+     * The element is going to leave the formula with and all its children.
      */
     void elementWillVanish(BasicElement* element);
 
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc
index 17d163f0..9caa66cb 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cc
@@ -1075,7 +1075,7 @@ void DocumentWrapper::textItalic()
 void DocumentWrapper::delimiterLeft()
 {
     TQString left = m_leftBracket->currentText();
-    switch ( left.tqat(0).latin1() ) {
+    switch ( left.at(0).latin1() ) {
     case '[':
     case ']':
     case '{':
@@ -1086,7 +1086,7 @@ void DocumentWrapper::delimiterLeft()
     case ')':
     case '/':
     case '\\':
-        m_leftBracketChar = static_cast<SymbolType>( left.tqat(0).latin1() );
+        m_leftBracketChar = static_cast<SymbolType>( left.at(0).latin1() );
         break;
     case '|':
         m_leftBracketChar = LeftLineBracket;
@@ -1100,7 +1100,7 @@ void DocumentWrapper::delimiterLeft()
 void DocumentWrapper::delimiterRight()
 {
     TQString right = m_rightBracket->currentText();
-    switch ( right.tqat(0).latin1() ) {
+    switch ( right.at(0).latin1() ) {
     case '[':
     case ']':
     case '{':
@@ -1111,7 +1111,7 @@ void DocumentWrapper::delimiterRight()
     case ')':
     case '/':
     case '\\':
-        m_rightBracketChar = static_cast<SymbolType>( right.tqat(0).latin1() );
+        m_rightBracketChar = static_cast<SymbolType>( right.at(0).latin1() );
         break;
     case '|':
         m_rightBracketChar = RightLineBracket;
diff --git a/lib/kformula/kformulaview.h b/lib/kformula/kformulaview.h
index 9562bbfe..cb9c715b 100644
--- a/lib/kformula/kformulaview.h
+++ b/lib/kformula/kformulaview.h
@@ -141,7 +141,7 @@ protected slots:
 
     /**
      * The cursor has been moved by the container.
-     * We need to tqrepaint if it was ours.
+     * We need to repaint if it was ours.
      */
     void slotCursorMoved(FormulaCursor* cursor);
 
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc
index 0a3399eb..1014a66e 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cc
@@ -69,8 +69,8 @@ void KFormulaWidget::setReadOnly(bool ro)
 
 void KFormulaWidget::paintEvent(TQPaintEvent* event)
 {
-    // Always tqrepaint the buffer. This is not so much more work
-    // than it seems to be as each cursor movement requires a tqrepaint.
+    // Always repaint the buffer. This is not so much more work
+    // than it seems to be as each cursor movement requires a repaint.
     TQPainter p( &buffer );
     //p.translate( -fr.x(), -fr.y() );
     formulaView.draw( p, event->rect(), colorGroup() );
@@ -128,7 +128,7 @@ void KFormulaWidget::slotFormulaChanged(int width, int height)
     // Magic numbers just to see the cursor.
     resize(width + 5, height + 5);
     buffer.resize(width + 5, height + 5);
-    // tqrepaint is needed even if the size doesn't change.
+    // repaint is needed even if the size doesn't change.
     //update();
 }
 
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index 6b5a5898..7371113f 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cc
@@ -430,7 +430,7 @@ BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void MatrixElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -508,7 +508,7 @@ void MatrixElement::calcSizes( const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -1260,7 +1260,7 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
 {
     TQString rownumber;
     if ( m_rowNumber ) {
-        rownumber = TQString( " %1" ).tqarg( m_rowNumber );
+        rownumber = TQString( " %1" ).arg( m_rowNumber );
     }
     switch ( m_align ) {
     case TopAlign:
@@ -1352,15 +1352,15 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
             columnwidth.append( "fit " );
             break;
         case AbsoluteSize:
-            columnwidth.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
+            columnwidth.append( TQString( "%1pt " ).arg( *lengthIt ) );
             lengthIt++;
             break;
         case RelativeSize:
-            columnwidth.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
+            columnwidth.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
             lengthIt++;
             break;
         case PixelSize:
-            columnwidth.append( TQString( "%1px " ).tqarg( *lengthIt ) );
+            columnwidth.append( TQString( "%1px " ).arg( *lengthIt ) );
             lengthIt++;
             break;
         case NegativeVeryVeryThinMathSpace:
@@ -1417,13 +1417,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
         element.setAttribute( "width", "auto" );
         break;
     case AbsoluteSize:
-        element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) );
+        element.setAttribute( "width", TQString( "%1pt" ).arg( m_width ) );
         break;
     case RelativeSize:
-        element.setAttribute( "width", TQString( "%1% " ).tqarg( m_width * 100.0 ) );
+        element.setAttribute( "width", TQString( "%1% " ).arg( m_width * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "width", TQString( "%1px " ).tqarg( m_width ) );
+        element.setAttribute( "width", TQString( "%1px " ).arg( m_width ) );
         break;
     default:
         break;
@@ -1434,13 +1434,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
           typeIt != m_rowSpacingType.end(); typeIt++, lengthIt++ ) {
         switch ( *typeIt ) {
         case AbsoluteSize:
-            rowspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
+            rowspacing.append( TQString( "%1pt " ).arg( *lengthIt ) );
             break;
         case RelativeSize:
-            rowspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
+            rowspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
             break;
         case PixelSize:
-            rowspacing.append( TQString( "%1px " ).tqarg( *lengthIt ) );
+            rowspacing.append( TQString( "%1px " ).arg( *lengthIt ) );
             break;
         default:
             break;
@@ -1455,15 +1455,15 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
           typeIt != m_columnSpacingType.end(); typeIt++ ) {
         switch ( *typeIt ) {
         case AbsoluteSize:
-            columnspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
+            columnspacing.append( TQString( "%1pt " ).arg( *lengthIt ) );
             lengthIt++;
             break;
         case RelativeSize:
-            columnspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
+            columnspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
             lengthIt++;
             break;
         case PixelSize:
-            columnspacing.append( TQString( "%1px " ).tqarg( *lengthIt ) );
+            columnspacing.append( TQString( "%1px " ).arg( *lengthIt ) );
             lengthIt++;
             break;
         case NegativeVeryVeryThinMathSpace:
@@ -1571,13 +1571,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
     TQString framespacing;
     switch ( m_frameHSpacingType ) {
     case AbsoluteSize:
-        framespacing.append( TQString( "%1pt " ).tqarg( m_frameHSpacing ) );
+        framespacing.append( TQString( "%1pt " ).arg( m_frameHSpacing ) );
         break;
     case RelativeSize:
-        framespacing.append( TQString( "%1% " ).tqarg( m_frameHSpacing * 100.0 ) );
+        framespacing.append( TQString( "%1% " ).arg( m_frameHSpacing * 100.0 ) );
         break;
     case PixelSize:
-        framespacing.append( TQString( "%1px " ).tqarg( m_frameHSpacing ) );
+        framespacing.append( TQString( "%1px " ).arg( m_frameHSpacing ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         framespacing.append( "negativeveryverythinmathspace " );
@@ -1626,13 +1626,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
     }
     switch ( m_frameVSpacingType ) {
     case AbsoluteSize:
-        framespacing.append( TQString( "%1pt " ).tqarg( m_frameVSpacing ) );
+        framespacing.append( TQString( "%1pt " ).arg( m_frameVSpacing ) );
         break;
     case RelativeSize:
-        framespacing.append( TQString( "%1% " ).tqarg( m_frameVSpacing * 100.0 ) );
+        framespacing.append( TQString( "%1% " ).arg( m_frameVSpacing * 100.0 ) );
         break;
     case PixelSize:
-        framespacing.append( TQString( "%1px " ).tqarg( m_frameVSpacing ) );
+        framespacing.append( TQString( "%1px " ).arg( m_frameVSpacing ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         framespacing.append( "negativeveryverythinmathspace " );
@@ -1709,13 +1709,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
     }
     switch ( m_minLabelSpacingType ) {
     case AbsoluteSize:
-        element.setAttribute( "minlabelspacing", TQString( "%1pt" ).tqarg( m_minLabelSpacing ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1pt" ).arg( m_minLabelSpacing ) );
         break;
     case RelativeSize:
-        element.setAttribute( "minlabelspacing", TQString( "%1%" ).tqarg( m_minLabelSpacing * 100.0 ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1%" ).arg( m_minLabelSpacing * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "minlabelspacing", TQString( "%1px" ).tqarg( m_minLabelSpacing ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1px" ).arg( m_minLabelSpacing ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         element.setAttribute( "minlabelspacing", "negativeveryverythinmathspace" );
@@ -1810,7 +1810,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
@@ -1894,7 +1894,7 @@ void KFCNewLine::execute()
     int linePos = parent->content.find( m_line );
     parent->content.insert( linePos+1, m_newline );
 
-    // If there are tqchildren to be moved.
+    // If there are children to be moved.
     if ( m_line->countChildren() > static_cast<int>( m_pos ) ) {
 
         // Remove anything after position pos from the current line
@@ -1935,7 +1935,7 @@ void KFCNewLine::unexecute()
     FormulaElement* formula = m_line->formula();
     formula->elementRemoval( m_newline );
 
-    // If there are tqchildren to be moved.
+    // If there are children to be moved.
     if ( m_newline->countChildren() > 0 ) {
 
         // Remove anything from the line to be deleted
@@ -2129,7 +2129,7 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc,
     // The mrow, if it exists.
     TQDomNode n = tmp.firstChild().firstChild();
     while ( !n.isNull() ) {
-        // the illegal TabMarkers are tqchildren of the mrow, child of tmp.
+        // the illegal TabMarkers are children of the mrow, child of tmp.
         if ( n.isElement() && n.toElement().tagName() == "TAB" ) {
             parent.appendChild( mtd );
             mtd = doc.createElement( oasisFormat ? "math:mtd" : "mtd" );
diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h
index 89426659..7320bf2b 100644
--- a/lib/kformula/matrixelement.h
+++ b/lib/kformula/matrixelement.h
@@ -80,7 +80,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -88,7 +88,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -100,7 +100,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -153,14 +153,14 @@ public:
     virtual SequenceElement* getMainChild();
 
     /**
-     * Inserts all new tqchildren at the cursor position. Places the
+     * Inserts all new children at the cursor position. Places the
      * cursor according to the direction.
      */
     //virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      */
     //virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
@@ -184,14 +184,14 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * tqchildren (except its main child) and should therefore
+     * children (except its main child) and should therefore
      * be replaced by its main child's content.
      */
     //virtual bool isSenseless();
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -375,7 +375,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -383,7 +383,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -395,7 +395,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -414,7 +414,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc
index 66c1fcdc..27dbbdd6 100644
--- a/lib/kformula/operatorelement.cc
+++ b/lib/kformula/operatorelement.cc
@@ -488,13 +488,13 @@ void OperatorElement::writeSizeAttribute( TQDomElement& element, const TQString
         element.setAttribute( attr, "infinity" );
         break;
     case AbsoluteSize:
-        element.setAttribute( attr, TQString( "%1pt" ).tqarg( length ) );
+        element.setAttribute( attr, TQString( "%1pt" ).arg( length ) );
         break;
     case RelativeSize:
-        element.setAttribute( attr, TQString( "%1% " ).tqarg( length * 100.0 ) );
+        element.setAttribute( attr, TQString( "%1% " ).arg( length * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( attr, TQString( "%1px " ).tqarg( length ) );
+        element.setAttribute( attr, TQString( "%1px " ).arg( length ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         element.setAttribute( attr, "negativeveryverythinmathspace" );
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc
index f153a339..e4f28ce7 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cc
@@ -36,7 +36,7 @@ PaddedElement::PaddedElement( BasicElement* parent ) : SequenceElement( parent )
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void PaddedElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -233,18 +233,18 @@ void PaddedElement::writeSizeAttribute( TQDomElement element, const TQString& st
     }
     switch ( st ) {
     case WidthRelativeSize:
-        element.setAttribute( str, prefix + TQString( "%1 width" ).tqarg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1 width" ).arg( s ) );
         break;
     case HeightRelativeSize:
-        element.setAttribute( str, prefix + TQString( "%1 height" ).tqarg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1 height" ).arg( s ) );
     case AbsoluteSize:
-        element.setAttribute( str, prefix + TQString( "%1pt" ).tqarg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1pt" ).arg( s ) );
         break;
     case RelativeSize:
-        element.setAttribute( str, prefix + TQString( "%1%" ).tqarg( s * 100.0 ) );
+        element.setAttribute( str, prefix + TQString( "%1%" ).arg( s * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( str, prefix + TQString( "%1px" ).tqarg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1px" ).arg( s ) );
         break;
     default:
         break;
diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index 5df95b74..f50489c8 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -32,7 +32,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc
index e2a07fc6..78b0a1cb 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cc
@@ -26,7 +26,7 @@ PhantomElement::PhantomElement( BasicElement* parent ) : SequenceElement( parent
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h
index 373c3545..6fe9a953 100644
--- a/lib/kformula/phantomelement.h
+++ b/lib/kformula/phantomelement.h
@@ -30,7 +30,7 @@ public:
     PhantomElement( BasicElement* parent = 0 );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
diff --git a/lib/kformula/prototype/engine.py b/lib/kformula/prototype/engine.py
index a2a94487..f1391069 100644
--- a/lib/kformula/prototype/engine.py
+++ b/lib/kformula/prototype/engine.py
@@ -82,7 +82,7 @@ class BasicElement:
         return self.parent.formula()
 
     def draw(self, painter, styleContext, startPoint):
-        """Draws the whole thing. Including its tqchildren."""
+        """Draws the whole thing. Including its children."""
         pass
 
     def calcSizes(self, styleContext):
@@ -91,7 +91,7 @@ class BasicElement:
         will be stored in self.size,
         the midline offset in self.midline.
 
-        Please note: It's up to a parent to store its tqchildren's position."""
+        Please note: It's up to a parent to store its children's position."""
         pass
 
     def mainChild(self):
@@ -116,22 +116,22 @@ class BasicElement:
 
 
 class SequenceElement (BasicElement):
-    """The element that contains a number of tqchildren.
-    The tqchildren are aligned in one line."""
+    """The element that contains a number of children.
+    The children are aligned in one line."""
     
     def __init__(self, parent):
         BasicElement.__init__(self, parent)
-        self.tqchildren = []
+        self.children = []
 
     def elementAtCursor(self, cursor):
         """Returns the element before the cursor."""
         if cursor.pos() > 0:
-            return self.tqchildren[cursor.pos()-1]
+            return self.children[cursor.pos()-1]
         
     def elementAt(self, point, startPoint):
         r = BasicElement.elementAt(self, point, startPoint)
         if r != None:
-            for child in self.tqchildren:
+            for child in self.children:
                 r = child.elementAt(point, QPoint(startPoint.x()+child.x(),
                                                   startPoint.y()+child.y()))
                 if r != None:
@@ -143,7 +143,7 @@ class SequenceElement (BasicElement):
 
         # Our parent asks us for a cursor position. Found.
         if fromElement == self.parent:
-            cursor.set(self, len(self.tqchildren))
+            cursor.set(self, len(self.children))
 
         # We already owned the cursor. Ask next child then.
         elif fromElement == self:
@@ -151,16 +151,16 @@ class SequenceElement (BasicElement):
                 if cursor.isSelection():
                     cursor.set (self, cursor.pos()-1)
                 else:
-                    self.tqchildren[cursor.pos()-1].moveLeft(cursor, self)
+                    self.children[cursor.pos()-1].moveLeft(cursor, self)
             else:
                 # Needed because FormulaElement derives this.
                 if self.parent != None:
                     self.parent.moveLeft(cursor, self)
 
-        # The cursor came from one of our tqchildren or
+        # The cursor came from one of our children or
         # something is wrong.
         else:
-            fromPos = self.tqchildren.index(fromElement)
+            fromPos = self.children.index(fromElement)
             cursor.set(self, fromPos)
             if cursor.isSelection():
                 if not cursor.mouseMark():
@@ -175,20 +175,20 @@ class SequenceElement (BasicElement):
 
         # We already owned the cursor. Ask next child then.
         elif fromElement == self:
-            if cursor.pos() < len(self.tqchildren):
+            if cursor.pos() < len(self.children):
                 if cursor.isSelection():
                     cursor.set (self, cursor.pos()+1)
                 else:
-                    self.tqchildren[cursor.pos()].moveRight(cursor, self)
+                    self.children[cursor.pos()].moveRight(cursor, self)
             else:
                 # Needed because FormulaElement derives this.
                 if self.parent != None:
                     self.parent.moveRight(cursor, self)
 
-        # The cursor came from one of our tqchildren or
+        # The cursor came from one of our children or
         # something is wrong.
         else:
-            fromPos = self.tqchildren.index(fromElement)
+            fromPos = self.children.index(fromElement)
             cursor.set(self, fromPos+1)
             if cursor.isSelection():
                 if not cursor.mouseMark():
@@ -217,7 +217,7 @@ class SequenceElement (BasicElement):
             if element != self:
                 while element.parent != self:
                     element = element.parent
-                cursor.setMarkPos(self.tqchildren.index(element)+1)
+                cursor.setMarkPos(self.children.index(element)+1)
         cursor.set(self, 0)
 
     def moveEnd(self, cursor):
@@ -226,14 +226,14 @@ class SequenceElement (BasicElement):
             if element != self:
                 while element.parent != self:
                     element = element.parent
-                cursor.setMarkPos(self.tqchildren.index(element))
-        cursor.set(self, len(self.tqchildren))
+                cursor.setMarkPos(self.children.index(element))
+        cursor.set(self, len(self.children))
 
         
     def draw(self, painter, styleContext, startPoint):
         x, y = startPoint.x(), startPoint.y()
-        if len(self.tqchildren) > 0:
-            for child in self.tqchildren:
+        if len(self.children) > 0:
+            for child in self.children:
                 cX = child.x()
                 cY = child.y()
                 child.draw(painter, styleContext, QPoint(x+cX, y+cY))
@@ -246,11 +246,11 @@ class SequenceElement (BasicElement):
             painter.drawRect(x, y, self.width(), self.height())
 
     def calcSizes(self, styleContext):
-        if len(self.tqchildren) > 0:
+        if len(self.children) > 0:
             x = self.x()
             y = self.y()
             width = toMidline = fromMidline = 0
-            for child in self.tqchildren:
+            for child in self.children:
                 child.calcSizes(styleContext)
                 child.setX(width)
                 width += child.width()
@@ -263,7 +263,7 @@ class SequenceElement (BasicElement):
             self.setHeight(toMidline+fromMidline)
             self.midline = toMidline
 
-            for child in self.tqchildren:
+            for child in self.children:
                 child.setY(self.midline - child.midline)
 
         else:
@@ -272,13 +272,13 @@ class SequenceElement (BasicElement):
             self.midline = 5
 
     def mainChild(self):
-        if len(self.tqchildren) > 0:
-            return self.tqchildren[0]
+        if len(self.children) > 0:
+            return self.children[0]
         return None
 
     def setMainChild(self, sequenceElement):
-        if len(self.tqchildren) > 0:
-            self.tqchildren[0] = sequenceElement
+        if len(self.children) > 0:
+            self.children[0] = sequenceElement
             sequenceElement.parent = self
         else:
             self.addChild(sequenceElement)
@@ -301,14 +301,14 @@ class SequenceElement (BasicElement):
             f = min(cursor.pos(), cursor.markPos())
             t = max(cursor.pos(), cursor.markPos())
             for i in range(f, t):
-                child = self.tqchildren.pop(f)
+                child = self.children.pop(f)
                 self.formula().elementRemoved(child)
                 seq.addChild(child)
-            self.tqchildren.insert(f, element)
+            self.children.insert(f, element)
             cursor.setMarkPos(-1)
             cursor.set(self, f+1)
         elif cursor.pos() > 0:
-            seq.addChild(self.tqchildren[cursor.pos()-1])
+            seq.addChild(self.children[cursor.pos()-1])
             self.replaceChild(cursor, element)
         else:
             self.insertChild(cursor, element)
@@ -323,10 +323,10 @@ class SequenceElement (BasicElement):
         self.formula().elementRemoved(element)
         
         seq = element.mainChild()
-        pos = self.tqchildren.index(element)
-        self.tqchildren.remove(element)
-        for child in seq.tqchildren:
-            self.tqchildren.insert(pos, child)
+        pos = self.children.index(element)
+        self.children.remove(element)
+        for child in seq.children:
+            self.children.insert(pos, child)
             child.parent = self
             pos += 1
         cursor.set(self, pos)
@@ -334,7 +334,7 @@ class SequenceElement (BasicElement):
 
 
     def addChild(self, element):
-        self.tqchildren.append(element)
+        self.children.append(element)
         element.parent = self
         self.formula().changed()
 
@@ -342,7 +342,7 @@ class SequenceElement (BasicElement):
         """Inserts the new element at the cursor position.
         The cursor is placed behind the new element."""
         pos = cursor.pos()
-        self.tqchildren.insert(pos, element)
+        self.children.insert(pos, element)
         element.parent = self
         cursor.set(self, pos+1)
         self.formula().changed()
@@ -350,15 +350,15 @@ class SequenceElement (BasicElement):
     def replaceChild(self, cursor, element):
         """Replaces the element before the cursor with the new one.
         No range checking. Be careful."""
-        self.tqchildren[cursor.pos()-1] = element
+        self.children[cursor.pos()-1] = element
         element.parent = self
         self.formula().changed()
 
     def removeChild(self, cursor, element):
         self.formula().elementRemoved(element)
-        cursor.set(self, self.tqchildren.index(element))
-        self.tqchildren.remove(element)
-        if len(self.tqchildren) == 0:
+        cursor.set(self, self.children.index(element))
+        self.children.remove(element)
+        if len(self.children) == 0:
             if self.parent != None:
                 self.parent.removeChild(cursor, self)
                 return
@@ -370,16 +370,16 @@ class SequenceElement (BasicElement):
             f = min(cursor.pos(), cursor.markPos())
             t = max(cursor.pos(), cursor.markPos())
             for i in range(f, t):
-                child = self.tqchildren.pop(f)
+                child = self.children.pop(f)
                 self.formula().elementRemoved(child)
             cursor.setMarkPos(-1)
             cursor.set(self, f)
             self.formula().changed()
-        elif pos < len(self.tqchildren):
-            self.tqchildren.pop(pos)
+        elif pos < len(self.children):
+            self.children.pop(pos)
             self.formula().changed()
         else:
-            if len(self.tqchildren) == 0:
+            if len(self.children) == 0:
                 if self.parent != None:
                     self.parent.removeChild(cursor, self)
             
@@ -389,17 +389,17 @@ class SequenceElement (BasicElement):
             f = min(cursor.pos(), cursor.markPos())
             t = max(cursor.pos(), cursor.markPos())
             for i in range(f, t):
-                child = self.tqchildren.pop(f)
+                child = self.children.pop(f)
                 self.formula().elementRemoved(child)
             cursor.setMarkPos(-1)
             cursor.set(self, f)
             self.formula().changed()
         elif pos >= 0:
-            self.tqchildren.pop(pos)
+            self.children.pop(pos)
             cursor.set(self, pos)
             self.formula().changed()
         else:
-            if len(self.tqchildren) == 0:
+            if len(self.children) == 0:
                 if self.parent != None:
                     self.parent.removeChild(cursor, self)
         
@@ -408,10 +408,10 @@ class SequenceElement (BasicElement):
         """Returns the position after the child at the position
         in global Coords."""
         point = self.globalPos()
-        if pos < len(self.tqchildren):
-            d = self.tqchildren[pos].x()
+        if pos < len(self.children):
+            d = self.children[pos].x()
         else:
-            if len(self.tqchildren) > 0:
+            if len(self.children) > 0:
                 d = self.width()
             else:
                 d = 2
@@ -420,12 +420,12 @@ class SequenceElement (BasicElement):
         return point
 
     def countChildren(self):
-        return len(self.tqchildren)
+        return len(self.children)
             
 
 class FormulaElement (SequenceElement):
     """The main element.
-    A formula consists of a FormulaElement and its tqchildren.
+    A formula consists of a FormulaElement and its children.
     The only element that has no parent."""
 
     def __init__(self, document):
@@ -436,7 +436,7 @@ class FormulaElement (SequenceElement):
         return self
 
     def changed(self):
-        """Is called by its tqchildren if the formula changed in any way."""
+        """Is called by its children if the formula changed in any way."""
         self.document.changed()
 
     def elementRemoved(self, element):
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index 5adeb51c..82a5870c 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cc
@@ -176,7 +176,7 @@ BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void RootElement::calcSizes( const ContextStyle& context,
                              ContextStyle::TextStyle tstyle,
@@ -234,7 +234,7 @@ void RootElement::calcSizes( const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -434,8 +434,8 @@ void RootElement::insert(FormulaCursor* cursor,
 }
 
 /**
- * Removes all selected tqchildren and returns them. Places the
- * cursor to where the tqchildren have been.
+ * Removes all selected children and returns them. Places the
+ * cursor to where the children have been.
  *
  * We remove ourselve if we are requested to remove our content.
  */
@@ -476,7 +476,7 @@ void RootElement::normalize(FormulaCursor* cursor, Direction direction)
 
 // main child
 //
-// If an element has tqchildren one has to become the main one.
+// If an element has children one has to become the main one.
 
 SequenceElement* RootElement::getMainChild()
 {
diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h
index 1eacf4d4..f4286ab4 100644
--- a/lib/kformula/rootelement.h
+++ b/lib/kformula/rootelement.h
@@ -66,7 +66,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -74,7 +74,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -86,7 +86,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -124,8 +124,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      *
      * We remove ourselve if we are requested to remove our content.
      */
@@ -139,7 +139,7 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild();
     SequenceElement* getRadiant() { return index; }
@@ -175,7 +175,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index 93293db7..c44c1b50 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cc
@@ -76,7 +76,7 @@ SequenceElement::SequenceElement(BasicElement* parent)
         : BasicElement(parent), parseTree(0), textSequence(true),singlePipe(true), style(0)
 {
     assert( creationStrategy != 0 );
-    tqchildren.setAutoDelete(true);
+    children.setAutoDelete(true);
 }
 
 
@@ -88,12 +88,12 @@ SequenceElement::~SequenceElement()
 SequenceElement::SequenceElement( const SequenceElement& other )
     : BasicElement( other )
 {
-    tqchildren.setAutoDelete(true);
-    uint count = other.tqchildren.count();
+    children.setAutoDelete(true);
+    uint count = other.children.count();
     for (uint i = 0; i < count; i++) {
-        BasicElement* child = tqchildren.at(i)->clone();
+        BasicElement* child = children.at(i)->clone();
         child->setParent( this );
-        tqchildren.append( child );
+        children.append( child );
     }
 }
 
@@ -121,18 +121,18 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
         LuPixelPoint myPos(parentOrigin.x() + getX(),
                            parentOrigin.y() + getY());
 
-        uint count = tqchildren.count();
+        uint count = children.count();
         for (uint i = 0; i < count; i++) {
-            BasicElement* child = tqchildren.at(i);
+            BasicElement* child = children.at(i);
             e = child->goToPos(cursor, handled, point, myPos);
             if (e != 0) {
                 if (!handled) {
                     handled = true;
                     if ((point.x() - myPos.x()) < (e->getX() + e->getWidth()*2/3)) {
-                        cursor->setTo(this, tqchildren.find(e));
+                        cursor->setTo(this, children.find(e));
                     }
                     else {
-                        cursor->setTo(this, tqchildren.find(e)+1);
+                        cursor->setTo(this, children.find(e)+1);
                     }
                 }
                 return e;
@@ -143,11 +143,11 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
         //int dy = point.y() - myPos.y();
 
         for (uint i = 0; i < count; i++) {
-            BasicElement* child = tqchildren.at(i);
+            BasicElement* child = children.at(i);
             if (dx < child->getX()) {
                 cursor->setTo( this, i );
                 handled = true;
-                return tqchildren.at( i );
+                return children.at( i );
             }
         }
 
@@ -161,9 +161,9 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 bool SequenceElement::isEmpty()
 {
-    uint count = tqchildren.count();
+    uint count = children.count();
     for (uint i = 0; i < count; i++) {
-        BasicElement* child = tqchildren.at(i);
+        BasicElement* child = children.at(i);
         if (!child->isInvisible()) {
             return false;
         }
@@ -174,7 +174,7 @@ bool SequenceElement::isEmpty()
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void SequenceElement::calcSizes( const ContextStyle& context,
 								 ContextStyle::TextStyle tstyle,
@@ -190,7 +190,7 @@ void SequenceElement::calcSizes( const ContextStyle& context,
         width += context.ptToPixelX( getSpaceBefore( context, tstyle, factor ) );
 
         // Let's do all normal elements that have a base line.
-        TQPtrListIterator<BasicElement> it( tqchildren );
+        TQPtrListIterator<BasicElement> it( children );
         for ( ; it.current(); ++it ) {
             BasicElement* child = it.current();
 
@@ -237,7 +237,7 @@ void SequenceElement::calcSizes( const ContextStyle& context,
 
 void SequenceElement::setChildrenPositions()
 {
-    TQPtrListIterator<BasicElement> it( tqchildren );
+    TQPtrListIterator<BasicElement> it( children );
     for ( ; it.current(); ++it ) {
         BasicElement* child = it.current();
         child->setY(getBaseline() - child->getBaseline());
@@ -246,7 +246,7 @@ void SequenceElement::setChildrenPositions()
 
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -264,7 +264,7 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
     //    return;
 
     if (!isEmpty()) {
-        TQPtrListIterator<BasicElement> it( tqchildren );
+        TQPtrListIterator<BasicElement> it( children );
         for (int i = 0 ; it.current(); i++) {
             BasicElement* child = it.current();
             if (!child->isInvisible()) {
@@ -308,7 +308,7 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
 
 void SequenceElement::dispatchFontCommand( FontCommand* cmd )
 {
-    TQPtrListIterator<BasicElement> it( tqchildren );
+    TQPtrListIterator<BasicElement> it( children );
     for ( ; it.current(); ++it ) {
         BasicElement* child = it.current();
         child->dispatchFontCommand( cmd );
@@ -420,12 +420,12 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex
 
 luPixel SequenceElement::getChildPosition( const ContextStyle& context, uint child )
 {
-    if (child < tqchildren.count()) {
-        return tqchildren.at(child)->getX();
+    if (child < children.count()) {
+        return children.at(child)->getX();
     }
     else {
-        if (tqchildren.count() > 0) {
-            return tqchildren.at(child-1)->getX() + tqchildren.at(child-1)->getWidth();
+        if (children.count() > 0) {
+            return children.at(child-1)->getX() + children.at(child-1)->getWidth();
         }
         else {
             return context.ptToLayoutUnitPixX( 2 );
@@ -451,9 +451,9 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
 {
     // Our parent asks us for a cursor position. Found.
     if (from == getParent()) {
-        cursor->setTo(this, tqchildren.count());
+        cursor->setTo(this, children.count());
         if ( cursor->isSelectionMode() ) {
-            cursor->setMark( tqchildren.count() );
+            cursor->setMark( children.count() );
         }
         from->entered( this );
     }
@@ -464,7 +464,7 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
             cursor->setTo(this, cursor->getPos()-1);
 
             // invisible elements are not visible so we move on.
-            if (tqchildren.at(cursor->getPos())->isInvisible()) {
+            if (children.at(cursor->getPos())->isInvisible()) {
                 moveLeft(cursor, this);
             }
         }
@@ -479,12 +479,12 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
         }
     }
 
-    // The cursor came from one of our tqchildren or
+    // The cursor came from one of our children or
     // something is wrong.
     else {
-        int fromPos = tqchildren.find(from);
+        int fromPos = children.find(from);
         if ( fromPos > 0 ) {
-            tqchildren.at( fromPos - 1)->moveLeft( cursor, this );
+            children.at( fromPos - 1)->moveLeft( cursor, this );
         }
 
         // invisible elements are not visible so we move on.
@@ -511,11 +511,11 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from)
     // We already owned the cursor. Ask next child then.
     else if (from == this) {
         uint pos = cursor->getPos();
-        if (pos < tqchildren.count()) {
+        if (pos < children.count()) {
             cursor->setTo(this, pos+1);
             
             // invisible elements are not visible so we move on.
-            if (tqchildren.at(pos)->isInvisible()) {
+            if (children.at(pos)->isInvisible()) {
                 moveRight(cursor, this);
             }
         }
@@ -530,12 +530,12 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from)
         }
     }
 
-    // The cursor came from one of our tqchildren or
+    // The cursor came from one of our children or
     // something is wrong.
     else {
-        int fromPos = tqchildren.find(from);
-        if ( fromPos < tqchildren.count() - 1 ) {
-            tqchildren.at( fromPos + 1 )->moveDown( cursor, this );
+        int fromPos = children.find(from);
+        if ( fromPos < children.count() - 1 ) {
+            children.at( fromPos + 1 )->moveDown( cursor, this );
         }
         else {
             cursor->setTo(this, fromPos+1);
@@ -557,7 +557,7 @@ void SequenceElement::moveWordLeft(FormulaCursor* cursor)
 {
     uint pos = cursor->getPos();
     if (pos > 0) {
-        ElementType* type = tqchildren.at(pos-1)->getElementType();
+        ElementType* type = children.at(pos-1)->getElementType();
         if (type != 0) {
             cursor->setTo(this, type->start());
         }
@@ -571,8 +571,8 @@ void SequenceElement::moveWordLeft(FormulaCursor* cursor)
 void SequenceElement::moveWordRight(FormulaCursor* cursor)
 {
     uint pos = cursor->getPos();
-    if (pos < tqchildren.count()) {
-        ElementType* type = tqchildren.at(pos)->getElementType();
+    if (pos < children.count()) {
+        ElementType* type = children.at(pos)->getElementType();
         if (type != 0) {
             cursor->setTo(this, type->end());
         }
@@ -596,7 +596,7 @@ void SequenceElement::moveUp(FormulaCursor* cursor, BasicElement* from)
     else if ( from == this ) {
         if ( getParent() != 0 ) {
             uint pos = cursor->getPos();
-            if ( pos < (tqchildren.count() - 1) / 2 ) {
+            if ( pos < (children.count() - 1) / 2 ) {
                 getParent()->moveLeft( cursor, this );
             }
             else {
@@ -630,8 +630,8 @@ void SequenceElement::moveDown(FormulaCursor* cursor, BasicElement* from)
     }
     else if (from == this) {
         uint pos = cursor->getPos();
-        if (pos < tqchildren.count()) {
-                tqchildren.at(pos)->moveDown(cursor, this);
+        if (pos < children.count()) {
+                children.at(pos)->moveDown(cursor, this);
         }
     }
     else {
@@ -639,7 +639,7 @@ void SequenceElement::moveDown(FormulaCursor* cursor, BasicElement* from)
             getParent()->moveDown(cursor, this);
         }
         else {
-            cursor->setTo( this, tqchildren.count() );
+            cursor->setTo( this, children.count() );
             from->entered( this );
 //            formula()->moveOutBelow( cursor );
         }
@@ -658,7 +658,7 @@ void SequenceElement::moveHome(FormulaCursor* cursor)
             while (element->getParent() != this) {
                 element = element->getParent();
             }
-            cursor->setMark(tqchildren.find(element)+1);
+            cursor->setMark(children.find(element)+1);
         }
     }
     cursor->setTo(this, 0);
@@ -676,16 +676,16 @@ void SequenceElement::moveEnd(FormulaCursor* cursor)
             while (element->getParent() != this) {
                 element = element->getParent();
                 if (element == 0) {
-                    cursor->setMark(tqchildren.count());
+                    cursor->setMark(children.count());
                     break;
                 }
             }
             if (element != 0) {
-                cursor->setMark(tqchildren.find(element));
+                cursor->setMark(children.find(element));
             }
         }
     }
-    cursor->setTo(this, tqchildren.count());
+    cursor->setTo(this, children.count());
 }
 
 /**
@@ -705,11 +705,11 @@ void SequenceElement::goInside(FormulaCursor* cursor)
 void SequenceElement::goInsideLast(FormulaCursor* cursor)
 {
     cursor->setSelection(false);
-    cursor->setTo(this, tqchildren.count());
+    cursor->setTo(this, children.count());
 }
 
 
-// tqchildren
+// children
 
     /**
      * Insert a new child in the sequence
@@ -723,7 +723,7 @@ void SequenceElement::goInsideLast(FormulaCursor* cursor)
 
 bool SequenceElement::insert( uint index, BasicElement *child )
 {
-    return tqchildren.insert( index, child );
+    return children.insert( index, child );
 }
 
 /**
@@ -735,12 +735,12 @@ bool SequenceElement::insert( uint index, BasicElement *child )
  */
 // void SequenceElement::removeChild(FormulaCursor* cursor, BasicElement* child)
 // {
-//     int pos = tqchildren.find(child);
+//     int pos = children.find(child);
 //     formula()->elementRemoval(child, pos);
 //     cursor->setTo(this, pos);
-//     tqchildren.remove(pos);
+//     children.remove(pos);
 //     /*
-//         if len(self.tqchildren) == 0:
+//         if len(self.children) == 0:
 //             if self.parent != None:
 //                 self.parent.removeChild(cursor, self)
 //                 return
@@ -750,7 +750,7 @@ bool SequenceElement::insert( uint index, BasicElement *child )
 
 
 /**
- * Inserts all new tqchildren at the cursor position. Places the
+ * Inserts all new children at the cursor position. Places the
  * cursor according to the direction. The inserted elements will
  * be selected.
  *
@@ -765,7 +765,7 @@ void SequenceElement::insert(FormulaCursor* cursor,
     for (uint i = 0; i < count; i++) {
         BasicElement* child = newChildren.take(0);
         child->setParent(this);
-        tqchildren.insert(pos+i, child);
+        children.insert(pos+i, child);
     }
     if (direction == beforeCursor) {
         cursor->setTo(this, pos+count, pos);
@@ -780,8 +780,8 @@ void SequenceElement::insert(FormulaCursor* cursor,
 
 
 /**
- * Removes all selected tqchildren and returns them. Places the
- * cursor to where the tqchildren have been.
+ * Removes all selected children and returns them. Places the
+ * cursor to where the children have been.
  *
  * The ownership of the list is passed to the caller.
  */
@@ -803,9 +803,9 @@ void SequenceElement::remove(FormulaCursor* cursor,
             int pos = cursor->getPos() - 1;
             if (pos >= 0) {
                 while (pos >= 0) {
-                    BasicElement* child = tqchildren.at(pos);
+                    BasicElement* child = children.at(pos);
                     formula()->elementRemoval(child);
-                    tqchildren.take(pos);
+                    children.take(pos);
                     removedChildren.prepend(child);
                     if (!child->isInvisible()) {
                         break;
@@ -818,11 +818,11 @@ void SequenceElement::remove(FormulaCursor* cursor,
         }
         else {
             uint pos = cursor->getPos();
-            if (pos < tqchildren.count()) {
-                while (pos < tqchildren.count()) {
-                    BasicElement* child = tqchildren.at(pos);
+            if (pos < children.count()) {
+                while (pos < children.count()) {
+                    BasicElement* child = children.at(pos);
                     formula()->elementRemoval(child);
-                    tqchildren.take(pos);
+                    children.take(pos);
                     removedChildren.append(child);
                     if (!child->isInvisible()) {
                         break;
@@ -841,13 +841,13 @@ void SequenceElement::remove(FormulaCursor* cursor,
 
 
 /**
- * Removes the tqchildren at pos and appends it to the list.
+ * Removes the children at pos and appends it to the list.
  */
 void SequenceElement::removeChild(TQPtrList<BasicElement>& removedChildren, int pos)
 {
-    BasicElement* child = tqchildren.at(pos);
+    BasicElement* child = children.at(pos);
     formula()->elementRemoval(child);
-    tqchildren.take(pos);
+    children.take(pos);
     removedChildren.append(child);
     //cerr << *removedChildren.at(0) << endl;
     formula()->changed();
@@ -872,12 +872,12 @@ BasicElement* SequenceElement::getChild( FormulaCursor* cursor, Direction direct
 {
     if ( direction == beforeCursor ) {
         if ( cursor->getPos() > 0 ) {
-            return tqchildren.at( cursor->getPos() - 1 );
+            return children.at( cursor->getPos() - 1 );
         }
     }
     else {
-        if ( cursor->getPos() < tqRound( tqchildren.count() ) ) {
-            return tqchildren.at( cursor->getPos() );
+        if ( cursor->getPos() < tqRound( children.count() ) ) {
+            return children.at( cursor->getPos() );
         }
     }
     return 0;
@@ -890,7 +890,7 @@ BasicElement* SequenceElement::getChild( FormulaCursor* cursor, Direction direct
  */
 void SequenceElement::selectChild(FormulaCursor* cursor, BasicElement* child)
 {
-    int pos = tqchildren.find(child);
+    int pos = children.find(child);
     if (pos > -1) {
         cursor->setTo(this, pos+1, pos);
     }
@@ -898,7 +898,7 @@ void SequenceElement::selectChild(FormulaCursor* cursor, BasicElement* child)
 
 void SequenceElement::childWillVanish(FormulaCursor* cursor, BasicElement* child)
 {
-    int childPos = tqchildren.find(child);
+    int childPos = children.find(child);
     if (childPos > -1) {
         int pos = cursor->getPos();
         if (pos > childPos) {
@@ -914,11 +914,11 @@ void SequenceElement::childWillVanish(FormulaCursor* cursor, BasicElement* child
 
 
 /**
- * Selects all tqchildren. The cursor is put behind, the mark before them.
+ * Selects all children. The cursor is put behind, the mark before them.
  */
 void SequenceElement::selectAllChildren(FormulaCursor* cursor)
 {
-    cursor->setTo(this, tqchildren.count(), 0);
+    cursor->setTo(this, children.count(), 0);
 }
 
 bool SequenceElement::onlyTextSelected( FormulaCursor* cursor )
@@ -1116,7 +1116,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request
     case req_addIndex: {
         if ( cursor->getPos() > 0 && !cursor->isSelection() ) {
             IndexElement* element =
-                dynamic_cast<IndexElement*>( tqchildren.at( cursor->getPos()-1 ) );
+                dynamic_cast<IndexElement*>( children.at( cursor->getPos()-1 ) );
             if ( element != 0 ) {
                 element->goInside( cursor );
                 return element->buildCommand( container, request );
@@ -1206,7 +1206,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request
             CharStyleCommand* cmd = new CharStyleCommand( cs, i18n( "Change Char Style" ), container );
             int end = cursor->getSelectionEnd();
             for ( int i = cursor->getSelectionStart(); i<end; ++i ) {
-                cmd->addElement( tqchildren.at( i ) );
+                cmd->addElement( children.at( i ) );
             }
             return cmd;
         }
@@ -1219,7 +1219,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request
             CharFamilyCommand* cmd = new CharFamilyCommand( cf, i18n( "Change Char Family" ), container );
             int end = cursor->getSelectionEnd();
             for ( int i = cursor->getSelectionStart(); i<end; ++i ) {
-                cmd->addElement( tqchildren.at( i ) );
+                cmd->addElement( children.at( i ) );
             }
             return cmd;
         }
@@ -1397,25 +1397,25 @@ KCommand* SequenceElement::input( Container* container, TQChar ch )
 }
 
 /**
- * Stores the given tqchildrens dom in the element.
+ * Stores the given childrens dom in the element.
  */
 void SequenceElement::getChildrenDom( TQDomDocument& doc, TQDomElement elem,
                                      uint from, uint to)
 {
     for (uint i = from; i < to; i++) {
-        TQDomElement tmpEleDom=tqchildren.at(i)->getElementDom(doc);
+        TQDomElement tmpEleDom=children.at(i)->getElementDom(doc);
         elem.appendChild(tmpEleDom);
     }
 }
 
 /**
- * Stores the given tqchildrens MathML dom in the element.
+ * Stores the given childrens MathML dom in the element.
  */
 void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& parent,
                                             uint from, uint to)
 {
     for ( uint i = from; i < to; i++ ) {
-        tqchildren.at( i )->writeMathML( doc, parent, false );
+        children.at( i )->writeMathML( doc, parent, false );
     }
 }
 
@@ -1467,7 +1467,7 @@ void SequenceElement::writeDom(TQDomElement element)
 {
     BasicElement::writeDom(element);
 
-    uint count = tqchildren.count();
+    uint count = children.count();
     TQDomDocument doc = element.ownerDocument();
     getChildrenDom(doc, element, 0, count);
 }
@@ -1495,7 +1495,7 @@ bool SequenceElement::readContentFromDom(TQDomNode& node)
         return false;
     }
 
-    return buildChildrenFromDom(tqchildren, node);
+    return buildChildrenFromDom(children, node);
 }
 
 
@@ -1504,9 +1504,9 @@ void SequenceElement::parse()
     delete parseTree;
 
     textSequence = true;
-    for (BasicElement* element = tqchildren.first();
+    for (BasicElement* element = children.first();
          element != 0;
-         element = tqchildren.next()) {
+         element = children.next()) {
 
         // Those types are gone. Make sure they won't
         // be used.
@@ -1519,7 +1519,7 @@ void SequenceElement::parse()
 
     const SymbolTable& symbols = formula()->getSymbolTable();
     SequenceParser parser(symbols);
-    parseTree = parser.parse(tqchildren);
+    parseTree = parser.parse(children);
 
     // With the IndexElement dynamically changing its text/non-text
     // behaviour we need to reparse your parent, too. Hacky!
@@ -1544,9 +1544,9 @@ bool SequenceElement::isFirstOfToken( BasicElement* child )
 TQString SequenceElement::toLatex()
 {
     TQString content;
-    uint count = tqchildren.count();
+    uint count = children.count();
     for ( uint i = 0; i < count; i++ ) {
-        BasicElement* child = tqchildren.at( i );
+        BasicElement* child = children.at( i );
 //         if ( isFirstOfToken( child ) ) {
 //             content += "";
 //         }
@@ -1559,9 +1559,9 @@ TQString SequenceElement::toLatex()
 TQString SequenceElement::formulaString()
 {
     TQString content;
-    uint count = tqchildren.count();
+    uint count = children.count();
     for ( uint i = 0; i < count; i++ ) {
-        BasicElement* child = tqchildren.at( i );
+        BasicElement* child = children.at( i );
         //if ( isFirstOfToken( child ) ) {
         //    content += " ";
         //}
@@ -1573,7 +1573,7 @@ TQString SequenceElement::formulaString()
 
 void SequenceElement::writeMathMLContent( TQDomDocument& doc, TQDomElement& element, bool oasisFormat ) const
 {
-    for ( TQPtrListIterator<BasicElement> it( tqchildren ); it.current(); ++it ) {
+    for ( TQPtrListIterator<BasicElement> it( children ); it.current(); ++it ) {
         it.current()->writeMathML( doc, element, oasisFormat );
     }
 }
@@ -1581,7 +1581,7 @@ void SequenceElement::writeMathMLContent( TQDomDocument& doc, TQDomElement& elem
 
 const BasicElement* SequenceElement::getChild( uint i ) const
 {
-    TQPtrListIterator<BasicElement> it( tqchildren );
+    TQPtrListIterator<BasicElement> it( children );
     it += i;
     return it.current();
 }
@@ -1589,7 +1589,7 @@ const BasicElement* SequenceElement::getChild( uint i ) const
 
 int SequenceElement::childPos( const BasicElement* child ) const
 {
-    TQPtrListIterator<BasicElement> it( tqchildren );
+    TQPtrListIterator<BasicElement> it( children );
     uint count = it.count();
     for ( uint i=0; i<count; ++i, ++it ) {
         if ( it.current() == child ) {
@@ -1782,7 +1782,7 @@ BasicElement* NameSequence::createElement( TQString type )
 
 // void NameSequence::parse()
 // {
-//     // A name sequence is known as name and so are its tqchildren.
+//     // A name sequence is known as name and so are its children.
 //     // Caution: this is fake!
 //     for ( int i = 0; i < countChildren(); i++ ) {
 //         getChild( i )->setElementType( getElementType() );
@@ -1891,7 +1891,7 @@ int SequenceElement::readContentFromMathMLDom(TQDomNode& node)
         return -1;
     }
 
-    return buildChildrenFromMathMLDom(tqchildren, node);
+    return buildChildrenFromMathMLDom(children, node);
 }
 
 int SequenceElement::buildMathMLChild( TQDomNode node )
@@ -1915,7 +1915,7 @@ int SequenceElement::buildMathMLChild( TQDomNode node )
             child->setStyle(style);
         }
         if (child->buildFromMathMLDom(e) != -1) {
-            tqchildren.append(child);
+            children.append(child);
         }
         else {
             delete child;
diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h
index 4d32153c..f9fb2ce6 100644
--- a/lib/kformula/sequenceelement.h
+++ b/lib/kformula/sequenceelement.h
@@ -34,8 +34,8 @@ class SymbolTable;
 class ElementCreationStrategy;
 
 /**
- * The element that contains a number of tqchildren.
- * The tqchildren are aligned in one line.
+ * The element that contains a number of children.
+ * The children are aligned in one line.
  */
 class SequenceElement : public BasicElement {
     SequenceElement& operator=( const SequenceElement& ) { return *this; }
@@ -92,7 +92,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -100,7 +100,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -112,7 +112,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -202,10 +202,10 @@ public:
     virtual void goInsideLast(FormulaCursor* cursor);
 
 
-    // tqchildren
+    // children
 
     /**
-     * Inserts all new tqchildren at the cursor position. Places the
+     * Inserts all new children at the cursor position. Places the
      * cursor according to the direction. The inserted elements will
      * be selected.
      *
@@ -214,8 +214,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      */
     virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
@@ -244,18 +244,18 @@ public:
     virtual void childWillVanish(FormulaCursor* cursor, BasicElement* child);
 
     /**
-     * @returns the number of tqchildren we have.
+     * @returns the number of children we have.
      */
-    uint countChildren() const { return tqchildren.count(); }
+    uint countChildren() const { return children.count(); }
 
     /**
      * @returns whether the child has the given number.
      */
     bool isChildNumber( uint pos, BasicElement* child )
-        { return tqchildren.at( pos ) == child; }
+        { return children.at( pos ) == child; }
 
     /**
-     * Selects all tqchildren. The cursor is put behind, the mark before them.
+     * Selects all children. The cursor is put behind, the mark before them.
      */
     void selectAllChildren(FormulaCursor* cursor);
 
@@ -288,12 +288,12 @@ public:
     virtual void parse();
 
     /**
-     * Stores the given tqchildrens dom in the element.
+     * Stores the given childrens dom in the element.
      */
     void getChildrenDom( TQDomDocument& doc, TQDomElement elem, uint from, uint to);
 
     /**
-     * Stores the given tqchildrens MathML dom in the element.
+     * Stores the given childrens MathML dom in the element.
      */
     void getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& elem, uint from, uint to );
 
@@ -306,7 +306,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -315,10 +315,10 @@ public:
     /**
      * @returns the child at position i.
      */
-    BasicElement* getChild(uint i) { return tqchildren.at(i); }
+    BasicElement* getChild(uint i) { return children.at(i); }
     const BasicElement* getChild(uint i) const;
 
-    int childPos( BasicElement* child ) { return tqchildren.find( child ); }
+    int childPos( BasicElement* child ) { return children.find( child ); }
     int childPos( const BasicElement* child ) const;
 
     class ChildIterator {
@@ -407,7 +407,7 @@ protected:
     virtual bool readContentFromDom(TQDomNode& node);
 
     /**
-     * Sets the tqchildrens' positions after their size has been
+     * Sets the childrens' positions after their size has been
      * calculated.
      *
      * @see #calcSizes
@@ -458,16 +458,16 @@ protected:
 private:
 
     /**
-     * Removes the tqchildren at pos and appends it to the list.
+     * Removes the children at pos and appends it to the list.
      */
     void removeChild(TQPtrList<BasicElement>& removedChildren, int pos);
 
 
     /**
-     * Our tqchildren. Be sure to notify the rootElement before
+     * Our children. Be sure to notify the rootElement before
      * you remove any.
      */
-    TQPtrList<BasicElement> tqchildren;
+    TQPtrList<BasicElement> children;
 
     /**
      * the syntax tree of the sequence
@@ -603,7 +603,7 @@ protected:
 
     /**
      * @returns whether the child is the first element of its token.
-     * This can never happen here. Our tqchildren reuse our own
+     * This can never happen here. Our children reuse our own
      * element type.
      */
     virtual bool isFirstOfToken( BasicElement* ) { return false; }
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc
index a7e23464..1fb4f553 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cc
@@ -288,13 +288,13 @@ void SpaceElement::writeMathMLAttributes( TQDomElement& element ) const
 {
     switch ( m_widthType ) {
     case AbsoluteSize:
-        element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) );
+        element.setAttribute( "width", TQString( "%1pt" ).arg( m_width ) );
         break;
     case RelativeSize:
-        element.setAttribute( "width", TQString( "%1%" ).tqarg( m_width * 100.0 ) );
+        element.setAttribute( "width", TQString( "%1%" ).arg( m_width * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "width", TQString( "%1px" ).tqarg( m_width ) );
+        element.setAttribute( "width", TQString( "%1px" ).arg( m_width ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         element.setAttribute( "width", "negativeveryverythinmathspace" );
@@ -343,26 +343,26 @@ void SpaceElement::writeMathMLAttributes( TQDomElement& element ) const
     }
     switch ( m_heightType ) {
     case AbsoluteSize:
-        element.setAttribute( "height", TQString( "%1pt" ).tqarg( m_height ) );
+        element.setAttribute( "height", TQString( "%1pt" ).arg( m_height ) );
         break;
     case RelativeSize:
-        element.setAttribute( "height", TQString( "%1%" ).tqarg( m_height * 100.0 ) );
+        element.setAttribute( "height", TQString( "%1%" ).arg( m_height * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "height", TQString( "%1px" ).tqarg( m_height ) );
+        element.setAttribute( "height", TQString( "%1px" ).arg( m_height ) );
         break;
     default:
         break;
     }
     switch ( m_depthType ) {
     case AbsoluteSize:
-        element.setAttribute( "depth", TQString( "%1pt" ).tqarg( m_depth ) );
+        element.setAttribute( "depth", TQString( "%1pt" ).arg( m_depth ) );
         break;
     case RelativeSize:
-        element.setAttribute( "depth", TQString( "%1%" ).tqarg( m_depth * 100.0 ) );
+        element.setAttribute( "depth", TQString( "%1%" ).arg( m_depth * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "depth", TQString( "%1px" ).tqarg( m_depth ) );
+        element.setAttribute( "depth", TQString( "%1px" ).arg( m_depth ) );
         break;
     default:
         break;
diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h
index a8c5ec9a..46397509 100644
--- a/lib/kformula/spaceelement.h
+++ b/lib/kformula/spaceelement.h
@@ -78,7 +78,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -86,7 +86,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -105,7 +105,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc
index 3bb6b6b1..de760453 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cc
@@ -135,13 +135,13 @@ void StyleElement::writeMathMLAttributes( TQDomElement& element ) const
         if ( m_relativeScriptLevel && m_scriptLevel >= 0 ) {
             prefix = "+";
         }
-        element.setAttribute( "scriptlevel", prefix + TQString( "%1" ).tqarg( m_scriptLevel ) );
+        element.setAttribute( "scriptlevel", prefix + TQString( "%1" ).arg( m_scriptLevel ) );
     }
     if ( m_customDisplayStyle ) {
         element.setAttribute( "displaystyle", m_displayStyle ? "true" : "false" );
     }
     if ( m_customScriptSizeMultiplier ) {
-        element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).tqarg( m_scriptSizeMultiplier ) );
+        element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).arg( m_scriptSizeMultiplier ) );
     }
     writeSizeAttribute( element, "scriptminsize", m_scriptMinSizeType, m_scriptMinSize );
     if ( m_customBackground ) {
@@ -373,13 +373,13 @@ void StyleElement::writeSizeAttribute( TQDomElement element, const TQString& str
 {
     switch ( st ) {
     case AbsoluteSize:
-        element.setAttribute( str, TQString( "%1pt" ).tqarg( s ) );
+        element.setAttribute( str, TQString( "%1pt" ).arg( s ) );
         break;
     case RelativeSize:
-        element.setAttribute( str, TQString( "%1%" ).tqarg( s * 100.0 ) );
+        element.setAttribute( str, TQString( "%1%" ).arg( s * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( str, TQString( "%1px" ).tqarg( s ) );
+        element.setAttribute( str, TQString( "%1px" ).arg( s ) );
         break;
     default:
         break;
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index aca4dc03..e26f3fef 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cc
@@ -91,7 +91,7 @@ void SymbolComboItem::paint( TQPainter *p )
     p->setFont( m_font );
     TQFontMetrics fm( p->fontMetrics() );
     p->drawText( 3, fm.ascent() + fm.leading() / 2,
-                 TQString( "%1" ).tqarg( TQChar( m_symbol ) ) );
+                 TQString( "%1" ).arg( TQChar( m_symbol ) ) );
 
     p->setFont( KGlobalSettings::generalFont() );
     fm = p->fontMetrics();
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc
index a601cea4..31787b16 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cc
@@ -192,7 +192,7 @@ BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void SymbolElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -299,7 +299,7 @@ void SymbolElement::calcSizes( const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -502,11 +502,11 @@ void SymbolElement::moveDown(FormulaCursor* cursor, BasicElement* from)
     }
 }
 
-// tqchildren
+// children
 
 // main child
 //
-// If an element has tqchildren one has to become the main one.
+// If an element has children one has to become the main one.
 
 // void SymbolElement::setMainChild(SequenceElement* child)
 // {
@@ -518,7 +518,7 @@ void SymbolElement::moveDown(FormulaCursor* cursor, BasicElement* from)
 
 
 /**
- * Inserts all new tqchildren at the cursor position. Places the
+ * Inserts all new children at the cursor position. Places the
  * cursor according to the direction.
  *
  * You only can insert one index at a time. So the list must contain
@@ -557,8 +557,8 @@ void SymbolElement::insert(FormulaCursor* cursor,
 }
 
 /**
- * Removes all selected tqchildren and returns them. Places the
- * cursor to where the tqchildren have been.
+ * Removes all selected children and returns them. Places the
+ * cursor to where the children have been.
  *
  * The cursor has to be inside one of our indexes which is supposed
  * to be empty. The index will be removed and the cursor will
diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h
index 0133258e..ab9b5d89 100644
--- a/lib/kformula/symbolelement.h
+++ b/lib/kformula/symbolelement.h
@@ -65,7 +65,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -73,7 +73,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -85,7 +85,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -125,7 +125,7 @@ public:
      */
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
-    // tqchildren
+    // children
 
     /**
      * Removes the child. If this was the main child this element might
@@ -139,14 +139,14 @@ public:
 
     // main child
     //
-    // If an element has tqchildren one has to become the main one.
+    // If an element has children one has to become the main one.
 
     virtual SequenceElement* getMainChild() { return content; }
     //virtual void setMainChild(SequenceElement*);
 
 
     /**
-     * Inserts all new tqchildren at the cursor position. Places the
+     * Inserts all new children at the cursor position. Places the
      * cursor according to the direction.
      *
      * You only can insert one index at a time. So the list must contain
@@ -158,8 +158,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected tqchildren and returns them. Places the
-     * cursor to where the tqchildren have been.
+     * Removes all selected children and returns them. Places the
+     * cursor to where the children have been.
      *
      * The cursor has to be inside one of our indexes which is supposed
      * to be empty. The index will be removed and the cursor will
@@ -221,7 +221,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc
index 42c4a8e6..9b27871b 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cc
@@ -144,7 +144,7 @@ TQStringList SymbolTable::allNames() const
 TQString SymbolTable::get_name( struct UnicodeNameTable entry ) const
 {
     if ( !*entry.name ) {
-        return "U" + TQString( "%1" ).tqarg( entry.tqunicode, 4, 16 ).upper();
+        return "U" + TQString( "%1" ).arg( entry.tqunicode, 4, 16 ).upper();
     }
     return entry.name;
 }
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc
index c9826429..8789377c 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cc
@@ -106,7 +106,7 @@ bool TextElement::isInvisible() const
 
 /**
  * Calculates our width and height and
- * our tqchildren's parentPosition.
+ * our children's parentPosition.
  */
 void TextElement::calcSizes( const ContextStyle& context, 
                              ContextStyle::TextStyle tstyle, 
@@ -155,7 +155,7 @@ void TextElement::calcSizes( const ContextStyle& context,
 }
 
 /**
- * Draws the whole element including its tqchildren.
+ * Draws the whole element including its children.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h
index 99b6e63a..1a64ce80 100644
--- a/lib/kformula/textelement.h
+++ b/lib/kformula/textelement.h
@@ -73,7 +73,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -81,7 +81,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -93,7 +93,7 @@ public:
                        const LuPixelPoint& parentOrigin );
 
     /**
-     * Dispatch this FontCommand to all our TextElement tqchildren.
+     * Dispatch this FontCommand to all our TextElement children.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -123,7 +123,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
@@ -244,7 +244,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's parentPosition.
+     * our children's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -252,7 +252,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its tqchildren.
+     * Draws the whole element including its children.
      * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
@@ -266,7 +266,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's tqchildren
+     * of the element's children
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc
index 272af51f..eda9c0dc 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cc
@@ -97,7 +97,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo
         n = n.nextSibling();
     }
 //	parse();
-	kdWarning() << "Num of tqchildren " << list.count() << endl;
+	kdWarning() << "Num of children " << list.count() << endl;
     return 1;
 }
 
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc
index c8e4799f..fcce16e7 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cc
@@ -344,13 +344,13 @@ void TokenStyleElement::writeMathMLAttributes( TQDomElement& element ) const
     // mathsize attribute
     switch ( m_mathSizeType ) {
     case AbsoluteSize:
-        element.setAttribute( "mathsize", TQString( "%1pt" ).tqarg( m_mathSize ) );
+        element.setAttribute( "mathsize", TQString( "%1pt" ).arg( m_mathSize ) );
         break;
     case RelativeSize:
-        element.setAttribute( "mathsize", TQString( "%1%" ).tqarg( m_mathSize * 100.0 ) );
+        element.setAttribute( "mathsize", TQString( "%1%" ).arg( m_mathSize * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "mathsize", TQString( "%1px" ).tqarg( m_mathSize ) );
+        element.setAttribute( "mathsize", TQString( "%1px" ).arg( m_mathSize ) );
         break;
     default:
         break;
@@ -370,13 +370,13 @@ void TokenStyleElement::writeMathMLAttributes( TQDomElement& element ) const
     // fontsize attribute
     switch ( m_fontSizeType ) {
     case AbsoluteSize:
-        element.setAttribute( "fontsize", TQString( "%1pt" ).tqarg( m_fontSize ) );
+        element.setAttribute( "fontsize", TQString( "%1pt" ).arg( m_fontSize ) );
         break;
     case RelativeSize:
-        element.setAttribute( "fontsize", TQString( "%1%" ).tqarg( m_fontSize * 100.0 ) );
+        element.setAttribute( "fontsize", TQString( "%1%" ).arg( m_fontSize * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "fontsize", TQString( "%3px" ).tqarg( m_fontSize ) );
+        element.setAttribute( "fontsize", TQString( "%3px" ).arg( m_fontSize ) );
         break;
     default:
         break;
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index d127f444..a4cfcc14 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -180,10 +180,10 @@ bool KoApplication::start()
 			   paths = KGlobal::dirs()->findAllResources("data", appName +"/templates/" + desktopName );
 	             }
 		     if ( paths.isEmpty()) {
-		        KMessageBox::error(0L, i18n("No template found for: %1 ").tqarg(desktopName) );
+		        KMessageBox::error(0L, i18n("No template found for: %1 ").arg(desktopName) );
 		        delete shell;
 		     } else if ( paths.count() > 1 ) {
-		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").tqarg(desktopName) );
+		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").arg(desktopName) );
 		        delete shell;
 		     }
 		  }
@@ -203,7 +203,7 @@ bool KoApplication::start()
 		       kdDebug(30003) << "Template loaded..." << endl;
 		       n++;
 		     } else {
-		        KMessageBox::error(0L, i18n("Template %1 failed to load.").tqarg(templateURL.prettyURL()) );
+		        KMessageBox::error(0L, i18n("Template %1 failed to load.").arg(templateURL.prettyURL()) );
  		        delete shell;
 		     }
 		  }
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 042a39a8..3348e873 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cc
@@ -45,7 +45,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat )
     KoDocumentEntry entry = KoDocumentEntry::queryByMimeType( nativeFormat );
     if ( entry.isEmpty() )
     {
-        KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).tqarg( nativeFormat ) );
+        KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).arg( nativeFormat ) );
         return DCOPRef();
     }
     KoDocument* doc = entry.createDoc( 0 );
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index e7752347..c78ee70f 100644
--- a/lib/kofficecore/KoChild.cpp
+++ b/lib/kofficecore/KoChild.cpp
@@ -34,7 +34,7 @@ public:
   {
   }
 
-  TQRect m_tqgeometry;
+  TQRect m_geometry;
 
   double m_rotation;
   double m_shearX;
@@ -74,14 +74,14 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit )
   if ( !d->m_lock )
     d->m_old = framePointArray();
 
-  d->m_tqgeometry = rect;
+  d->m_geometry = rect;
 
   // Embedded objects should have a minimum size of 3, so they can be selected
-  if( d->m_tqgeometry.width() < 3 )
-    d->m_tqgeometry.setWidth( 3 );
+  if( d->m_geometry.width() < 3 )
+    d->m_geometry.setWidth( 3 );
 
-  if( d->m_tqgeometry.height() < 3 )
-    d->m_tqgeometry.setHeight( 3 );
+  if( d->m_geometry.height() < 3 )
+    d->m_geometry.setHeight( 3 );
 
   updateMatrix();
 
@@ -89,9 +89,9 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit )
     emit changed( this );
 }
 
-TQRect KoChild::tqgeometry() const
+TQRect KoChild::geometry() const
 {
-  return d->m_tqgeometry;
+  return d->m_geometry;
 }
 
 TQRegion KoChild::region( const TQWMatrix &matrix ) const
@@ -101,7 +101,7 @@ TQRegion KoChild::region( const TQWMatrix &matrix ) const
 
 TQPointArray KoChild::pointArray( const TQWMatrix &matrix ) const
 {
-  return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix );
+  return pointArray( TQRect( 0, 0, d->m_geometry.width(), d->m_geometry.height() ), matrix );
 }
 
 //bool KoChild::contains( const TQPoint &point ) const
@@ -232,13 +232,13 @@ void KoChild::setContentsPos( int x, int y )
 
 TQRect KoChild::contentRect() const
 {
-  return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_tqgeometry.width() / d->m_scaleX),
-                int(d->m_tqgeometry.height() / d->m_scaleY) );
+  return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_geometry.width() / d->m_scaleX),
+                int(d->m_geometry.height() / d->m_scaleY) );
 }
 
 TQPointArray KoChild::framePointArray( const TQWMatrix &matrix ) const
 {
-  return pointArray( TQRect( -6, -6, d->m_tqgeometry.width() + 12, d->m_tqgeometry.height() + 12 ), matrix );
+  return pointArray( TQRect( -6, -6, d->m_geometry.width() + 12, d->m_geometry.height() + 12 ), matrix );
 }
 
 TQRegion KoChild::frameRegion( const TQWMatrix &matrix, bool solid ) const
@@ -281,7 +281,7 @@ void KoChild::updateMatrix()
 
   TQWMatrix m;
   m.rotate( d->m_rotation );
-  m.translate( -d->m_rotationPoint.x() + d->m_tqgeometry.x(), -d->m_rotationPoint.y() + d->m_tqgeometry.y() );
+  m.translate( -d->m_rotationPoint.x() + d->m_geometry.x(), -d->m_rotationPoint.y() + d->m_geometry.y() );
   m.translate( p.x(), p.y() );
   m.shear( d->m_shearX, d->m_shearY );
 
@@ -343,21 +343,21 @@ KoChild::Gadget KoChild::gadgetHitTest( const TQPoint &p )
 
   if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).contains( p ) )
       return TopLeft;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
       return TopMid;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), -5, 5, 5 ) ) ).contains( p ) )
       return TopRight;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
       return MidLeft;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomLeft;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3,
-				   d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3,
+				   d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
     return BottomMid;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomRight;
-  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(),
-				   d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(),
+				   d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
     return MidRight;
 
   return Move;
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index b7285deb..fe345e2e 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -24,7 +24,7 @@
 #include <koffice_export.h>
 
 /**
- * KoChild is an abstract base class that represents the tqgeometry
+ * KoChild is an abstract base class that represents the geometry
  * associated with an embedded document. In general it handles its position
  * relative to the embedded document's parent.
  *
@@ -60,7 +60,7 @@ public:
   virtual ~KoChild();
 
   /**
-   *  Sets a new tqgeometry for this child document.
+   *  Sets a new geometry for this child document.
    *  Use noEmit = true if you do not want the 'changed'-signal to be emitted
    */
   void setGeometry( const TQRect &rect, bool noEmit = false );
@@ -74,7 +74,7 @@ public:
    *
    * @see #setGeometry
    */
-  TQRect tqgeometry() const;
+  TQRect geometry() const;
 
   /**
    * @return the region of this child part relative to the
@@ -189,10 +189,10 @@ public:
 
   /**
    * @return the contents rectangle that is visible.
-   *         This value depends on the scaling and the tqgeometry.
+   *         This value depends on the scaling and the geometry.
    *         This is the value that is passed to KoDocument::paintContent.
    *
-   * @see #xScaling #tqgeometry
+   * @see #xScaling #geometry
    */
   virtual TQRect contentRect() const;
 
@@ -204,7 +204,7 @@ public:
   virtual TQRegion frameRegion( const TQWMatrix& matrix = TQWMatrix(), bool solid = false ) const;
 
   /**
-   * @return the frame tqgeometry including a border (6 pixels) as a point
+   * @return the frame geometry including a border (6 pixels) as a point
    *         array with 4 points, one for each corner, transformed by given matrix.
    */
   virtual TQPointArray framePointArray( const TQWMatrix &matrix = TQWMatrix() ) const;
@@ -234,11 +234,11 @@ public:
   void unlock();
 
   /**
-   * If the child is locked, tqgeometry changes
+   * If the child is locked, geometry changes
    * (including scaling, rotation, ...) are not backed up.
    *
    * As long as this child is locked, the backed up
-   * tqgeometry state can be recovered with oldPointArray.
+   * geometry state can be recovered with oldPointArray.
    *
    * @return true when this child is locked.
    *
@@ -247,7 +247,7 @@ public:
   bool locked() const;
 
   /**
-   * @return the backed up tqgeometry transformed by given matrix.
+   * @return the backed up geometry transformed by given matrix.
    */
   virtual TQPointArray oldPointArray( const TQWMatrix &matrix );
 
diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp
index bd4bb489..ae4dbeab 100644
--- a/lib/kofficecore/KoContainerHandler.cpp
+++ b/lib/kofficecore/KoContainerHandler.cpp
@@ -47,7 +47,7 @@ public:
                               KoChild::Gadget gadget, const TQPoint& point ) :
         m_gadget(gadget), m_view(view), m_child(child), m_parentMatrix(matrix) {
 
-        m_geometryStart = child->tqgeometry();
+        m_geometryStart = child->geometry();
         m_matrix = child->matrix() * matrix;
         m_invertParentMatrix = matrix.invert();
 
@@ -84,11 +84,11 @@ KoPartResizeHandler::~KoPartResizeHandler()
     d=0L;
 }
 
-void KoPartResizeHandler::tqrepaint(TQRegion &rgn)
+void KoPartResizeHandler::repaint(TQRegion &rgn)
 {
   rgn = rgn.unite( d->m_child->frameRegion( d->m_parentMatrix, true ) );
  // rgn.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset());
-  ((TQWidget*)target())->tqrepaint( rgn );
+  ((TQWidget*)target())->repaint( rgn );
 }
 
 bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
@@ -128,7 +128,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::TopMid:
@@ -137,7 +137,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width(), d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::TopRight:
@@ -147,7 +147,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() - y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::MidLeft:
@@ -156,7 +156,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::MidRight:
@@ -165,7 +165,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomLeft:
@@ -175,7 +175,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
                                              d->m_geometryStart.width() - x, d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomMid:
@@ -184,7 +184,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width(), d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         case KoChild::BottomRight:
@@ -194,7 +194,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
 
                 d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
                                              d->m_geometryStart.width() + x, d->m_geometryStart.height() + y ) );
-                tqrepaint(rgn);
+                repaint(rgn);
             }
             break;
         default:
@@ -214,7 +214,7 @@ public:
                                                    m_parentMatrix(matrix) {
         m_invertParentMatrix = matrix.invert();
         m_mouseDragStart = m_invertParentMatrix.map( point );
-        m_geometryDragStart = m_dragChild->tqgeometry();
+        m_geometryDragStart = m_dragChild->geometry();
         m_rotationDragStart = m_dragChild->rotationPoint();
     }
     ~KoPartMoveHandlerPrivate() {}
@@ -263,7 +263,7 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev )
                                                d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) );
         bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) );
       //  bound.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset());
-        ((TQWidget*)target())->tqrepaint( bound );
+        ((TQWidget*)target())->repaint( bound );
 
         return true;
     }
diff --git a/lib/kofficecore/KoContainerHandler.h b/lib/kofficecore/KoContainerHandler.h
index 0ea9ba35..0187128d 100644
--- a/lib/kofficecore/KoContainerHandler.h
+++ b/lib/kofficecore/KoContainerHandler.h
@@ -68,7 +68,7 @@ public:
     ~KoPartResizeHandler();
 
 protected:
-    void tqrepaint(TQRegion &rgn);
+    void repaint(TQRegion &rgn);
     bool eventFilter( TQObject*, TQEvent* );
 
 private:
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index ecbd496f..66828e99 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -296,7 +296,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instan
   fileList.setAutoDelete(false);
 
   do {
-    TQString key = TQString("File%1").tqarg(i);
+    TQString key = TQString("File%1").arg(i);
     value = instance->config()->readPathEntry(key);
 
     if(!value.isEmpty()) {
@@ -369,9 +369,9 @@ void KoRecentDocumentsPane::selectionChanged(TQListViewItem* item)
       KFileItem* fileItem = static_cast<KoFileListItem*>(item)->fileItem();
       TQString details = "<center><table border=\"0\">";
       details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>")
-          .tqarg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
+          .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
       details += i18n("File access date and time. %1 is date time", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>")
-          .tqarg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
+          .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
       details += "</table></center>";
       m_detailsLabel->setText(details);
     } else {
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index ddfce183..fd790991 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -120,7 +120,7 @@ public:
     }
 
     TQPtrList<KoView> m_views;
-    TQPtrList<KoDocumentChild> m_tqchildren;
+    TQPtrList<KoDocumentChild> m_children;
     TQPtrList<KoMainWindow> m_shells;
     TQValueList<TQDomDocument> m_viewBuildDocuments;
 
@@ -271,7 +271,7 @@ KoDocument::~KoDocument()
 {
     d->m_autoSaveTimer.stop();
 
-    TQPtrListIterator<KoDocumentChild> childIt( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> childIt( d->m_children );
     for (; childIt.current(); ++childIt )
         disconnect( childIt.current(), TQT_SIGNAL( destroyed() ),
                     this, TQT_SLOT( slotChildDestroyed() ) );
@@ -285,8 +285,8 @@ KoDocument::~KoDocument()
     delete d->m_startUpWidget;
     d->m_startUpWidget = 0;
 
-    d->m_tqchildren.setAutoDelete( true );
-    d->m_tqchildren.clear();
+    d->m_children.setAutoDelete( true );
+    d->m_children.clear();
 
     d->m_shells.setAutoDelete( true );
     d->m_shells.clear();
@@ -591,7 +591,7 @@ void KoDocument::setManager( KParts::PartManager *manager )
 
     if ( manager )
     {
-        TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+        TQPtrListIterator<KoDocumentChild> it( d->m_children );
         for (; it.current(); ++it )
             if ( it.current()->document() )
                 manager->addPart( it.current()->document(), false );
@@ -606,7 +606,7 @@ void KoDocument::setReadWrite( bool readwrite )
     for (; vIt.current(); ++vIt )
         vIt.current()->updateReadWrite( readwrite );
 
-    TQPtrListIterator<KoDocumentChild> dIt( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> dIt( d->m_children );
     for (; dIt.current(); ++dIt )
         if ( dIt.current()->document() )
             dIt.current()->document()->setReadWrite( readwrite );
@@ -651,7 +651,7 @@ void KoDocument::insertChild( KoDocumentChild *child )
 {
     setModified( true );
 
-    d->m_tqchildren.append( child );
+    d->m_children.append( child );
 
     connect( child, TQT_SIGNAL( changed( KoChild * ) ),
              this, TQT_SLOT( slotChildChanged( KoChild * ) ) );
@@ -681,12 +681,12 @@ void KoDocument::slotChildDestroyed()
     setModified( true );
 
     const KoDocumentChild *child = static_cast<const KoDocumentChild *>( sender() );
-    d->m_tqchildren.removeRef( child );
+    d->m_children.removeRef( child );
 }
 
-const TQPtrList<KoDocumentChild>& KoDocument::tqchildren() const
+const TQPtrList<KoDocumentChild>& KoDocument::children() const
 {
-    return d->m_tqchildren;
+    return d->m_children;
 }
 
 KParts::Part *KoDocument::hitTest( TQWidget *widget, const TQPoint &globalPos )
@@ -718,7 +718,7 @@ KoView* KoDocument::hitTestView()
 KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix )
 {
     // Call KoDocumentChild::hitTest for any child document
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
     {
         KoDocument *doc = it.current()->hitTest( pos, matrix );
@@ -732,7 +732,7 @@ KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix )
 
 KoDocumentChild *KoDocument::child( KoDocument *doc )
 {
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
         if ( it.current()->document() == doc )
             return it.current();
@@ -786,7 +786,7 @@ void KoDocument::paintEverything( TQPainter &painter, const TQRect &rect, bool t
 
 void KoDocument::paintChildren( TQPainter &painter, const TQRect &/*rect*/, KoView *view, double zoomX, double zoomY )
 {
-    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
+    TQPtrListIterator<KoDocumentChild> it( d->m_children );
     for (; it.current(); ++it )
     {
         // #### todo: paint only if child is visible inside rect
@@ -863,8 +863,8 @@ bool KoDocument::isModified() const
         //kdDebug(30003)<<k_funcinfo<<" Modified doc='"<<url().url()<<"' extern="<<isStoredExtern()<<endl;
         return true;
     }
-    // Then go through internally stored tqchildren (considered to be part of this doc)
-    TQPtrListIterator<KoDocumentChild> it = tqchildren();
+    // Then go through internally stored children (considered to be part of this doc)
+    TQPtrListIterator<KoDocumentChild> it = children();
     for (; it.current(); ++it )
     {
         KoDocument *doc = it.current()->document();
@@ -876,9 +876,9 @@ bool KoDocument::isModified() const
 
 bool KoDocument::saveChildren( KoStore* _store )
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
     int i = 0;
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
         KoDocument* childDoc = it.current()->document();
         if (childDoc && !it.current()->isDeleted())
@@ -900,8 +900,8 @@ bool KoDocument::saveChildren( KoStore* _store )
 
 bool KoDocument::saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter )
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for( ; it.current(); ++it ) {
         KoDocument* childDoc = it.current()->document();
         if ( childDoc && !it.current()->isDeleted() )
@@ -924,9 +924,9 @@ bool KoDocument::saveExternalChildren()
         return true;
     }
 
-    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl;
     KoDocumentChild *ch;
-    TQPtrListIterator<KoDocumentChild> it = tqchildren();
+    TQPtrListIterator<KoDocumentChild> it = children();
     for (; (ch = it.current()); ++it )
     {
         if ( !ch->isDeleted() )
@@ -935,7 +935,7 @@ bool KoDocument::saveExternalChildren()
             if ( doc && doc->isStoredExtern() && doc->isModified() )
             {
                 kdDebug(30003)<<" save external doc='"<<url().url()<<"'"<<endl;
-                doc->setDoNotSaveExtDoc(); // Only save doc + it's internal tqchildren
+                doc->setDoNotSaveExtDoc(); // Only save doc + it's internal children
                 if ( !doc->save() )
                     return false; // error
             }
@@ -1031,7 +1031,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "meta.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "meta.xml" );
             delete store;
             return false;
         }
@@ -1039,7 +1039,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         if ( store->open( "Thumbnails/thumbnail.png" ) )
         {
             if ( !saveOasisPreview( store, manifestWriter ) || !store->close() ) {
-                d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" );
+                d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" );
                 delete store;
                 return false;
             }
@@ -1047,7 +1047,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" );
             delete store;
             return false;
         }
@@ -1055,7 +1055,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         // Write out manifest file
         if ( !oasisStore.closeManifestWriter() )
         {
-            d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "META-INF/manifest.xml" );
+            d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "META-INF/manifest.xml" );
             delete store;
             return false;
         }
@@ -1064,7 +1064,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
     }
     else
     {
-        // Save internal tqchildren first since they might get a new url
+        // Save internal children first since they might get a new url
         if ( !saveChildren( store ) && !oasis )
         {
             if ( d->lastErrorMessage.isEmpty() )
@@ -1086,7 +1086,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
         }
         else
         {
-            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "maindoc.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "maindoc.xml" );
             delete store;
             return false;
         }
@@ -1146,7 +1146,7 @@ bool KoDocument::saveToStore( KoStore* _store, const TQString & _path )
     else // ugly hack to pass a relative URI
         m_url = KURL( INTERNAL_PREFIX +  _path );
 
-    // To make the tqchildren happy cd to the correct directory
+    // To make the children happy cd to the correct directory
     _store->pushDirectory();
     _store->enterDirectory( _path );
 
@@ -1297,7 +1297,7 @@ bool KoDocument::checkAutoSaveFile()
         TQString dateStr = date.toString(Qt::LocalDate);
         int res = KMessageBox::warningYesNoCancel(
             0, i18n( "An autosaved file for an unnamed document exists in %1.\nThis file is dated %2\nDo you want to open it?" )
-            .tqarg(asf, dateStr) );
+            .arg(asf, dateStr) );
         switch(res) {
         case KMessageBox::Yes : {
             KURL url;
@@ -1349,7 +1349,7 @@ bool KoDocument::openURL( const KURL & _url )
     // Reimplemented, to add a check for autosave files and to improve error reporting
     if ( !_url.isValid() )
     {
-        d->lastErrorMessage = i18n( "Malformed URL\n%1" ).tqarg( _url.url() ); // ## used anywhere ?
+        d->lastErrorMessage = i18n( "Malformed URL\n%1" ).arg( _url.url() ); // ## used anywhere ?
         return false;
     }
     if ( !closeURL() )
@@ -1408,7 +1408,7 @@ bool KoDocument::openFile()
         TQApplication::restoreOverrideCursor();
         if ( d->m_autoErrorHandlingEnabled )
             // Maybe offer to create a new document with that name ?
-            KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(m_file) );
+            KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(m_file) );
         d->m_bLoading = false;
         return false;
     }
@@ -1516,7 +1516,7 @@ bool KoDocument::openFile()
             {
                 TQString errorMsg( i18n( "Could not open\n%2.\nReason: %1" ) );
                 TQString docUrl = url().prettyURL( 0, KURL::StripFileProtocol );
-                KMessageBox::error( 0L, errorMsg.tqarg(msg).tqarg(docUrl) );
+                KMessageBox::error( 0L, errorMsg.arg(msg).arg(docUrl) );
             }
 
             d->m_bLoading = false;
@@ -1623,7 +1623,7 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom
     if (!store->open(filename))
     {
         kdWarning(30003) << "Entry " << filename << " not found!" << endl;
-        d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( filename );
+        d->lastErrorMessage = i18n( "Could not find %1" ).arg( filename );
         return false;
     }
     // Error variables for TQDomDocument::setContent
@@ -1636,8 +1636,8 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom
             << " In line: " << errorLine << ", column: " << errorColumn << endl
             << " Error message: " << errorMsg << endl;
         d->lastErrorMessage = i18n( "Parsing error in %1 at line %2, column %3\nError message: %4" )
-                              .tqarg( filename ).tqarg( errorLine ).tqarg( errorColumn )
-                              .tqarg( i18n ( "TQXml", errorMsg.utf8() ) );
+                              .arg( filename ).arg( errorLine ).arg( errorColumn )
+                              .arg( i18n ( "TQXml", errorMsg.utf8() ) );
         store->close();
         return false;
     }
@@ -1650,12 +1650,12 @@ bool KoDocument::loadNativeFormat( const TQString & file )
     TQFileInfo fileInfo( file );
     if ( !fileInfo.exists() ) // check duplicated from openURL, but this is useful for templates
     {
-        d->lastErrorMessage = i18n("The file %1 does not exist.").tqarg(file);
+        d->lastErrorMessage = i18n("The file %1 does not exist.").arg(file);
         return false;
     }
     if ( !fileInfo.isFile() )
     {
-        d->lastErrorMessage = i18n( "%1 is not a file." ).tqarg(file);
+        d->lastErrorMessage = i18n( "%1 is not a file." ).arg(file);
         return false;
     }
 
@@ -1733,7 +1733,7 @@ bool KoDocument::loadNativeFormat( const TQString & file )
                             << "  Line: " << errorLine << " Column: " << errorColumn << endl
                             << "  Message: " << errorMsg << endl;
             d->lastErrorMessage = i18n( "parsing error in the main document at line %1, column %2\nError message: %3" )
-                                  .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) );
+                                  .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) );
             res=false;
         }
 
@@ -1756,7 +1756,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file )
 
     if ( store->bad() )
     {
-        d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).tqarg( file );
+        d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).arg( file );
         delete store;
         TQApplication::restoreOverrideCursor();
         return false;
@@ -1795,7 +1795,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file )
 
         if ( !loadChildren( store ) )
         {
-            kdError(30003) << "ERROR: Could not load tqchildren" << endl;
+            kdError(30003) << "ERROR: Could not load children" << endl;
             // Don't abort, proceed nonetheless
         }
 
@@ -1865,7 +1865,7 @@ bool KoDocument::loadFromStore( KoStore* _store, const TQString& url )
 
     if ( !loadChildren( _store ) )
     {
-        kdError(30003) << "ERROR: Could not load tqchildren" << endl;
+        kdError(30003) << "ERROR: Could not load children" << endl;
 #if 0
         return false;
 #endif
@@ -1967,7 +1967,7 @@ void KoDocument::setModified( bool mod )
         m_bEmpty = FALSE;
     } else {
         // When saving this document, all non-external child documents get saved too.
-        TQPtrListIterator<KoDocumentChild> it = tqchildren();
+        TQPtrListIterator<KoDocumentChild> it = children();
         for (; it.current(); ++it )
         {
             KoDocument *doc = it.current()->document();
@@ -2002,7 +2002,7 @@ int KoDocument::queryCloseDia()
         name = i18n( "Untitled" );
 
     int res = KMessageBox::warningYesNoCancel( 0L,
-                    i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name));
+                    i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name));
 
     switch(res)
     {
@@ -2023,9 +2023,9 @@ int KoDocument::queryCloseDia()
 
 int KoDocument::queryCloseExternalChildren()
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking for tqchildren in: "<<url().url()<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking for children in: "<<url().url()<<endl;
     setDoNotSaveExtDoc(false);
-    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+    TQPtrListIterator<KoDocumentChild> it( children() );
     for (; it.current(); ++it )
     {
         if ( !it.current()->isDeleted() )
@@ -2133,12 +2133,12 @@ TQDomDocument KoDocument::createDomDocument( const TQString& tagName, const TQSt
 TQDomDocument KoDocument::createDomDocument( const TQString& appName, const TQString& tagName, const TQString& version )
 {
     TQDomImplementation impl;
-    TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").tqarg(appName).tqarg(version);
+    TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").arg(appName).arg(version);
     TQDomDocumentType dtype = impl.createDocumentType( tagName,
-                                                      TQString("-//KDE//DTD %1 %1//EN").tqarg(appName).tqarg(version),
+                                                      TQString("-//KDE//DTD %1 %1//EN").arg(appName).arg(version),
                                                       url );
     // The namespace URN doesn't need to include the version number.
-    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").tqarg(appName);
+    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").arg(appName);
     TQDomDocument doc = impl.createDocument( namespaceURN, tagName, dtype );
     doc.insertBefore( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ), doc.documentElement() );
     return doc;
@@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance )
         // Try by path first, so that we find the global one (which has the native mimetype)
         // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it.
         // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway.
-        service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").tqarg(instname) );
+        service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").arg(instname) );
     }
     if ( !service )
         service = KService::serviceByDesktopName( instname );
@@ -2364,11 +2364,11 @@ void KoDocument::showSavingErrorDialog()
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not save\n%1" ).tqarg( m_file ) );
+        KMessageBox::error( 0L, i18n( "Could not save\n%1" ).arg( m_file ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).tqarg( m_file, d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).arg( m_file, d->lastErrorMessage ) );
     }
 }
 
@@ -2376,11 +2376,11 @@ void KoDocument::showLoadingErrorDialog()
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
+        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
     }
 }
 
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index ac6de7e8..df1518de 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -385,7 +385,7 @@ public:
      *  @param painter     The painter object onto which will be drawn.
      *  @param rect        The rect that should be used in the painter object.
      *  @param transparent If true then the entire rectangle is erased before painting.
-     *  @param view        The KoView is needed to fiddle about with the active widget, when painting tqchildren.
+     *  @param view        The KoView is needed to fiddle about with the active widget, when painting children.
      *  @param zoomX       The zoom value to be applied to X coordinates when painting.
      *  @param zoomY       The zoom value to be applied to Y coordinates when painting.
      */
@@ -399,7 +399,7 @@ public:
     virtual TQPixmap generatePreview( const TQSize& size );
 
     /**
-     *  Paints all of the documents tqchildren into the given painter object.
+     *  Paints all of the documents children into the given painter object.
      *
      *  @param painter     The painter object onto which will be drawn.
      *  @param rect        The rect that should be used in the painter object.
@@ -427,7 +427,7 @@ public:
 
     /**
      *  Paints the data itself. Normally called by paintEverything(). It does not
-     *  paint the tqchildren.
+     *  paint the children.
      *  It's this method that %KOffice Parts have to implement.
      *
      *  @param painter     The painter object onto which will be drawn.
@@ -659,17 +659,17 @@ public:
     static int defaultAutoSave() { return s_defaultAutoSave; }
 
     /**
-     * @return the list of all tqchildren. Do not modify the
+     * @return the list of all children. Do not modify the
      *         returned list.
      */
-    const TQPtrList<KoDocumentChild>& tqchildren() const;
+    const TQPtrList<KoDocumentChild>& children() const;
 
     /**
      * @return the KoDocumentChild associated with the given Document, but only if
      *         @p doc is a direct child of this document.
      *
      * This is a convenience function. You could get the same result
-     * by traversing the list returned by tqchildren().
+     * by traversing the list returned by children().
      */
     KoDocumentChild *child( KoDocument *doc );
 
@@ -771,14 +771,14 @@ public:
     int queryCloseDia();
 
     /**
-     * @brief Set when we do not want to save external tqchildren when saving our 'main' doc.
+     * @brief Set when we do not want to save external children when saving our 'main' doc.
      *
-     * This makes it possible to save 'main' doc + all its internal tqchildren first, then
-     * go on to save external tqchildren. Typically used by query close.
+     * This makes it possible to save 'main' doc + all its internal children first, then
+     * go on to save external children. Typically used by query close.
      * Use:
      * @code
      *      doc->setDoNotSaveExtDoc();
-     *      doc->save();    // saves doc and its internal tqchildren,
+     *      doc->save();    // saves doc and its internal children,
      *                            //also calls saveExternalChildren() which sets setDoNotSaveExtDoc(false)
      *      doc->saveExternalChildren();
      * @endcode
@@ -1029,7 +1029,7 @@ protected:
      *
      *  An example implementation may look like this:
      *  @code
-     *  TQPtrListIterator<KoDocumentChild> it( tqchildren() );
+     *  TQPtrListIterator<KoDocumentChild> it( children() );
      *  for( ; it.current(); ++it )
      *  {
      *    if ( !it.current()->loadDocument( _store ) )
@@ -1043,16 +1043,16 @@ protected:
     virtual bool loadChildren( KoStore* );
 
     /**
-     *  Saves all internal tqchildren (only!).
-     *  @see saveExternalChildren if you have external tqchildren.
+     *  Saves all internal children (only!).
+     *  @see saveExternalChildren if you have external children.
      *  Returns true on success.
      */
     virtual bool saveChildren( KoStore* store );
 
     /**
-     *  Saves all internal tqchildren (only!), to the store, using the OASIS format.
+     *  Saves all internal children (only!), to the store, using the OASIS format.
      *  This is called automatically during saveNativeFormat.
-     *  @see saveExternalChildren if you have external tqchildren.
+     *  @see saveExternalChildren if you have external children.
      *  Returns true on success.
      */
     virtual bool saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter );
@@ -1077,7 +1077,7 @@ protected:
     virtual bool completeSaving( KoStore* store );
 
     /**
-     * Inserts the new child in the list of tqchildren and emits the
+     * Inserts the new child in the list of children and emits the
      * childChanged() signal.
      *
      * At the same time this method marks this document as modified.
@@ -1098,9 +1098,9 @@ protected:
     KoPageLayout m_pageLayout;
 
     /**
-     *  Saves all externally stored tqchildren.
+     *  Saves all externally stored children.
      *  Returns true on success.
-     * @see #saveChildren for internal tqchildren
+     * @see #saveChildren for internal children
      */
     virtual bool saveExternalChildren();
 
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 0767ab04..8c6fe16f 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -67,13 +67,13 @@ public:
   bool m_deleted;
 };
 
-KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry )
+KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry )
     : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
   d->m_parent = parent;
   d->m_doc = doc;
-  setGeometry( tqgeometry );
+  setGeometry( geometry );
   d->m_deleted = false;
   if ( doc )
     doc->setStoreInternal( !doc->hasExternURL() );
@@ -88,11 +88,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* parent )
   d->m_deleted = false;
 }
 
-void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
+void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry )
 {
   kdDebug()<<k_funcinfo<<"doc: "<<doc->url().url()<<endl;
   d->m_doc = doc;
-  setGeometry( tqgeometry );
+  setGeometry( geometry );
 
   updateMatrix();
 }
@@ -213,7 +213,7 @@ bool KoDocumentChild::loadDocument( KoStore* store )
             KMimeType::Ptr mime = KMimeType::mimeType( m_tmpMimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
         }
         return res;
     }
@@ -252,7 +252,7 @@ bool KoDocumentChild::loadOasisDocument( KoStore* store, const TQDomDocument& ma
             KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
         }
         return res;
     }
@@ -306,7 +306,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 TQApplication::restoreOverrideCursor();
                 // For security reasons we need to ask confirmation if the url is remote
                 int result = KMessageBox::warningYesNoCancel(
-                    0, i18n( "This document contains an external link to a remote document\n%1").tqarg(m_tmpURL),
+                    0, i18n( "This document contains an external link to a remote document\n%1").arg(m_tmpURL),
                     i18n( "Confirmation Required" ), i18n( "Download" ), i18n( "Skip" ) );
 
                 if ( result == KMessageBox::Cancel )
@@ -335,9 +335,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 d->m_doc->setProperty( "realURL", tmpURL ); // so that it gets saved correctly
                 d->m_doc->setStoreInternal( true );
                 if ( internalURL )
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).tqarg( errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).arg( errorMessage ) );
                 else
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).tqarg( tmpURL, errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).arg( tmpURL, errorMessage ) );
             }
             return res;
         }
@@ -409,7 +409,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
         }
         else
         {
-            // To make the tqchildren happy cd to the correct directory
+            // To make the children happy cd to the correct directory
             store->pushDirectory();
             store->enterDirectory( name );
 
@@ -480,10 +480,10 @@ TQDomElement KoDocumentChild::save( TQDomDocument& doc, bool uppercase )
         e.setAttribute( "mime", d->m_doc->nativeFormatMimeType().data() );
         kdDebug() << "KoDocumentChild::save mime=" << d->m_doc->nativeFormatMimeType() << endl;
         TQDomElement rect = doc.createElement( ( uppercase ? "RECT" : "rect" ) );
-        rect.setAttribute( "x", tqgeometry().left() );
-        rect.setAttribute( "y", tqgeometry().top() );
-        rect.setAttribute( "w", tqgeometry().width() );
-        rect.setAttribute( "h", tqgeometry().height() );
+        rect.setAttribute( "x", geometry().left() );
+        rect.setAttribute( "y", geometry().top() );
+        rect.setAttribute( "w", geometry().width() );
+        rect.setAttribute( "h", geometry().height() );
         e.appendChild(rect);
         return e;
     }
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index de3704c0..50029cee 100644
--- a/lib/kofficecore/KoDocumentChild.h
+++ b/lib/kofficecore/KoDocumentChild.h
@@ -45,7 +45,7 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild
   Q_OBJECT
   TQ_OBJECT
 public:
-  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry );
+  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry );
 
   /**
    * When using this constructor you must call @ref #setDocument before
@@ -59,7 +59,7 @@ public:
    * Call this function only directly after calling the constructor
    * that takes only a parent as argument.
    */
-  virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
+  virtual void setDocument( KoDocument *doc, const TQRect &geometry );
 
   /**
    * @return document contained in this child
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 0b54ebbb..1c9400c6 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -122,7 +122,7 @@ bool KoDocumentInfo::saveOasis( KoStore* store )
     xmlWriter->startElement( "office:meta" );
 
     xmlWriter->startElement( "meta:generator");
-    xmlWriter->addTextNode( TQString( "KOffice/%1" ).tqarg( KOFFICE_VERSION_STRING ) );
+    xmlWriter->addTextNode( TQString( "KOffice/%1" ).arg( KOFFICE_VERSION_STRING ) );
     xmlWriter->endElement();
     TQStringList lst = pages();
     TQStringList::ConstIterator it = lst.begin();
@@ -232,7 +232,7 @@ void KoDocumentInfoAuthor::initParameters()
   m_emailCfg = new KConfig( "emaildefaults", true );
   m_emailCfg->setGroup( "Defaults" );
   TQString group = m_emailCfg->readEntry("Profile","Default");
-  m_emailCfg->setGroup(TQString("PROFILE_%1").tqarg(group));
+  m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group));
 
   if ( m_fullName.isNull() ) // only if null. Empty means the user made it explicitly empty.
   {
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 2a7bd315..1c3a7fcb 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -90,9 +90,9 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter,
     int idx = 1; // 0 is the native format
 
     if ( addUncompressed )
-        filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").tqarg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").arg( type->comment() ), idx++ );
     if ( addFlatXML )
-        filterWidget->changeItem( i18n("%1 (Flat XML File)").tqarg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Flat XML File)").arg( type->comment() ), idx++ );
     // if you add an entry here, update numSpecialEntries above and specialEntrySelected() below
 
     // For native format...
@@ -109,7 +109,7 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter,
         KMimeType::Ptr mime = KMimeType::mimeType (*mimeFilterIt);
         TQString compatString = mime->property ("X-KDE-CompatibleApplication").toString ();
         if (!compatString.isEmpty ())
-            filterWidget->changeItem (i18n ("%1 (%2 Compatible)").tqarg (mime->comment ()).tqarg (compatString), i);
+            filterWidget->changeItem (i18n ("%1 (%2 Compatible)").arg (mime->comment ()).arg (compatString), i);
     }
 }
 
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index e4284e57..1e5beb47 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -54,7 +54,7 @@ TQString KoEmbeddingFilter::mimeTypeByExtension( const TQString& extension )
     // We need to resort to an ugly hack to determine the mimetype
     // from the extension, as kservicetypefactory.h isn't installed
     KURL url;
-    url.setPath( TQString( "dummy.%1" ).tqarg( extension ) );
+    url.setPath( TQString( "dummy.%1" ).arg( extension ) );
     KMimeType::Ptr m( KMimeType::findByURL( url, 0, true, true ) );
     return m->name();
 }
diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h
index dc8c2947..cafad774 100644
--- a/lib/kofficecore/KoFilter.h
+++ b/lib/kofficecore/KoFilter.h
@@ -262,7 +262,7 @@ private:
 
     /**
      * This struct keeps track of the last used index for a
-     * child part and all references to existing tqchildren
+     * child part and all references to existing children
      * We use it to build a whole stack, one PartState per
      * embedding level.
      * @internal
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index 37ff5d95..62d93aa5 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -568,7 +568,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name )
         return storageCleanupHelper( &m_outputStorage );
     }
 
-    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).tqarg( lruPartIndex ) ) )
+    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).arg( lruPartIndex ) ) )
         return storageCleanupHelper( &m_outputStorage );
 
     return storageCreateFirstStream( name, &m_outputStorage, &m_outputStorageDevice );
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index e7ee131c..bcd56f75 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -583,7 +583,7 @@ bool KoFilterManager::filterAvailable( KoFilterEntry::Ptr entry )
 
 void KoFilterManager::importErrorHelper( const TQString& mimeType, const bool suppressDialog )
 {
-    TQString tmp = i18n("Could not import file of type\n%1").tqarg( mimeType );
+    TQString tmp = i18n("Could not import file of type\n%1").arg( mimeType );
     // ###### FIXME: use KLibLoader::lastErrorMessage() here
     if (!suppressDialog) KMessageBox::error( 0L, tmp, i18n("Missing Import Filter") );
 }
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index 4909e1e0..f9b3930e 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -254,7 +254,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
       TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
 		    p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
-      // The other modes change the tqgeometry so they call resizeEvent.
+      // The other modes change the geometry so they call resizeEvent.
       // This one doesn't, so it has to emit geometryChangedby itself.
       emit geometryChanged();
       //kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl;
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 4428d524..248d3ed3 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -505,13 +505,13 @@ void KoMainWindow::updateCaption()
       }
       const TQString url = rootDocument()->url().prettyURL( 0, KURL::StripFileProtocol );
       if ( !caption.isEmpty() && !url.isEmpty() )
-          caption = TQString( "%1 - %2" ).tqarg( caption ).tqarg( url );
+          caption = TQString( "%1 - %2" ).arg( caption ).arg( url );
       else if ( caption.isEmpty() )
           caption = url;
 
       setCaption( caption, rootDocument()->isModified() );
       if ( !rootDocument()->url().fileName(false).isEmpty() )
-        d->m_paSave->setToolTip( i18n("Save as %1").tqarg(rootDocument()->url().fileName(false)) );
+        d->m_paSave->setToolTip( i18n("Save as %1").arg(rootDocument()->url().fileName(false)) );
       else
         d->m_paSave->setToolTip( i18n("Save") );
   }
@@ -544,7 +544,7 @@ bool KoMainWindow::openDocument( const KURL & url )
 {
     if ( !KIO::NetAccess::exists(url,true,0) )
     {
-        KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(url.url()) );
+        KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) );
         m_recent->removeURL(url); //remove the file from the recent-opened-file-list
         saveRecentFiles();
         return false;
@@ -677,7 +677,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
 
     const bool neverHeardOfIt = ( mime->name() == KMimeType::defaultMimeType() );
     TQString comment = neverHeardOfIt ?
-                      i18n( "%1 (unknown file type)" ).tqarg( outputFormat.data() )
+                      i18n( "%1 (unknown file type)" ).arg( outputFormat.data() )
                       : mime->comment();
 
     // Warn the user
@@ -689,7 +689,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
                   this,
                   i18n( "<qt>Saving as a %1 may result in some loss of formatting."
                         "<p>Do you still want to save in this format?</qt>" )
-                  .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later
+                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Save" ),
                   KStdGuiItem::save (),
                   "NonNativeSaveConfirmation",
@@ -703,7 +703,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat )
                   this,
                   i18n( "<qt>Exporting as a %1 may result in some loss of formatting."
                         "<p>Do you still want to export to this format?</qt>" )
-                  .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later
+                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
                   i18n( "Confirm Export" ),
                   i18n ("Export"),
                   "NonNativeExportConfirmation", // different to the one used for Save (above)
@@ -1039,7 +1039,7 @@ bool KoMainWindow::queryClose()
             name = i18n( "Untitled" );
 
         int res = KMessageBox::warningYesNoCancel( this,
-                        i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name),
+                        i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name),
                         TQString(),
                         KStdGuiItem::save(),
                         KStdGuiItem::discard());
@@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) {
     if ( title.isEmpty() ) {
         // #139905 - breaks message freeze though
         //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName();
-        //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
+        //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
     }
     printer.setDocName( title );
     printer.setDocFileName( fileName );
@@ -1529,9 +1529,9 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart )
       if ( it.current()->inherits("KToolBar") )
       {
           KToolBar * tb = static_cast<KToolBar *>(it.current());
-          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").tqarg( tb->text() ), 0,
+          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0,
                                                actionCollection(), tb->name() );
-	  act->setCheckedState(i18n("Hide %1 Toolbar").tqarg( tb->text() ));
+	  act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() ));
 	  connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) );
           act->setChecked ( !tb->isHidden() );
           d->m_toolbarList.append( act );
@@ -1618,7 +1618,7 @@ void KoMainWindow::slotEmailFile()
     else
     {
         fileURL = rootDocument()->url().url();
-        theSubject = i18n("Document - %1").tqarg(rootDocument()->url().fileName(false));
+        theSubject = i18n("Document - %1").arg(rootDocument()->url().fileName(false));
         urls.append( fileURL );
     }
 
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index ea99ce8a..fa1642e7 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -145,7 +145,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T
     if (!m_store->open(fileName))
     {
         kdWarning(30003) << "Entry " << fileName << " not found!" << endl;
-        errorMessage = i18n( "Could not find %1" ).tqarg( fileName );
+        errorMessage = i18n( "Could not find %1" ).arg( fileName );
         return false;
     }
     // Error variables for TQDomDocument::setContent
@@ -168,7 +168,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T
                        << " In line: " << errorLine << ", column: " << errorColumn << endl
                        << " Error message: " << errorMsg << endl;
         errorMessage = i18n( "Parsing error in the main document at line %1, column %2\nError message: %3" )
-                       .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ) );
+                       .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ) );
     }
     else
     {
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index 236b08d7..87547bdf 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -244,7 +244,7 @@ void KoPictureEps::draw(TQPainter& painter, int x, int y, int width, int height,
     TQPaintDeviceMetrics metrics (painter.device());
     kdDebug(30003) << "Metrics: X: " << metrics.logicalDpiX() << " x Y: " << metrics.logicalDpiX() << " (in KoPictureEps::draw)" << endl;
 
-    if ( painter.tqdevice()->isExtDev() ) // Is it an external device (i.e. printer)
+    if ( painter.device()->isExtDev() ) // Is it an external device (i.e. printer)
     {
         kdDebug(30003) << "Drawing for a printer (in KoPictureEps::draw)" << endl;
         // For printing, always re-sample the image, as a printer has never the same resolution than a display.
diff --git a/lib/kofficecore/KoPictureImage.cpp b/lib/kofficecore/KoPictureImage.cpp
index c0775ac7..b0b28ff3 100644
--- a/lib/kofficecore/KoPictureImage.cpp
+++ b/lib/kofficecore/KoPictureImage.cpp
@@ -95,7 +95,7 @@ void KoPictureImage::draw(TQPainter& painter, int x, int y, int width, int heigh
     if ( !width || !height )
         return;
     TQSize origSize = getOriginalSize();
-    const bool scaleImage = painter.tqdevice()->isExtDev() // we are printing
+    const bool scaleImage = painter.device()->isExtDev() // we are printing
         && ((width <= origSize.width()) || (height <= origSize.height()));
     if( scaleImage )
     {
diff --git a/lib/kofficecore/KoPictureKey.cpp b/lib/kofficecore/KoPictureKey.cpp
index 32d73336..ea2869a9 100644
--- a/lib/kofficecore/KoPictureKey.cpp
+++ b/lib/kofficecore/KoPictureKey.cpp
@@ -140,7 +140,7 @@ TQString KoPictureKey::toString() const
 {
     // We do not use the default TQDateTime::toString has it does not show microseconds
     return TQString::fromLatin1( "%1 %2" )
-        .tqarg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") );
+        .arg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") );
 }
 
 void KoPictureKey::setKeyFromFile (const TQString& filename)
diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp
index cc9ab920..84a1be4b 100644
--- a/lib/kofficecore/KoQueryTrader.cpp
+++ b/lib/kofficecore/KoQueryTrader.cpp
@@ -76,14 +76,14 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c
 
 KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype )
 {
-  TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype );
+  TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).arg( mimetype ).arg( mimetype );
 
   TQValueList<KoDocumentEntry> vec = query( false,constr );
   if ( vec.isEmpty() )
   {
     kdWarning(30003) << "Got no results with " << constr << endl;
     // Fallback to the old way (which was probably wrong, but better be safe)
-    TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype );
+    TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).arg( mimetype );
     vec = query( constr );
     if ( vec.isEmpty() )
     {
diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index 98c3ef72..d65fab44 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -80,9 +80,9 @@ public:
     void addDir(const TQString &dir) { m_dirs.append(dir); m_touched=true; }
     int sortingWeight() const { return m_sortingWeight; }
     void setSortingWeight(int weight) { m_sortingWeight = weight; }
-    /// If all tqchildren are hidden, we are hidden too
+    /// If all children are hidden, we are hidden too
     bool isHidden() const;
-    /// if we should hide, we hide all the tqchildren
+    /// if we should hide, we hide all the children
     void setHidden(bool hidden=true) const;
 
     KoTemplate *first() { return m_templates.first(); }
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 7dc1f0b0..259c498e 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -42,7 +42,7 @@ public:
   {
     m_inOperation = false;
     m_zoom = 1.0;
-    m_tqchildren.setAutoDelete( true );
+    m_children.setAutoDelete( true );
     m_manager = 0L;
     m_tempActiveWidget = 0L;
     m_dcopObject = 0;
@@ -56,7 +56,7 @@ public:
   TQGuardedPtr<KoDocument> m_doc; // our KoDocument
   TQGuardedPtr<KParts::PartManager> m_manager;
   double m_zoom;
-  TQPtrList<KoViewChild> m_tqchildren;
+  TQPtrList<KoViewChild> m_children;
   TQWidget *m_tempActiveWidget;
   KoViewIface *m_dcopObject;
   bool m_registered;  // are we registered at the part manager?
@@ -339,7 +339,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
       if ( child->isRectangle() && !child->isTransparent() )
       {
         KoViewChild *viewChild = new KoViewChild( child, this );
-        d->m_tqchildren.append( viewChild );
+        d->m_children.append( viewChild );
 
         TQApplication::setOverrideCursor(waitCursor);
         // This is the long operation (due to toolbar tqlayout stuff)
@@ -484,7 +484,7 @@ void KoView::paintEverything( TQPainter &painter, const TQRect &rect, bool trans
 
 KoViewChild *KoView::child( KoView *view )
 {
-  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
+  TQPtrListIterator<KoViewChild> it( d->m_children );
   for (; it.current(); ++it )
     if ( it.current()->frame()->view() == view )
       return it.current();
@@ -494,7 +494,7 @@ KoViewChild *KoView::child( KoView *view )
 
 KoViewChild *KoView::child( KoDocument *doc )
 {
-  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
+  TQPtrListIterator<KoViewChild> it( d->m_children );
   for (; it.current(); ++it )
     if ( it.current()->documentChild()->document() == doc )
       return it.current();
@@ -554,7 +554,7 @@ void KoView::slotChildActivated( bool a )
     docChild->document()->setViewBuildDocument( chFrame->view(), chFrame->view()->xmlguiBuildDocument() );
   }
 
-  d->m_tqchildren.remove( ch );
+  d->m_children.remove( ch );
 
   d->m_manager->addPart( docChild->document(), false ); // the destruction of the view removed the part from the partmanager. re-add it :)
 
@@ -741,11 +741,11 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
 
   /*
    KoViewChild has basically three geometries to keep in sync.
-   - The KoDocumentChild tqgeometry (i.e. the embedded object's tqgeometry, unzoomed)
-   - Its own tqgeometry (used for hit-test etc.)
-   - The KoFrame tqgeometry (the graphical widget for moving the object when active)
+   - The KoDocumentChild geometry (i.e. the embedded object's geometry, unzoomed)
+   - Its own geometry (used for hit-test etc.)
+   - The KoFrame geometry (the graphical widget for moving the object when active)
 
-   So we need to subtract the scrollview's offset for the frame tqgeometry, since it's a widget.
+   So we need to subtract the scrollview's offset for the frame geometry, since it's a widget.
 
    The rules are
    (R1) frameGeometry = viewGeometry(childGeometry) "+" m_frame->{left|right|top|bottom}Border() - scrollview offset,
@@ -779,8 +779,8 @@ KoViewChild::~KoViewChild()
 
 void KoViewChild::slotFrameGeometryChanged()
 {
-  // Set our tqgeometry from the frame tqgeometry (R2 reversed)
-  TQRect geom = m_frame->tqgeometry();
+  // Set our geometry from the frame geometry (R2 reversed)
+  TQRect geom = m_frame->geometry();
   int b = m_frame->border();
   TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(),
                     geom.y() + b + parentView()->canvasYOffset(),
@@ -790,7 +790,7 @@ void KoViewChild::slotFrameGeometryChanged()
 
   if(m_child)
   {
-    // Set the child tqgeometry from the frame tqgeometry (R1 reversed)
+    // Set the child geometry from the frame geometry (R1 reversed)
     TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(),
                           geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(),
                           geom.width() - m_frame->leftBorder() - m_frame->rightBorder(),
@@ -799,8 +799,8 @@ void KoViewChild::slotFrameGeometryChanged()
     // We don't want to trigger slotDocGeometryChanged again
     lock();
     TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect );
-    kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry "
-              << ( tqgeometry() == childGeom ? "already " : "set to " )
+    kdDebug() << "KoChild::slotFrameGeometryChanged child geometry "
+              << ( geometry() == childGeom ? "already " : "set to " )
               << childGeom << endl;
     m_child->setGeometry( childGeom );
     unlock();
@@ -811,15 +811,15 @@ void KoViewChild::slotDocGeometryChanged()
 {
   if ( locked() )
       return;
-  // Set frame tqgeometry from child tqgeometry (R1)
+  // Set frame geometry from child geometry (R1)
   // The frame's resizeEvent will call slotFrameGeometryChanged.
-  TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() );
+  TQRect geom = parentView()->applyViewTransformations( m_child->geometry() );
   TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(),
                     geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(),
                     geom.width() + m_frame->leftBorder() + m_frame->rightBorder(),
                     geom.height() + m_frame->topBorder() + m_frame->bottomBorder() );
-  kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry "
-            << ( m_frame->tqgeometry() == borderRect ? "already " : "set to " )
+  kdDebug() << "KoViewChild::slotDocGeometryChanged frame geometry "
+            << ( m_frame->geometry() == borderRect ? "already " : "set to " )
             << borderRect << endl;
 
   m_frame->setGeometry( borderRect );
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 3b2d3efb..16a08f0c 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData()
   fastLoading = false;
 
   // assume true, it will be set to false by XML parser when this node
-  // apparently has tqchildren AND the tqchildren are not loaded
+  // apparently has children AND the children are not loaded
   loaded = true;
 }
 
@@ -534,7 +534,7 @@ void KoXmlNodeData::loadChildren( int depth )
     !doc->xmlReader->feature( "http://xml.org/sax/features/namespace-prefixes" );
 
 
-  // XML snippet for the tqchildren, including this element
+  // XML snippet for the children, including this element
   TQString snippet = doc->buffer.mid( startPos, endPos-startPos+1 );
 
   // now parse all subnodes
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index fc936fdc..f0121aa9 100644
--- a/lib/kofficecore/THOUGHTS
+++ b/lib/kofficecore/THOUGHTS
@@ -30,7 +30,7 @@ solve zooming and "scrolling" problems.
 One ugly problem also is what we will do about performance problems on
 repainting a part. Some time ago we got a mail on KOffice where some guy
 asked what to do about making that embedded painting faster. The reason is
-that we *always* tqrepaint the whole area, no matter what. This can easily be
+that we *always* repaint the whole area, no matter what. This can easily be
 optimized to a WNorthWestGravity like behavior, because you can't edit those
 embedded parts anyway, so even kchart and other non-WNG apps support that.
 ( we have to translate the painter, of course).
@@ -44,7 +44,7 @@ whether they are the root views (not embedded), or they are
 *active* embedded views. There only has to be a KoView object.
  
 There is *one* zoom factor for both axes (x/y) and the whole
-content (text, objects, tqchildren,...) is zoomed accordingly.
+content (text, objects, children,...) is zoomed accordingly.
  
 This kind of zooming is like the zoom support you know from
 other applications.
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 763bd792..a9a1cb2a 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -77,7 +77,7 @@ class KPanelKbdSizerIcon : public TQCursor
 
         void setShape(int shayp)
         {
-            if (shayp != tqshape()) {
+            if (shayp != shape()) {
                 // Must restore and override to get the icon to refresh.
                 if (isActive) kapp->restoreOverrideCursor();
                 TQCursor::setShape((Qt::CursorShape)shayp);
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 2dc1c6f4..4a838726 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -82,7 +82,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -177,7 +177,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index baead627..7ce1ed77 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -52,7 +52,7 @@ int main( int /*argc*/, char ** /*argv*/ )
             if ( !key.isEmpty() ) {
                 output += "    \"";
                 output += key.latin1();
-                output += "\" [tqshape=box, style=filled, fillcolor=lightblue];\n";
+                output += "\" [shape=box, style=filled, fillcolor=lightblue];\n";
                 if ( vertices.find( key ) == vertices.end() )
                     vertices.append( key );
             }
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index 5056e416..512dec71 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -639,7 +639,7 @@ void testDocument()
   CHECK( doc.previousSibling().isNull(), true );
   CHECK( doc.nextSibling().isNull(), true );
 
-  // make sure its tqchildren are fine
+  // make sure its children are fine
   KoXmlElement rootElement;
   rootElement = doc.firstChild().toElement();
   CHECK( rootElement.isNull(), false );
@@ -1887,7 +1887,7 @@ void testLargeOpenDocumentSpreadsheet()
   xmlstream << "<office:spreadsheet>";
   for( int i = 0; i < sheetCount; i++ )
   {
-    TQString sheetName = TQString("Sheet%1").tqarg(i+1);
+    TQString sheetName = TQString("Sheet%1").arg(i+1);
     xmlstream << "<table:table table:name=\"" << sheetName;
     xmlstream << "\" table:print=\"false\">";
     for( int j = 0; j < rowCount; j++ )
@@ -1981,7 +1981,7 @@ void testLargeOpenDocumentSpreadsheet()
   tableElement = spreadsheetElement.firstChild().toElement();
   for( int table=0; table < sheetCount; table++ )
   {
-    TQString tableName = TQString("Sheet%1").tqarg(table+1);
+    TQString tableName = TQString("Sheet%1").arg(table+1);
     CHECK( tableElement.isNull(), false );
     CHECK( tableElement.isElement(), true );
     CHECK( tableElement.localName(), TQString("table") );
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 9f071db9..2b5824ed 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -188,7 +188,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
         m_first=false;
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         if((m_redo != 0) && m_redo->isEnabled()) {
             m_redo->setEnabled(false);
@@ -203,7 +203,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
         d->m_present=command;
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         if (m_redo != 0) {
             m_redo->setEnabled(false);
@@ -229,7 +229,7 @@ void KoCommandHistory::undo() {
 
     if (m_redo != 0) {
         m_redo->setEnabled(true);
-        m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name()));
+        m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name()));
     }
     int index;
     if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) {
@@ -238,7 +238,7 @@ void KoCommandHistory::undo() {
         emit commandExecuted(commandUndone);
         if (m_undo != 0) {
             m_undo->setEnabled(true);
-            m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
         }
         --index;
         if(index==d->m_savedAt)
@@ -282,13 +282,13 @@ void KoCommandHistory::redo() {
 
     if (m_undo != 0) {
         m_undo->setEnabled(true);
-        m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
+        m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
     }
 
     if(m_commands.next()!=0) {
         if (m_redo != 0) {
             m_redo->setEnabled(true);
-            m_redo->setText(i18n("&Redo: %1").tqarg(m_commands.current()->name()));
+            m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name()));
         }
     }
     else {
@@ -365,7 +365,7 @@ void KoCommandHistory::slotUndoAboutToShow()
     if (m_commands.findRef(d->m_present)!=-1)
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
-            lst.append(i18n("Undo: %1").tqarg(m_commands.current()->name()));
+            lst.append(i18n("Undo: %1").arg(m_commands.current()->name()));
             m_commands.prev();
         }
     d->m_undoListBox->insertStringList( lst );
@@ -411,12 +411,12 @@ void KoCommandHistory::slotRedoAboutToShow()
     if (m_first)
     {
         d->m_present = m_commands.first();
-        lst.append(i18n("Redo: %1").tqarg(d->m_present->name()));
+        lst.append(i18n("Redo: %1").arg(d->m_present->name()));
     }
     if (m_commands.findRef(d->m_present)!=-1 && m_commands.next())
         while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
         {
-            lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name()));
+            lst.append(i18n("Redo: %1").arg(m_commands.current()->name()));
             m_commands.next();
         }
     d->m_redoListBox->insertStringList( lst );
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index c11e6745..870fddc6 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -754,7 +754,7 @@ void KoGuides::slotRemove()
 
 void KoGuides::paint()
 {
-    m_view->canvas()->tqrepaint( false );
+    m_view->canvas()->repaint( false );
 }
 
 
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index 7a28962f..c1f66138 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -173,7 +173,7 @@ public:
     void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff );
 
     /**
-     * @brief tqrepaint guides if any changed snapping status
+     * @brief repaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
@@ -182,7 +182,7 @@ public:
     void repaintSnapping( const KoRect &snappedRect );
 
     /**
-     * @brief tqrepaint guides if any changed snapping status
+     * @brief repaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
@@ -191,7 +191,7 @@ public:
     void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus );
 
     /**
-     * @brief tqrepaint guides so none is snapped
+     * @brief repaint guides so none is snapped
      *
      * This issues a paint request if any guides have changed snapping status.
      * It also effectively un-snaps all since it doesn't take an argument 
@@ -253,9 +253,9 @@ signals:
     /**
      * @brief This signal is emitted when guides start/stop painting.
      *
-     * With this signal it is possible to only tqrepaint the guides in the paint 
+     * With this signal it is possible to only repaint the guides in the paint 
      * method of the canvas. Just set/unset a flag when this signal is emmited.
-     * This signal is emitted before and after a tqrepaint is done.
+     * This signal is emitted before and after a repaint is done.
      *
      * @param state true when starting painting guides, false when stopping.
      */
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 0b410bf1..5cffc108 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -84,14 +84,14 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
     m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
 
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*=================== set tqlayout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    tqrepaint( true );
+    repaint( true );
 }
 
 /*======================== draw contents =========================*/
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 111ba21b..54be2b3f 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -61,7 +61,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index a7ffe145..a249084f 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -661,7 +661,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
     TQPainter painter;
     TQPixmap pm( size() );
     pm.fill( colorGroup().background() );
-    painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
+    painter.begin( TQT_TQPAINTDEVICE(&pm), this );
 
     painter.setPen( colorGroup().dark() );
     painter.drawLine( 0, 0, width(), 0 );
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index ed891e89..19d93764 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -94,7 +94,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e )
 	    else if ( flags & TAB_RIGHT ) currType = TAB_RIGHT;
 	} break;
 	}
-	tqrepaint( true );
+	repaint( true );
     } break;
     case Qt::RightButton: {
 	TQPoint pnt( TQCursor::pos() );
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index 31ad0f85..fb9a0591 100644
--- a/lib/kofficeui/KoTabChooser.h
+++ b/lib/kofficeui/KoTabChooser.h
@@ -71,10 +71,10 @@ protected:
     KoTabChooserPrivate *d;
 
 protected slots:
-    void rbLeft() { currType = TAB_LEFT; tqrepaint( true ); }
-    void rbCenter() { currType = TAB_CENTER; tqrepaint( true ); }
-    void rbRight() { currType = TAB_RIGHT; tqrepaint( true ); }
-    void rbDecPoint() { currType = TAB_DEC_PNT; tqrepaint( true ); }
+    void rbLeft() { currType = TAB_LEFT; repaint( true ); }
+    void rbCenter() { currType = TAB_CENTER; repaint( true ); }
+    void rbRight() { currType = TAB_RIGHT; repaint( true ); }
+    void rbDecPoint() { currType = TAB_DEC_PNT; repaint( true ); }
 
 };
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 880c447b..0311049e 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -84,7 +84,7 @@ class MyFileDialog : public KFileDialog
                 ok = TQFile::exists( url.path() );
                 if ( !ok ) {
                     // Maybe offer to create a new document with that name? (see alos KoDocument::openFile)
-                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
                 }
             }
             return ok;
@@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
         int i = 0;
         TQString value;
         do {
-                TQString key=TQString( "File%1" ).tqarg( i );
+                TQString key=TQString( "File%1" ).arg( i );
                 value=d->m_instance->config()->readPathEntry( key );
                 if ( !value.isEmpty() ) {
                     // Support for tdelibs-3.5's new RecentFiles format: name[url]
@@ -478,7 +478,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     currentChanged(itemtoselect);
 
     // setup the checkbox
-    TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName);
+    TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
 
     d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
     tqlayout->addWidget(d->m_nodiag, 2, 0);
@@ -706,7 +706,7 @@ bool KoTemplateChooseDia::collectInfo()
 		KURL url = item->url();
 		if(url.isLocalFile() && !TQFile::exists(url.path()))
 		{
-			KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+			KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
 			return false;
 		}
 		d->m_fullTemplateName = url.url();
@@ -793,7 +793,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
     // and another one for deciding what's the text of the tooltip...
     const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo();
     TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol );
-    toolTip = new TQLabel( TQString::fromLatin1(" %1 ").tqarg(toolTipText), 0,
+    toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(toolTipText), 0,
                           "myToolTip",
                           WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
     toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 6243b9dc..4e8c4d0c 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -171,7 +171,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
 
     d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget );
     d->m_defaultTemplate->setChecked( true );
-    TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").tqarg(instance->aboutData()->programName() ) );
+    TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").arg(instance->aboutData()->programName() ) );
     rightbox->addWidget( d->m_defaultTemplate );
 
     enableButtonOK(false);
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 764ce4c1..7b31d847 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -104,7 +104,7 @@ public:
     TQWidget* getNextParent();
 
 private:
-    TQPtrList<TQWidget>  m_tqchildren;
+    TQPtrList<TQWidget>  m_children;
     TQBoxLayout        *m_layout;
 
     TQWidget           *m_leftRow;
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 3ac7cb45..bc5affeb 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -136,7 +136,7 @@ void KoColorPanel::insertDefaultColors()
         return;
     m_defaultsAdded = true;
 
-    int currentRow = m_nextPosition.y; // we have to tqrepaint this row below
+    int currentRow = m_nextPosition.y; // we have to repaint this row below
 
     // Note: No checking for duplicates, so take care when you modify that list
     insertColor(TQColor( 255 ,     0 ,     0 ), i18n( "color", "Red" ), false);
@@ -294,9 +294,9 @@ void KoColorPanel::insertDefaultColors()
     insertColor(TQColor(   0 ,     0 ,   205 ), i18n( "color", "MediumBlue" ), false);
     insertColor(TQColor(   0 ,     0 ,   128 ), i18n( "color", "Navy" ), false);
 
-    finalizeInsertion( m_nextPosition );  // with a no-op paint() call as we tqrepaint anyway
+    finalizeInsertion( m_nextPosition );  // with a no-op paint() call as we repaint anyway
     updateGeometry();
-    // we have to tqrepaint the "old" current row explicitly due
+    // we have to repaint the "old" current row explicitly due
     // to WStaticContents
     update( 0, currentRow << 4, COLS << 4, 16 );
 }
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 89d9dbc8..14b92ec6 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 7f9e4139..df1bac4d 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -69,10 +69,10 @@ void KoZoomAction::setZoom( const TQString& text )
   // update items with new sorted zoom values
   TQStringList values;
   for (TQValueList<int>::Iterator it = list.begin(); it != list.end(); ++it )
-    values.append( i18n("%1%").tqarg(*it) );
+    values.append( i18n("%1%").arg(*it) );
   setItems( values );
   
-  TQString zoomStr = i18n("%1%").tqarg( zoom );
+  TQString zoomStr = i18n("%1%").arg( zoom );
   setCurrentItem( values.findIndex( zoomStr ) );
 }
 
@@ -92,21 +92,21 @@ void KoZoomAction::init()
   setEditable( true );
     
   TQStringList values;
-  values << i18n("%1%").tqarg("33");
-  values << i18n("%1%").tqarg("50");
-  values << i18n("%1%").tqarg("75");
-  values << i18n("%1%").tqarg("100");
-  values << i18n("%1%").tqarg("125");
-  values << i18n("%1%").tqarg("150");
-  values << i18n("%1%").tqarg("200");
-  values << i18n("%1%").tqarg("250");
-  values << i18n("%1%").tqarg("350");
-  values << i18n("%1%").tqarg("400");
-  values << i18n("%1%").tqarg("450");
-  values << i18n("%1%").tqarg("500");
+  values << i18n("%1%").arg("33");
+  values << i18n("%1%").arg("50");
+  values << i18n("%1%").arg("75");
+  values << i18n("%1%").arg("100");
+  values << i18n("%1%").arg("125");
+  values << i18n("%1%").arg("150");
+  values << i18n("%1%").arg("200");
+  values << i18n("%1%").arg("250");
+  values << i18n("%1%").arg("350");
+  values << i18n("%1%").arg("400");
+  values << i18n("%1%").arg("450");
+  values << i18n("%1%").arg("500");
   setItems( values );
   
-  setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) );
+  setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) );
   
   connect( this, TQT_SIGNAL( activated( const TQString& ) ), 
     TQT_SLOT( activated( const TQString& ) ) );
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2618a8e0..e09ef63d 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const
 {
     TQString text = whatsThis();
     if (!icon().isEmpty())
-      return TQString::fromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text);
+      return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(icon()).arg(text);
     return text;
 }
 
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index da88a7c1..cfc21c65 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -120,19 +120,19 @@ void TKAction::updateLayout()
   }
 }
 
-TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
 {
   TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
   TQLabel* textLabel = new TQLabel(base,"text");
   textLabel->setMinimumHeight(1);
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
-  tqchildren->reparent(base,TQPoint(0,0));
-  tqchildren->setName("widget");
+  children->reparent(base,TQPoint(0,0));
+  children->setName("widget");
   TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
   tqlayout->setResizeMode(TQLayout::Minimum);
   tqlayout->addWidget(textLabel);
   tqlayout->addWidget(pixLabel);
-  tqlayout->addWidget(tqchildren,1);
+  tqlayout->addWidget(children,1);
 
   updateLayout(base);
   return base;
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index 26b4069d..b9a84a41 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -44,7 +44,7 @@ public:
 protected:
   virtual void initToolBarButton(TKToolBarButton*);
 
-  TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren);
+  TQWidget* createLayout(TQWidget* parent, TQWidget* children);
   void updateLayout();
   virtual void updateLayout(TQWidget*);
 
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index 5436496f..af2b14c2 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -182,7 +182,7 @@ void TKToolBarButton::setEnabled( bool enabled )
 void TKToolBarButton::setText( const TQString& text)
 {
   d->m_text = text;
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::setIcon( const TQString& icon )
@@ -281,7 +281,7 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle )
 void TKToolBarButton::setRaised(bool f)
 {
   d->m_isRaised = f;
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::setAutoRaised(bool f)
@@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *)
     } else {
       TQToolButton::setPixmap(disabledPixmap);
     }
-    tqrepaint(false);
+    repaint(false);
   }
 }
 
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;
@@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &)
     TQToolButton::setPixmap( disabledPixmap );
   else
     TQToolButton::setPixmap( defaultPixmap );
-  tqrepaint(false);
+  repaint(false);
 }
 
 void TKToolBarButton::makeDefaultPixmap()
@@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled()
 void TKToolBarButton::on(bool flag)
 {
   d->m_isOn = flag;
-  tqrepaint();
+  repaint();
 }
 
 void TKToolBarButton::toggle()
@@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag)
     disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
 
   modeChange();
-  tqrepaint();
+  repaint();
 }
 
 void TKToolBarButton::setIconMode( TK::IconMode m )
 {
   d->m_iconMode = m;
   modeChange();
-  tqrepaint();
+  repaint();
 }
 
 #include <tktoolbarbutton.moc>
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index 6c1f8230..6e7c0239 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cc
@@ -60,14 +60,14 @@ void KoColorFrame::slotSetColor1(const TQColor &c)
   mC1 = c;
   mColorChanged = true;
   mPixChanged = true;
-  tqrepaint();
+  repaint();
 }
 
 void KoColorFrame::slotSetColor2(const TQColor &c)
 {
   mC2 = c;
   mColorChanged = true;
-  tqrepaint();
+  repaint();
 }
 
 void KoColorFrame::drawContents(TQPainter *p)
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index 4604bbbd..7fa2f11b 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -166,7 +166,7 @@ void KoIconChooser::setCurrentItem(KoIconItem *item)
     mCurRow = index / mNCols;
     mCurCol = index % mNCols;
 
-    // tqrepaint the old and the new item
+    // repaint the old and the new item
     repaintCell(oldRow, oldCol);
     repaintCell(mCurRow, mCurCol);
 
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index 8b2e556c..9868dec8 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -236,7 +236,7 @@ void KoHSVWidget::update(const KoColor & fgColor, const KoColor & bgColor)
     mSIn->blockSignals(false);
     mVIn->blockSignals(false);
     m_VSelector->blockSignals(false);
-    m_VSelector->tqrepaint(false);
+    m_VSelector->repaint(false);
     m_colorwheel->blockSignals(false);
 }
 
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 94ea8d4d..91d237a3 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -165,8 +165,8 @@ void KoPaletteManager::addWidget(TQWidget * widget,
     }
 
     KToggleAction * a;
-    a = new KToggleAction(i18n("Show %1").tqarg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
-    a->setCheckedState(i18n("Hide %1").tqarg(widget->caption()));
+    a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
+    a->setCheckedState(i18n("Hide %1").arg(widget->caption()));
 
     m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action
     m_actions->insert( name, a );
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 7f8bb11a..7040e885 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -233,7 +233,7 @@ Editor::fill()
 		}
 	}
 
-//	tqrepaint();
+//	repaint();
 
 	if (firstChild())
 	{
@@ -271,12 +271,12 @@ Editor::addItem(const TQCString &name, EditorItem *parent)
 
 	// Create child items
 	item->setOpen(true);
-	if(!property->tqchildren())
+	if(!property->children())
 		return;
 
 	last = 0;
-	TQValueList<Property*>::ConstIterator endIt = property->tqchildren()->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = property->tqchildren()->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = property->children()->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = property->children()->constBegin(); it != endIt; ++it) {
 		//! \todo allow to have child prop with child items too
 		if( *it && (*it)->isVisible() )
 			last = new EditorItem(this, item, *it, last);
@@ -652,7 +652,7 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty)
 			this, TQT_SLOT(slotWidgetRejectInput(Widget*)) );
 	}
 
-	//update tqgeometry earlier, because Widget::setValue() can depend on widget's tqgeometry
+	//update geometry earlier, because Widget::setValue() can depend on widget's geometry
 	updateEditorGeometry(d->currentItem, widget);
 
 	if(widget && (!widget->property() || changeWidgetProperty))
@@ -723,7 +723,7 @@ Editor::updateGroupLabelsPosition()
 		TQRect r = itemRect((TQListViewItem*) group);
 		if(group->label()) {
 			group->label()->setGeometry(r);
-			group->label()->tqrepaint();
+			group->label()->repaint();
 		}
 		group = dynamic_cast<EditorGroupItem*>(group->nextSibling());
 	}
@@ -748,7 +748,7 @@ Editor::showUndoButton( bool show )
 		return;
 
 	int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y();
-	TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
+	TQRect geometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
 	d->undoButton->resize(d->baseRowHeight, d->currentItem->height());
 
 	updateEditorGeometry(true, show);
@@ -756,21 +756,21 @@ Editor::showUndoButton( bool show )
 	if (!show) {
 /*	  if (d->currentWidget) {
 			if (d->currentWidget->leavesTheSpaceForRevertButton()) {
-				tqgeometry.setWidth(tqgeometry.width()-d->undoButton->width());
+				geometry.setWidth(geometry.width()-d->undoButton->width());
 			}
-			d->currentWidget->resize(tqgeometry.width(), tqgeometry.height());
+			d->currentWidget->resize(geometry.width(), geometry.height());
 		}*/
 		d->undoButton->hide();
 		return;
 	}
 
-	TQPoint p = contentsToViewport(TQPoint(0, tqgeometry.y()));
-	d->undoButton->move(tqgeometry.x() + tqgeometry.width()
+	TQPoint p = contentsToViewport(TQPoint(0, geometry.y()));
+	d->undoButton->move(geometry.x() + geometry.width()
 		-((d->currentWidget && d->currentWidget->hasBorders())?1:0)/*editor is moved by 1 to left*/
 		- d->undoButton->width(), p.y());
 //  if (d->currentWidget) {
 //	  d->currentWidget->move(d->currentWidget->x(), p.y());
-//	  d->currentWidget->resize(tqgeometry.width()-d->undoButton->width(), tqgeometry.height());
+//	  d->currentWidget->resize(geometry.width()-d->undoButton->width(), geometry.height());
 //  }
 	d->undoButton->show();
 }
@@ -791,7 +791,7 @@ Editor::slotExpanded(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	tqrepaint();
+	repaint();
 }
 
 void
@@ -815,7 +815,7 @@ Editor::slotCollapsed(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	tqrepaint();
+	repaint();
 }
 
 void
@@ -826,7 +826,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 	Q_UNUSED(newSize);
 	/*for (TQListViewItemIterator it(this); it.current(); ++it) {
 		if (section == 0 && dynamic_cast<EditorGroupItem*>(it.current())) {
-			it.current()->tqrepaint();
+			it.current()->repaint();
 	}
 	}*/
 /*
@@ -843,7 +843,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 		}
 	}*/
 //	repaintContents();
-//	tqrepaint();
+//	repaint();
 	updateEditorGeometry();
 	update();
 }
@@ -1021,7 +1021,7 @@ Editor::setSorting( int column, bool ascending )
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	tqrepaint();
+	repaint();
 }
 
 #include "editor.moc"
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 8c34a5e3..0a431329 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -245,7 +245,7 @@ bool GroupContainer::event( TQEvent * e ) {
 				d->contents->show();
 			else
 				d->contents->hide();
-			d->lyr->tqinvalidate();
+			d->lyr->invalidate();
 			update();
 		}
 	}
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index 9f2c75c2..fc703239 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -72,7 +72,7 @@ class EditorItem : public KListViewItem
 		virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align);
 
 		/*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-]
-		    signs only if the item has tqchildren.
+		    signs only if the item has children.
 		*/
 		virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h);
 
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 61d44499..5ff0bb34 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -118,13 +118,13 @@ CursorEdit::value() const
 void
 CursorEdit::setValue(const TQVariant &value, bool emitChange)
 {
-	ComboBox::setValue(value.toCursor().tqshape(), emitChange);
+	ComboBox::setValue(value.toCursor().shape(), emitChange);
 }
 
 void
 CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape());
+	ComboBox::drawViewer(p, cg, r, value.toCursor().shape());
 }
 
 void
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index 17f6d508..d887a8cd 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -153,7 +153,7 @@ PixmapEdit::selectPixmapFileName()
 		emit valueChanged(this);
 	}
 #endif*/
-	TQString caption( i18n("Insert Image From File (for \"%1\" property)").tqarg(property()->caption()) );
+	TQString caption( i18n("Insert Image From File (for \"%1\" property)").arg(property()->caption()) );
 #ifdef TQ_WS_WIN
 	TQString recentDir;
 	TQString fileName = TQFileDialog::getOpenFileName(
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index fee52662..c47c854f 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -64,8 +64,8 @@ PointEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	m_edit->setText(TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
-	TQToolTip::add(this, TQString("%1, %2").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+	m_edit->setText(TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y()));
+	TQToolTip::add(this, TQString("%1, %2").arg(value.toPoint().x()).arg(value.toPoint().y()));
 
 	if (emitChange)
 		emit valueChanged(this);
@@ -76,10 +76,10 @@ PointEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, con
 {
 	TQRect rect(r);
 	rect.setBottom(r.bottom()+1);
-	Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+	Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+//		TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
 }
 
 void
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index ba6fec49..3cebfea8 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -60,10 +60,10 @@ RectEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	m_edit->setText(TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).
-		tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
-	TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").tqarg(value.toRect().x()).
-		tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+	m_edit->setText(TQString(RECTEDIT_MASK).arg(value.toRect().x()).
+		arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+	TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").arg(value.toRect().x()).
+		arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
 
 	if (emitChange)
 		emit valueChanged(this);
@@ -75,12 +75,12 @@ RectEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons
 	TQRect rect(r);
 	rect.setBottom(r.bottom()+1);
 	Widget::drawViewer(p, cg, rect, 
-		TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).tqarg(value.toRect().y())
-	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+		TQString(RECTEDIT_MASK).arg(value.toRect().x()).arg(value.toRect().y())
+	 	.arg(value.toRect().width()).arg(value.toRect().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//	 	TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y())
-//	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+//	 	TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y())
+//	 	.arg(value.toRect().width()).arg(value.toRect().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 2fa29bc4..98075515 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -63,8 +63,8 @@ SizeEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	m_edit->setText(TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
-	TQToolTip::add(this, TQString("%1 x %2").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+	m_edit->setText(TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
+	TQToolTip::add(this, TQString("%1 x %2").arg(value.toSize().width()).arg(value.toSize().height()));
 
 	if (emitChange)
 		emit valueChanged(this);
@@ -76,10 +76,10 @@ SizeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons
 	TQRect rect(r);
 	rect.setBottom(r.bottom()+1);
 	Widget::drawViewer(p, cg, rect, 
-		TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+		TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+//		TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 7722d4a2..ba65a92f 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -77,9 +77,9 @@ void
 SizePolicyEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
-	m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
-		tqarg(findDescription(value.toSizePolicy().verData())).
-		tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+	m_edit->setText(TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())).
+		arg(findDescription(value.toSizePolicy().verData())).
+		arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 	TQToolTip::add(this, m_edit->text());
 
 	if (emitChange)
@@ -94,9 +94,9 @@ SizePolicyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r
 	TQRect rect(r);
 	rect.setBottom(r.bottom()+1);
 	Widget::drawViewer(p, cg, rect, 
-		TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
-		tqarg(findDescription(value.toSizePolicy().verData())).
-		tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+		TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())).
+		arg(findDescription(value.toSizePolicy().verData())).
+		arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 }
 
 TQString
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index fe599e58..54f986c5 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -90,7 +90,7 @@ StringListEdit::showEditor()
 	KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(property()->caption()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(property()->caption()), &dialog, "editlist");
 	dialog.setMainWidget(edit);
 	edit->insertStringList(m_list);
 
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 1af1fcd1..65a7d951 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -61,7 +61,7 @@ TQVariant
 SymbolCombo::value() const
 {
 	if (!(m_edit->text().isNull()))
-		return m_edit->text().tqat(0).tqunicode();
+		return m_edit->text().at(0).tqunicode();
 	else
 		return 0;
 }
diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h
index 8aca5538..f4b0cf36 100644
--- a/lib/koproperty/factory.h
+++ b/lib/koproperty/factory.h
@@ -81,7 +81,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
      \section custom_prop_composed Using Custom Properties to create composed properties
      Use a composed property when you need more than one editor for a property. Examples
      are rect, size or point properties.
-     If you create a composed property, both parent and tqchildren properties must have custom
+     If you create a composed property, both parent and children properties must have custom
      (different) types.
      Child properties are created in CustomProperty constructor of the <b>parent</b> type,
      by adding CustomProperty::property() as parent in Property constructor.\n
@@ -89,7 +89,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
      parent's Property::setValue() should be called, making sure that useCustomProperty argument is set
      to false.\n
      Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant.
-     You just need to update tqchildren's value, making sure that useCustomProperty argument is set
+     You just need to update children's value, making sure that useCustomProperty argument is set
      to false.
 
      \section custom_editor Using Custom Editors
@@ -105,7 +105,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
      \section custom_prop_composed Using Custom Properties with value that cannot be stored in a TQVariant
      You then need to set handleValue() to true. The Widget you create also have
      to call directly CustomProperty member to store the value. just make sure you call emitPropertyChanged()
-     when the proerty value changes. Also make sure to avoid infinite recursion if you use tqchildren properties.
+     when the proerty value changes. Also make sure to avoid infinite recursion if you use children properties.
 
    \author Cedric Pasteur <cedric.pasteur@free.fr>
    \author Alexander Dymo <cloudtemple@mskat.net>
diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp
index 49ca2b6c..6c4fa246 100644
--- a/lib/koproperty/property.cpp
+++ b/lib/koproperty/property.cpp
@@ -43,7 +43,7 @@ class PropertyPrivate
 		: caption(0), listData(0), changed(false), storable(true), 
 		 readOnly(false), visible(true),
 		 autosync(-1), custom(0), useCustomProperty(true),
-		 sets(0), parent(0), tqchildren(0), relatedProperties(0),
+		 sets(0), parent(0), children(0), relatedProperties(0),
 		 sortingKey(0)
 		{
 		}
@@ -63,7 +63,7 @@ class PropertyPrivate
 			delete caption;
 			caption = 0;
 			delete listData;
-			delete tqchildren;
+			delete children;
 			delete relatedProperties;
 			delete custom;
 			delete sets;
@@ -99,7 +99,7 @@ class PropertyPrivate
 //	TQValueList<Set*>  sets;
 
 	Property  *parent;
-	TQValueList<Property*>  *tqchildren;
+	TQValueList<Property*>  *children;
 	//! list of properties with the same name (when intersecting buffers)
 	TQValueList<Property*>  *relatedProperties;
 
@@ -564,9 +564,9 @@ Property::operator= (const Property &property)
 		delete d->listData;
 		d->listData = 0;
 	}
-	if(d->tqchildren) {
-		delete d->tqchildren;
-		d->tqchildren = 0;
+	if(d->children) {
+		delete d->children;
+		d->children = 0;
 	}
 	if(d->relatedProperties) {
 		delete d->relatedProperties;
@@ -594,16 +594,16 @@ Property::operator= (const Property &property)
 	}
 	if(property.d->custom) {
 		d->custom = FactoryManager::self()->createCustomProperty(this);
-		// updates all tqchildren value, using CustomProperty
+		// updates all children value, using CustomProperty
 		setValue(property.value());
 	}
 	else {
 		d->value = property.d->value;
-		if(property.d->tqchildren) {
-			// no CustomProperty (should never happen), simply copy all tqchildren
-			d->tqchildren = new TQValueList<Property*>();
-			TQValueList<Property*>::ConstIterator endIt = property.d->tqchildren->constEnd();
-			for(TQValueList<Property*>::ConstIterator it = property.d->tqchildren->constBegin(); it != endIt; ++it) {
+		if(property.d->children) {
+			// no CustomProperty (should never happen), simply copy all children
+			d->children = new TQValueList<Property*>();
+			TQValueList<Property*>::ConstIterator endIt = property.d->children->constEnd();
+			for(TQValueList<Property*>::ConstIterator it = property.d->children->constBegin(); it != endIt; ++it) {
 				Property *child = new Property( *(*it) );
 				addChild(child);
 			}
@@ -614,7 +614,7 @@ Property::operator= (const Property &property)
 		d->relatedProperties = new TQValueList<Property*>( *(property.d->relatedProperties));
 	}
 
-	// update these later because they may have been changed when creating tqchildren
+	// update these later because they may have been changed when creating children
 	d->oldValue = property.d->oldValue;
 	d->changed = property.d->changed;
 	d->sortingKey = property.d->sortingKey;
@@ -631,16 +631,16 @@ Property::operator ==(const Property &prop) const
 /////////////////////////////////////////////////////////////////
 
 const TQValueList<Property*>*
-Property::tqchildren() const
+Property::children() const
 {
-	return d->tqchildren;
+	return d->children;
 }
 
 Property*
 Property::child(const TQCString &name)
 {
-	TQValueList<Property*>::ConstIterator endIt = d->tqchildren->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = d->tqchildren->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = d->children->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = d->children->constBegin(); it != endIt; ++it) {
 		if((*it)->name() == name)
 			return *it;
 	}
@@ -659,11 +659,11 @@ Property::addChild(Property *prop)
 	if (!prop)
 		return;
 
-	if(!d->tqchildren || tqFind( d->tqchildren->begin(), d->tqchildren->end(), prop) == d->tqchildren->end()) { // not in our list
-		if(!d->tqchildren)
-			d->tqchildren = new TQValueList<Property*>();
-		d->tqchildren->append(prop);
-		prop->setSortingKey(d->tqchildren->count());
+	if(!d->children || tqFind( d->children->begin(), d->children->end(), prop) == d->children->end()) { // not in our list
+		if(!d->children)
+			d->children = new TQValueList<Property*>();
+		d->children->append(prop);
+		prop->setSortingKey(d->children->count());
 		prop->d->parent = this;
 	}
 	else {
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index bc8a503e..5f61ff6b 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -306,9 +306,9 @@ class KOPROPERTY_EXPORT Property
 		/*! \return property icon's string. Can be empty. */
 		TQString icon() const;
 
-		/*! \return a list of all tqchildren for this property, or NULL of there
-		 is no tqchildren for this property */
-		const TQValueList<Property*>*  tqchildren() const;
+		/*! \return a list of all children for this property, or NULL of there
+		 is no children for this property */
+		const TQValueList<Property*>*  children() const;
 
 		/*! \return a child property for \a name, or NULL if there is no property with that name. */
 		Property* child(const TQCString &name);
@@ -407,7 +407,7 @@ class KOPROPERTY_EXPORT Property
 
 	protected:
 		/*! Adds \a prop as a child of this property.
-		 The tqchildren will be owned by this property. */
+		 The children will be owned by this property. */
 		void addChild(Property *prop);
 
 		/*! Adds \a set to this property. */
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index c026aad0..1c4678c9 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -89,7 +89,7 @@ Test::Test()
 		group = "ComplexGroup";
 		m_set->setGroupDescription(group, "Complex Group");
 	}
-	m_set->addProperty(new Property("Rect", this->tqgeometry(),"Rect"), group);
+	m_set->addProperty(new Property("Rect", this->geometry(),"Rect"), group);
 	m_set->addProperty(new Property("Point", TQPoint(3,4), "Point"), group);
 	m_set->addProperty(new Property("Size", TQPoint(3,4), "Size"), group);
 
diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h
index c0f8fd6f..ee1cdfb9 100644
--- a/lib/kotext/IsoDuration.h
+++ b/lib/kotext/IsoDuration.h
@@ -31,7 +31,7 @@ static TQString minutesToISODuration( int mn )
 {
     bool neg = mn < 0;
     // PT == period of time - see ISO8601
-    TQString str = TQString::fromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) );
+    TQString str = TQString::fromLatin1( "PT00H%1M00S" ).arg( TQABS( mn ) );
     if ( neg )
         str.prepend( '-' );
     return str;
@@ -41,7 +41,7 @@ static TQString daysToISODuration( int days )
 {
     bool neg = days < 0;
     // P == period, time is ommitted - see ISO8601
-    TQString str = TQString::fromLatin1( "P%1D" ).tqarg( TQABS( days ) );
+    TQString str = TQString::fromLatin1( "P%1D" ).arg( TQABS( days ) );
     if ( neg )
         str.prepend( '-' );
     return str;
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index edefb8e5..393488c9 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -654,7 +654,7 @@ void KFontChooser_local::setupDisplay()
 void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria)
 {
   TQFontDatabase dbase;
-  TQStringList lstSys(dbase.tqfamilies());
+  TQStringList lstSys(dbase.families());
 
   // if we have criteria; then check fonts before adding
   if (fontListCriteria)
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index f2c88bcc..7ca6f1a7 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -952,7 +952,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para
                     TQChar ch = new_wordlist.first().at(i);
                     for (TQStringList::ConstIterator it = new_wordlist.begin(); it != new_wordlist.end(); ++it )
                     {
-                      if ( (*it).tqat(i).lower() != ch.lower() )
+                      if ( (*it).at(i).lower() != ch.lower() )
                       {
                         word = (*it).left(i); //the completion word is truncated here
                         //kdDebug() << "set the word completion to:" << word << endl;
@@ -1778,7 +1778,7 @@ void KoAutoFormat::doAutoDetectUrl( KoTextCursor *textEditCursor, KoTextParag *p
         txtObj->insert( textEditCursor, lastFormat, KoTextObject::customItemChar(), i18n("Insert Variable"),
                         KoTextDocument::HighlightSelection, KoTextObject::DefaultInsertFlags, customItemsMap );
         var->recalc();
-        parag->tqinvalidate(0);
+        parag->invalidate(0);
         parag->setChanged( true );
 
         // adjust index
@@ -1819,7 +1819,7 @@ void KoAutoFormat::doAutoIncludeUpperUpper(KoTextCursor* /*textEditCursor*/, KoT
                 break;
             word.append( ch );
         }
-        if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.tqat(3)!=word.tqat(3).upper() )
+        if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.at(3)!=word.at(3).upper() )
         {
             if ( m_twoUpperLetterException.findIndex(word )==-1)
                 m_twoUpperLetterException.append( word);
@@ -1856,7 +1856,7 @@ void KoAutoFormat::doAutoIncludeAbbreviation(KoTextCursor* /*textEditCursor*/, K
                     break;
                 wordAfter.append( ch );
             }
-            if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.tqat(0)==wordAfter.tqat(0).lower())
+            if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.at(0)==wordAfter.at(0).lower())
             {
                 if ( m_upperCaseExceptions.findIndex(word )==-1)
                     m_upperCaseExceptions.append( word );
@@ -2158,14 +2158,14 @@ KCommand *KoAutoFormat::doCapitalizeNameOfDays( KoTextCursor* textEditCursor, Ko
     TQString replaceStr= m_cacheNameOfDays[pos];
     int start = index - replaceStr.length();
     int length = replaceStr.length();
-    if( word.tqat(0).isLetter() && word.tqat(0)==word.tqat(0).lower() )
+    if( word.at(0).isLetter() && word.at(0)==word.at(0).lower() )
     {
         KoTextCursor cursor( parag->document() );
         cursor.setParag( parag );
         cursor.setIndex( start );
         textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor );
         cursor.setIndex( start + length );
-        TQString replacement = replaceStr.tqat(0).upper() + replaceStr.right( length-1 );
+        TQString replacement = replaceStr.at(0).upper() + replaceStr.right( length-1 );
         textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor );
         TQString cmdName=i18n("Capitalize Name of Days");
         KCommand *cmd =txtObj->replaceSelectionCommand( textEditCursor, replacement,
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index ddcfb1ae..74b35908 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -286,7 +286,7 @@ void KoAutoFormatDia::setupTab1()
     cbAutoReplaceNumber=new TQCheckBox( tab1 );
     cbAutoReplaceNumber->setText( i18n(
             "We add the 1/2 char at the %1", "Re&place 1/2... with %1..." )
-            .tqarg( TQString( "�" ) ) );
+            .arg( TQString( "�" ) ) );
     TQWhatsThis::add( cbAutoReplaceNumber, i18n(
             "Most standard fraction notations will be converted when available"
             ) );
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index f3b8928b..612f0be7 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -135,7 +135,7 @@ void KoBgSpellCheck::spellCheckerMisspelling( const TQString &old, int pos )
 #endif
     markWord( parag, pos, old.length(), true );
     // Repaint immediately, since the checking is timer-based (slow), it looks
-    // slow (chunky) if we only tqrepaint once a paragraph is completely done.
+    // slow (chunky) if we only repaint once a paragraph is completely done.
     parag->document()->emitRepaintChanged();
 
     if ( d->startupChecking && d->marked > delayAfterMarked ) {
@@ -171,7 +171,7 @@ void KoBgSpellCheck::markWord( KoTextParag* parag, int pos, int length, bool mis
 #endif
     parag->setFormat( pos, length, &format, true, KoTextFormat::Misspelled );
     parag->setChanged( true );
-    // don't tqrepaint here, in the slotParagraphModified case we want to tqrepaint only once at the end
+    // don't repaint here, in the slotParagraphModified case we want to repaint only once at the end
 }
 
 void KoBgSpellCheck::checkerContinue()
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index be5278e1..9882e6de 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -66,7 +66,7 @@ void KoCommentDia::slotAddAuthorName()
 {
     TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() );
     TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() );
-    TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time);
+    TQString result = TQString("--------%1 ,%2, %3------\n").arg(authorName).arg(date).arg(time);
     m_multiLine->insertLine( result, m_multiLine->numLines() );
 }
 
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 981ec506..96ff88e1 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -65,8 +65,8 @@ KoBidiContext::~KoBidiContext()
 	delete parent;
 }
 
-static TQChar *tqshapeBuffer = 0;
-static int tqshapeBufSize = 0;
+static TQChar *shapeBuffer = 0;
+static int shapeBufSize = 0;
 
 /*
    Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on
@@ -103,7 +103,7 @@ static int tqshapeBufSize = 0;
 */
 
 /*
-  Two small helper functions for arabic shaping. They get the next tqshape causing character on either
+  Two small helper functions for arabic shaping. They get the next shape causing character on either
   side of the char in question. Implements rule R1.
 
   leftChar() returns true if the char to the left is a left join-causing char
@@ -159,7 +159,7 @@ KoComplexText::Shape KoComplexText::glyphVariant( const TQString &str, int pos)
     switch ( joining ) {
 	case TQChar::OtherJoining:
 	case TQChar::Center:
-	    // these don't change tqshape
+	    // these don't change shape
 	    return XIsolated;
 	case TQChar::Right:
 	    // only rule R2 applies
@@ -204,7 +204,7 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in
     switch ( joining ) {
 	case TQChar::OtherJoining:
 	case TQChar::Center:
-	    // these don't change tqshape
+	    // these don't change shape
 	    return XIsolated;
 	case TQChar::Right:
 	    // only rule R2 applies
@@ -233,7 +233,7 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in
 // does only presentation forms B at the moment, but that should be enough for
 // simple display
 static const ushort arabicUnicodeMapping[256][2] = {
-    // base of tqshaped forms, and number-1 of them ( 0 for non shaping,
+    // base of shaped forms, and number-1 of them ( 0 for non shaping,
     // 1 for right binding and 3 for dual binding
     { 0x0600, 0 }, // 0x600
     { 0x0601, 0 }, // 0x601
@@ -355,7 +355,7 @@ static const ushort arabicUnicodeMapping[256][2] = {
     { 0x066e, 0 }, // 0x66e
     { 0x066f, 0 }, // 0x66f
 
-	// ### some glyphs do not have tqshaped mappings in the presentation forms A.
+	// ### some glyphs do not have shaped mappings in the presentation forms A.
 	// these have the shaping set to 0 for the moment. Will have to find out better mappings for them.
     { 0x0670, 0 }, // 0x670
     { 0xfb50, 1 }, // 0x671 R   Alef Wasla
@@ -512,7 +512,7 @@ static const ushort arabicUnicodeMapping[256][2] = {
 
 };
 
-// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the tqshape
+// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the shape
 // of the lam can be either initial of medial. So initial maps to the isolated form of the ligature,
 // medial to the final form
 static const ushort arabicUnicodeLamAlefMapping[6][4] = {
@@ -524,14 +524,14 @@ static const ushort arabicUnicodeLamAlefMapping[6][4] = {
     { 0xfffd, 0xfffd, 0xfefb, 0xfefc } // 0x627         R       Alef
 };
 
-static inline int getShape( const TQChar * /* base */, uchar cell, int tqshape,
+static inline int getShape( const TQChar * /* base */, uchar cell, int shape,
 			    const TQFontMetrics * /* fm */ )
 {
-    uint ch = arabicUnicodeMapping[cell][0] + tqshape;
+    uint ch = arabicUnicodeMapping[cell][0] + shape;
     /*
-    // we revert to the untqshaped glyph in case the tqshaped version doesn't exist
+    // we revert to the unshaped glyph in case the shaped version doesn't exist
     if ( fm && !fm->inFont( ch ) ) {
-    switch( tqshape ) {
+    switch( shape ) {
     case KoComplexText::XIsolated:
     break; // try base form
     case KoComplexText::XFinal:
@@ -551,7 +551,7 @@ static inline int getShape( const TQChar * /* base */, uchar cell, int tqshape,
     return ch;
 }
 
-TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm )
+TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm )
 {
     if( len < 0 )
 	len = uc.length() - from;
@@ -575,16 +575,16 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
     }
     if ( len == 0 ) return TQString();
 
-    if( !tqshapeBuffer || len > tqshapeBufSize ) {
-      if( tqshapeBuffer ) free( (void *) tqshapeBuffer );
-      tqshapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) );
-//        delete [] tqshapeBuffer;
-//        tqshapeBuffer = new TQChar[ len + 1];
-	tqshapeBufSize = len;
+    if( !shapeBuffer || len > shapeBufSize ) {
+      if( shapeBuffer ) free( (void *) shapeBuffer );
+      shapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) );
+//        delete [] shapeBuffer;
+//        shapeBuffer = new TQChar[ len + 1];
+	shapeBufSize = len;
     }
 
     int lenOut = 0;
-    TQChar *data = tqshapeBuffer;
+    TQChar *data = shapeBuffer;
     if ( dir == TQPainter::RTL )
 	ch += len - 1;
     for ( int i = 0; i < len; i++ ) {
@@ -601,8 +601,8 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
 	    int pos = i + from;
 	    if ( dir == TQPainter::RTL )
 		pos = from + len - 1 - i;
-	    int tqshape = glyphVariantLogical( uc, pos );
-	    //kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl;
+	    int shape = glyphVariantLogical( uc, pos );
+	    //kdDebug() << "mapping U+" << ch->tqunicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl;
 	    // take care of lam-alef ligatures (lam right of alef)
 	    ushort map;
 	    switch ( c ) {
@@ -615,7 +615,7 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
 			    case 0x25:
 			    case 0x27:
 				//kdDebug() << " lam of lam-alef ligature" << endl;
-				map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][tqshape];
+				map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][shape];
 				goto next;
 			    default:
 				break;
@@ -635,7 +635,7 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
 		default:
 		    break;
 	    }
-	    map = getShape( ch, c, tqshape, fm );
+	    map = getShape( ch, c, shape, fm );
 	next:
 	    *data = map;
 	    data++;
@@ -649,11 +649,11 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
     }
 
     if ( dir == TQPainter::Auto && !uc.simpleText() ) {
-	return bidiReorderString( TQConstString( tqshapeBuffer, lenOut ).string() );
+	return bidiReorderString( TQConstString( shapeBuffer, lenOut ).string() );
     }
     if ( dir == TQPainter::RTL ) {
 	// reverses the non spacing marks to be again after the base char
-	TQChar *s = tqshapeBuffer;
+	TQChar *s = shapeBuffer;
 	int i = 0;
 	while ( i < lenOut ) {
 	    if ( s->combiningClass() != 0 ) {
@@ -684,17 +684,17 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ
 	}
     }
 
-    return TQConstString( tqshapeBuffer, lenOut ).string();
+    return TQConstString( shapeBuffer, lenOut ).string();
 }
 
-TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm )
+TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm )
 {
     const TQChar *ch = str.tqunicode() + pos;
     if ( ch->row() != 0x06 )
 	return *ch;
     else {
-	int tqshape = glyphVariantLogical( str, pos );
-	//kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl;
+	int shape = glyphVariantLogical( str, pos );
+	//kdDebug() << "mapping U+" << ch->tqunicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl;
 	// lam aleph ligatures
 	switch ( ch->cell() ) {
 	    case 0x44: { // lam
@@ -705,7 +705,7 @@ TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQF
 			case 0x23:
 			case 0x25:
 			case 0x27:
-			    return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][tqshape]);
+			    return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][shape]);
 			default:
 			    break;
 		    }
@@ -722,7 +722,7 @@ TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQF
 	    default:
 		break;
 	}
-	return TQChar( getShape( ch, ch->cell(), tqshape, fm ) );
+	return TQChar( getShape( ch, ch->cell(), shape, fm ) );
     }
 }
 
@@ -739,7 +739,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str
     if ( !nmarks )
 	return TQPointArray();
 
-    TQChar baseChar = KoComplexText::tqshapedCharacter( str, pos );
+    TQChar baseChar = KoComplexText::shapedCharacter( str, pos );
     TQRect baseRect = f->boundingRect( baseChar );
     int baseOffset = f->textWidth( str, pos, 1 );
 
diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h
index 7f75d730..8a22d152 100644
--- a/lib/kotext/KoComplexText.h
+++ b/lib/kotext/KoComplexText.h
@@ -115,8 +115,8 @@ public:
     static Shape glyphVariant( const TQString &str, int pos);
     static Shape glyphVariantLogical( const TQString &str, int pos);
 
-    static TQString tqshapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0);
-    static TQChar tqshapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0);
+    static TQString shapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0);
+    static TQChar shapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0);
 
     // positions non spacing marks relative to the base character at position pos.
     //static TQPointArray positionMarks( TQFontPrivate *f, const TQString &str, int pos, TQRect *boundingRect = 0 );
diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp
index 327dbe53..6d9d57d6 100644
--- a/lib/kotext/KoImportStyleDia.cpp
+++ b/lib/kotext/KoImportStyleDia.cpp
@@ -98,7 +98,7 @@ TQString KoImportStyleDia::generateStyleName( const TQString & templateName ) co
     int num = 1;
     bool exists;
     do {
-        name = templateName.tqarg( num );
+        name = templateName.arg( num );
         exists = m_currentCollection->findStyle( name ) != 0;
         ++num;
     } while ( exists );
@@ -111,7 +111,7 @@ TQString KoImportStyleDia::generateStyleDisplayName( const TQString & templateNa
     int num = 1;
     bool exists;
     do {
-        name = templateName.tqarg( num );
+        name = templateName.arg( num );
         exists = m_currentCollection->findStyleByDisplayName( name ) != 0;
         ++num;
     } while ( exists );
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 0de6ee87..56adc3a2 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -43,7 +43,7 @@ KoParagCounter::KoParagCounter()
     m_customBulletChar = TQChar( '-' );
     m_customBulletFont = TQString();
     m_align = TQt::AlignAuto;
-    tqinvalidate();
+    invalidate();
 }
 
 bool KoParagCounter::operator==( const KoParagCounter & c2 ) const
@@ -83,7 +83,7 @@ unsigned int KoParagCounter::depth() const
     return m_depth;
 }
 
-void KoParagCounter::tqinvalidate()
+void KoParagCounter::invalidate()
 {
     m_cache.number = -1;
     m_cache.text = TQString();
@@ -144,7 +144,7 @@ void KoParagCounter::load( TQDomElement & element )
     m_align = element.attribute("align", "0").toInt(); //AlignAuto as defeult
     TQString restart = element.attribute("restart");
     m_restartCounter = (restart == "true") || (restart == "1");
-    tqinvalidate();
+    invalidate();
 }
 
 static int importCounterType( TQChar numFormat )
@@ -259,7 +259,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
             m_style = STYLE_DISCBULLET;
         }
     }
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::saveOasis( KoGenStyle& listStyle, bool savingStyle ) const
@@ -326,7 +326,7 @@ void KoParagCounter::saveOasisListLevel( KoXmlWriter& listLevelWriter, bool incl
         listLevelWriter.startElement( "style:list-level-properties" );
         listLevelWriter.addAttribute( "fo:text-align", KoParagLayout::saveOasisAlignment( (TQt::AlignmentFlags)m_align ) );
         // OASIS has other style properties: text:space-before (indent), text:min-label-width (TODO),
-        // text:min-label-distance, style:font-name (for bullets), image size and vertical tqalignment.
+        // text:min-label-distance, style:font-name (for bullets), image size and vertical alignment.
         listLevelWriter.endElement(); // style:list-level-properties
     }
 }
@@ -531,66 +531,66 @@ void KoParagCounter::save( TQDomElement & element )
 void KoParagCounter::setCustom( TQString c )
 {
     m_custom = c;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setCustomBulletCharacter( TQChar c )
 {
     m_customBulletChar = c;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setCustomBulletFont( TQString f )
 {
     m_customBulletFont = f;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setDepth( unsigned int d )
 {
     m_depth = d;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setNumbering( Numbering n )
 {
     m_numbering = n;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setPrefix( TQString p )
 {
     m_prefix = p;
-    tqinvalidate();
+    invalidate();
 }
 void KoParagCounter::setStartNumber( int s )
 {
     m_startNumber = s;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setDisplayLevels( int l )
 {
     m_displayLevels = l;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setAlignment( int a )
 {
     m_align = a;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setStyle( Style s )
 {
     m_style = s;
-    tqinvalidate();
+    invalidate();
 }
 
 void KoParagCounter::setSuffix( TQString s )
 {
     m_suffix = s;
-    tqinvalidate();
+    invalidate();
 }
 
 int KoParagCounter::startNumber() const
@@ -603,7 +603,7 @@ int KoParagCounter::displayLevels() const
     return m_displayLevels;
 }
 
-int KoParagCounter::tqalignment() const
+int KoParagCounter::alignment() const
 {
     return m_align;
 }
@@ -626,7 +626,7 @@ bool KoParagCounter::restartCounter() const
 void KoParagCounter::setRestartCounter( bool restart )
 {
     m_restartCounter = restart;
-    tqinvalidate();
+    invalidate();
 }
 
 // Return the text for that level only
diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h
index 6758d952..d45b2435 100644
--- a/lib/kotext/KoParagCounter.h
+++ b/lib/kotext/KoParagCounter.h
@@ -40,7 +40,7 @@ public:
 
     /** Invalidate the internal cache. Use it whenever the number associated with this
      * counter may have changed. */
-    void tqinvalidate();
+    void invalidate();
 
     /** Return the current value of the counter as a number.
      */
@@ -172,9 +172,9 @@ public:
     TQString custom() const;
     void setCustom( TQString c );
 
-    /** Counter tqalignment
+    /** Counter alignment
      */
-    int tqalignment() const;
+    int alignment() const;
     void setAlignment( int a );
 
     /**
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 13c48350..1d424b27 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -129,7 +129,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     grid->addWidget( spnStart, 2, 2);
 
     lAlignment = new TQLabel( gStyle, "lAlignment" );
-    lAlignment->setText( i18n( "Counter tqalignment:" ) );
+    lAlignment->setText( i18n( "Counter alignment:" ) );
     grid->addWidget( lAlignment, 2, 3 );
 
     cbAlignment = new KComboBox( gStyle, "cbAlignment" );
@@ -296,11 +296,11 @@ void KoCounterStyleWidget::displayStyle( KoParagCounter::Style style )
     spnStart->setValue( m_counter.startNumber() );
 
     cbRestart->setChecked( m_counter.restartCounter() );
-    if(m_counter.tqalignment()==TQt::AlignLeft)
+    if(m_counter.alignment()==TQt::AlignLeft)
         cbAlignment->setCurrentText(i18n("Align Left"));
-    else if(m_counter.tqalignment()==TQt::AlignRight)
+    else if(m_counter.alignment()==TQt::AlignRight)
         cbAlignment->setCurrentText(i18n("Align Right"));
-    else if(m_counter.tqalignment()==TQt::AlignAuto)
+    else if(m_counter.alignment()==TQt::AlignAuto)
         cbAlignment->setCurrentText(i18n("Align Auto"));
     else
         kdError()<<"Not Implemented"<<endl;
@@ -812,14 +812,14 @@ void KoStylePreview::setCounter( const KoParagCounter & counter )
 {
     KoTextParag * parag = m_textdoc->firstParag();
     parag->setCounter( counter );
-    tqrepaint( true );
+    repaint( true );
 }
 
 void KoStylePreview::setStyle( KoParagStyle * style )
 {
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( style );
-    tqrepaint(true);
+    repaint(true);
 }
 
 void KoStylePreview::drawContents( TQPainter *painter )
@@ -839,13 +839,13 @@ void KoStylePreview::drawContents( TQPainter *painter )
     {
         // For centering to work, and to even get word wrapping when the thing is too big :)
         m_textdoc->setWidth( widthLU );
-        parag->tqinvalidate(0);
+        parag->invalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag tqalignment working,
+    // Center vertically, but not horizontally, to keep the parag alignment working,
     textRect.moveTopLeft( TQPoint( whiteRect.x(),
                                   whiteRect.y() + ( whiteRect.height() - textRect.height() ) / 2 ) );
     // Move it from the left border a little
@@ -879,8 +879,8 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
         frameWidth=9999;
     } else {
         length=i18n("Frame width: %1 %2")
-		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.tqarg(KoUnit::unitName(m_unit));
+		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.arg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
 
@@ -938,9 +938,9 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     cSpacing->insertItem( i18n( "Line spacing value", "1.5 Lines" ) );
     cSpacing->insertItem( i18n( "Line spacing value", "Double" ) );
     cSpacing->insertItem( i18n( "Proportional") ); // LS_MULTIPLE, called Proportional like in OO
-    cSpacing->insertItem( i18n( "Line Distance (%1)" ).tqarg(unitName) ); // LS_CUSTOM
-    cSpacing->insertItem( i18n( "At Least (%1)" ).tqarg(unitName) );
-    cSpacing->insertItem( i18n( "Fixed (%1)").tqarg(unitName) ); // LS_FIXED
+    cSpacing->insertItem( i18n( "Line Distance (%1)" ).arg(unitName) ); // LS_CUSTOM
+    cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) );
+    cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED
 
     connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) );
     spacingGrid->addWidget( cSpacing, 1, 0 );
@@ -1273,7 +1273,7 @@ int KoParagAlignWidget::pageBreaking() const
 
 void KoParagAlignWidget::display( const KoParagLayout & lay )
 {
-    int align = lay.tqalignment;
+    int align = lay.alignment;
     prev2->setAlign( align );
 
     clearAligns();
@@ -1302,7 +1302,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay )
 
 void KoParagAlignWidget::save( KoParagLayout & lay )
 {
-    lay.tqalignment = align();
+    lay.alignment = align();
     lay.pageBreaking = pageBreaking();
 }
 
@@ -1705,7 +1705,7 @@ void KoParagCounterWidget::display( const KoParagLayout & lay ) {
 
 void KoParagCounterWidget::updatePreview() {
     preview->setCounter(m_counter);
-    preview->tqrepaint(true);
+    preview->repaint(true);
 }
 
 void KoParagCounterWidget::save( KoParagLayout & lay ) {
@@ -1746,8 +1746,8 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     } else {
         m_toplimit=frameWidth;
         length=i18n("Frame width: %1 %2")
-		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.tqarg(KoUnit::unitName(m_unit));
+		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.arg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
     TQVBoxLayout* Form1Layout = new TQVBoxLayout( this );
@@ -2272,7 +2272,7 @@ KoParagLayout KoParagDia::paragLayout() const
     newLayout.setLineSpacingValue( lineSpacing() );
     newLayout.lineSpacingType = lineSpacingType();
     newLayout.setTabList( tabListTabulator() );
-    newLayout.tqalignment = align();
+    newLayout.alignment = align();
     newLayout.margins[TQStyleSheetItem::MarginFirstLine] = firstLineIndent();
     newLayout.margins[TQStyleSheetItem::MarginLeft] = leftIndent();
     newLayout.margins[TQStyleSheetItem::MarginRight] = rightIndent();
diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h
index 26f68e0b..443bb62f 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -147,7 +147,7 @@ private:
 };
 
 /**
- * The widget for editing paragraph tqalignment (tab 2)
+ * The widget for editing paragraph alignment (tab 2)
  */
 class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget
 {
@@ -549,7 +549,7 @@ public:
     TQColor backgroundColor() const { return m_decorationsWidget->backgroundColor(); }
 
     // Support for "what has changed?"
-    bool isAlignChanged() const {return oldLayout.tqalignment!=align();}
+    bool isAlignChanged() const {return oldLayout.alignment!=align();}
     bool isLineSpacingChanged() const {
 	return (oldLayout.lineSpacingValue() !=lineSpacing() ||
                 oldLayout.lineSpacingType != lineSpacingType());
diff --git a/lib/kotext/KoParagDia_p.h b/lib/kotext/KoParagDia_p.h
index a1ca5737..48f77ea1 100644
--- a/lib/kotext/KoParagDia_p.h
+++ b/lib/kotext/KoParagDia_p.h
@@ -66,17 +66,17 @@ public:
     ~KPagePreview() {}
 
     void setLeft( double _left )
-    { left = _left; tqrepaint( false ); }
+    { left = _left; repaint( false ); }
     void setRight( double _right )
-    { right = _right; tqrepaint( false ); }
+    { right = _right; repaint( false ); }
     void setFirst( double _first )
-    { first = _first; tqrepaint( false ); }
+    { first = _first; repaint( false ); }
     void setSpacing( double _spacing )
-    { spacing = _spacing; tqrepaint( false ); }
+    { spacing = _spacing; repaint( false ); }
     void setBefore( double _before )
-    { before = _before; tqrepaint( false ); }
+    { before = _before; repaint( false ); }
     void setAfter( double _after )
-    { after = _after; tqrepaint( false ); }
+    { after = _after; repaint( false ); }
 
 protected:
     void drawContents( TQPainter* );
@@ -100,7 +100,7 @@ public:
     ~KPagePreview2() {}
 
     void setAlign( int _align )
-    { align = _align; tqrepaint( false ); }
+    { align = _align; repaint( false ); }
 
 protected:
     void drawContents( TQPainter* );
@@ -124,16 +124,16 @@ public:
 
     KoBorder leftBorder()const { return m_leftBorder; }
     void setLeftBorder( const KoBorder& _leftBorder ) 
-	{ m_leftBorder = _leftBorder; tqrepaint( true ); }
+	{ m_leftBorder = _leftBorder; repaint( true ); }
     KoBorder rightBorder() const { return m_rightBorder; }
     void setRightBorder( const KoBorder& _rightBorder )
-	{ m_rightBorder = _rightBorder; tqrepaint( true ); }
+	{ m_rightBorder = _rightBorder; repaint( true ); }
     KoBorder topBorder()const { return m_topBorder; }
     void setTopBorder( const KoBorder& _topBorder )
-	{ m_topBorder = _topBorder; tqrepaint( true ); }
+	{ m_topBorder = _topBorder; repaint( true ); }
     KoBorder bottomBorder()const { return m_bottomBorder; }
     void setBottomBorder( const KoBorder& _bottomBorder )
-	{ m_bottomBorder = _bottomBorder; tqrepaint( true ); }
+	{ m_bottomBorder = _bottomBorder; repaint( true ); }
 
     void setBorder( KoBorder::BorderType which, const KoBorder& border);
 
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index fd1a9453..8e5178a5 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -46,7 +46,7 @@ KoParagLayout::KoParagLayout()
 
 void KoParagLayout::operator=( const KoParagLayout &tqlayout )
 {
-    tqalignment = tqlayout.tqalignment;
+    alignment = tqlayout.alignment;
     for ( int i = 0 ; i < 5 ; ++i )
         margins[i] = tqlayout.margins[i];
     pageBreaking = tqlayout.pageBreaking;
@@ -70,7 +70,7 @@ void KoParagLayout::operator=( const KoParagLayout &tqlayout )
 int KoParagLayout::compare( const KoParagLayout & tqlayout ) const
 {
     int flags = 0;
-    if ( tqalignment != tqlayout.tqalignment )
+    if ( alignment != tqlayout.alignment )
         flags |= Alignment;
     for ( int i = 0 ; i < 5 ; ++i )
         if ( margins[i] != tqlayout.margins[i] )
@@ -119,7 +119,7 @@ int KoParagLayout::compare( const KoParagLayout & tqlayout ) const
 
 void KoParagLayout::initialise()
 {
-    tqalignment = TQt::AlignAuto;
+    alignment = TQt::AlignAuto;
     for ( int i = 0 ; i < 5 ; ++i ) // use memset ?
         margins[i] = 0;
     lineSpacingType = LS_SINGLE;
@@ -172,14 +172,14 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
     qHeapSort( tabList );
     tqlayout.setTabList( tabList );
-    tqlayout.tqalignment = TQt::AlignAuto;
-    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
+    tqlayout.alignment = TQt::AlignAuto;
+    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called alignment internally
     if ( !element.isNull() )
     {
         TQString flow = element.attribute( "align" ); // KWord-1.0 DTD
         if ( !flow.isEmpty() )
         {
-            tqlayout.tqalignment = flow=="right" ? TQt::AlignRight :
+            tqlayout.alignment = flow=="right" ? TQt::AlignRight :
                          flow=="center" ? TQt::AlignHCenter :
                          flow=="justify" ? TQt::AlignJustify :
                          flow=="left" ? TQt::AlignLeft : TQt::AlignAuto;
@@ -197,7 +197,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
             flow = element.attribute( "value" ); // KWord-0.8
             static const int flow2align[] = { TQt::AlignAuto, TQt::AlignRight, TQt::AlignHCenter, TQt::AlignJustify };
             if ( !flow.isEmpty() && flow.toInt() < 4 )
-                tqlayout.tqalignment = flow2align[flow.toInt()];
+                tqlayout.alignment = flow2align[flow.toInt()];
         }
     }
 
@@ -425,12 +425,12 @@ TQt::AlignmentFlags KoParagLayout::loadOasisAlignment( const TQCString& str )
 }
 
 //static
-TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags tqalignment )
+TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags alignment )
 {
-   return tqalignment == TQt::AlignLeft ? "left" :
-       tqalignment == TQt::AlignRight ? "right" :
-       tqalignment == TQt::AlignHCenter ? "center" :
-       tqalignment == TQt::AlignJustify ? "justify" :
+   return alignment == TQt::AlignLeft ? "left" :
+       alignment == TQt::AlignRight ? "right" :
+       alignment == TQt::AlignHCenter ? "center" :
+       alignment == TQt::AlignJustify ? "justify" :
        "start"; // i.e. direction-dependent
 }
 
@@ -443,7 +443,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex
     // code from OoWriterImport::writeLayout
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-align" ) ) {
         TQCString align = context.styleStack().attributeNS( KoXmlNS::fo, "text-align" ).latin1();
-        tqlayout.tqalignment = loadOasisAlignment( align );
+        tqlayout.alignment = loadOasisAlignment( align );
     }
 
     if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { // http://web4.w3.org/TR/xsl/slice7.html#writing-mode
@@ -549,7 +549,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex
                 TQString delimiterChar = tabStop.attributeNS( KoXmlNS::style, "char", TQString() ); // single character
                 if ( !delimiterChar.isEmpty() )
                     tab.alignChar = delimiterChar[0];
-                tab.type = T_DEC_PNT; // "tqalignment on decimal point"
+                tab.type = T_DEC_PNT; // "alignment on decimal point"
             }
             else //if ( type == "left" )
                 tab.type = T_LEFT;
@@ -658,7 +658,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex
     }
 }
 
-void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const
+void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment ) const
 {
     const KoParagLayout& tqlayout = *this; // code moved from somewhere else;)
     TQDomDocument doc = parentElem.ownerDocument();
@@ -672,10 +672,10 @@ void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment
     element = doc.createElement( "FLOW" );
     parentElem.appendChild( element );
 
-    element.setAttribute( "align", tqalignment==TQt::AlignRight ? "right" :
-                          tqalignment==TQt::AlignHCenter ? "center" :
-                          tqalignment==TQt::AlignJustify ? "justify" :
-                          tqalignment==TQt::AlignAuto ? "auto" : "left" ); // Note: styles can have AlignAuto. Not paragraphs.
+    element.setAttribute( "align", alignment==TQt::AlignRight ? "right" :
+                          alignment==TQt::AlignHCenter ? "center" :
+                          alignment==TQt::AlignJustify ? "justify" :
+                          alignment==TQt::AlignAuto ? "auto" : "left" ); // Note: styles can have AlignAuto. Not paragraphs.
 
     if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirR )
         element.setAttribute( "dir", "R" );
@@ -806,7 +806,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment
 
 void KoParagLayout::saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const
 {
-    gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)tqalignment ).data() );
+    gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)alignment ).data() );
     // Don't save the direction for a style, if "auto", so that the
     // auto-determination of direction based on first char, works.
     if ( !savingStyle || (TQChar::Direction) direction != TQChar::DirON )
@@ -863,7 +863,7 @@ void KoParagLayout::saveOasis( KoGenStyle& gs, KoSavingContext& context, bool sa
         case T_RIGHT:
             tabsWriter.addAttribute( "style:type", "right" );
             break;
-        case T_DEC_PNT:  // "tqalignment on decimal point"
+        case T_DEC_PNT:  // "alignment on decimal point"
             tabsWriter.addAttribute( "style:type", "char" );
             if ( !(*it).alignChar.isNull() )
               tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) );
diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h
index 2c9b9dea..c0582b19 100644
--- a/lib/kotext/KoParagLayout.h
+++ b/lib/kotext/KoParagLayout.h
@@ -96,7 +96,7 @@ public:
     char pageBreaking;    // Page breaking flags
     char direction;       // TQChar::Direction
     /// Alignment flag (AlignAuto/AlignLeft/AlignRight/AlignJustify)
-    char tqalignment; // TQt::AlignmentFlags
+    char alignment; // TQt::AlignmentFlags
     KoBorder leftBorder, rightBorder, topBorder, bottomBorder;
 
     /// The background color of the paragraph
@@ -135,7 +135,7 @@ public:
     /** Save this parag tqlayout to XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const;
+    void saveParagLayout( TQDomElement & parentElem, int alignment ) const;
 
     /** Load this parag tqlayout from XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
@@ -151,10 +151,10 @@ public:
     /// @param context the current context
     void saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const;
 
-    /// Convert an tqalignment string into an tqalignment flag (load)
+    /// Convert an alignment string into an alignment flag (load)
     static TQt::AlignmentFlags loadOasisAlignment( const TQCString& str );
-    /// Convert an tqalignment flag into an tqalignment string (save)
-    static TQCString saveOasisAlignment( TQt::AlignmentFlags tqalignment );
+    /// Convert an alignment flag into an alignment string (save)
+    static TQCString saveOasisAlignment( TQt::AlignmentFlags alignment );
 
 private:
     static int getAttribute(const TQDomElement &element, const char *attributeName, int defaultValue) {
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp
index a68c6768..b09fe90e 100644
--- a/lib/kotext/KoParagStyle.cpp
+++ b/lib/kotext/KoParagStyle.cpp
@@ -88,7 +88,7 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst )
 
 void KoParagStyle::saveStyle( TQDomElement & parentElem )
 {
-    m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment );
+    m_paragLayout.saveParagLayout( parentElem, m_paragLayout.alignment );
 
     if ( followingStyle() )
     {
@@ -207,7 +207,7 @@ TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const T
             // This display-name will probably look nicer in OO, but this also means
             // no re-use possible between list styles...
             listStyle.addAttribute( "style:display-name",
-                                    i18n( "Numbering Style for %1" ).tqarg( m_displayName ) );
+                                    i18n( "Numbering Style for %1" ).arg( m_displayName ) );
 
             TQString autoListStyleName = genStyles.lookup( listStyle, "L", KoGenStyles::ForceNumbering );
             gs.addAttribute( "style:list-style-name", autoListStyleName );
@@ -245,7 +245,7 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ )
     if ( !m_parentStyle )
         return;
     if ( !(paragLayoutFlag & KoParagLayout::Alignment) )
-        m_paragLayout.tqalignment = m_parentStyle->paragLayout().tqalignment;
+        m_paragLayout.alignment = m_parentStyle->paragLayout().alignment;
     if ( !(paragLayoutFlag & KoParagLayout::Margins) )
         for ( int i = 0 ; i < 5 ; ++i )
             m_paragLayout.margins[i] = m_parentStyle->paragLayout().margins[i];
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index 374184b3..addbd574 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -375,7 +375,7 @@ bool KoTextCursor::operator==( const KoTextCursor &c ) const
 
 void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<KoTextStringChar> *formatting )
 {
-    string->tqinvalidate( idx );
+    string->invalidate( idx );
     tmpIndex = -1;
     bool justInsert = TRUE;
     TQString s( str );
@@ -420,7 +420,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko
 	    if ( !s.isEmpty() )
 		string->insert( idx, s );
             else
-                string->tqinvalidate( 0 );
+                string->invalidate( 0 );
 
 	    if ( formatting ) {
 		int len = s.length();
@@ -448,7 +448,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko
 	while ( p ) {
 	    p->setParagId( p->prev()->paragId() + 1 );
 	    //p->move( dy );
-	    p->tqinvalidate( 0 );
+	    p->invalidate( 0 );
 	    p = p->next();
 	}
     }
@@ -963,7 +963,7 @@ bool KoTextCursor::remove()
 	    KoTextParag *p = string->next();
 	    delete string;
 	    string = p;
-	    string->tqinvalidate( 0 );
+	    string->invalidate( 0 );
             //// kotext
             string->invalidateCounters();
             ////
@@ -1520,7 +1520,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
     // now construct the reordered string out of the runs...
 
     int numSpaces = 0;
-    // set the correct tqalignment. This is a bit messy....
+    // set the correct alignment. This is a bit messy....
     if( align == TQt::AlignAuto ) {
 	// align according to directionality of the paragraph...
 	if ( text->isRightToLeft() )
diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h
index a5fd6b1a..f3cf9746 100644
--- a/lib/kotext/KoRichText.h
+++ b/lib/kotext/KoRichText.h
@@ -483,7 +483,7 @@ public:
     TQSizePolicy::ExpandData expanding() const;
     bool isEmpty() const;
     void setGeometry( const TQRect& ) ;
-    TQRect tqgeometry() const;
+    TQRect geometry() const;
 
     bool hasHeightForWidth() const;
     int heightForWidth( int ) const;
@@ -502,7 +502,7 @@ public:
     void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected );
 
     TQBrush *backGround() const { return background; }
-    virtual void tqinvalidate();
+    virtual void invalidate();
 
     int verticalAlignmentOffset() const;
     int horizontalAlignmentOffset() const;
@@ -552,7 +552,7 @@ public:
     Placement placement() const { return place; }
     bool isNested() const { return TRUE; }
     void resize( int nwidth );
-    virtual void tqinvalidate();
+    virtual void invalidate();
     /// ## TQString anchorAt( TQPainter* p, int x, int y );
 
     virtual bool enter( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE );
@@ -569,7 +569,7 @@ public:
 
     TQPtrList<KoTextTableCell> tableCells() const { return cells; }
 
-    TQRect tqgeometry() const { return tqlayout ? tqlayout->tqgeometry() : TQRect(); }
+    TQRect geometry() const { return tqlayout ? tqlayout->geometry() : TQRect(); }
     bool isStretching() const { return stretch; }
 
 private:
diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index a41de932..8aaab47b 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -382,8 +382,8 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex,
     {
         replaceWithAttribut( &cursor, index );
     }
-    // Don't tqrepaint if we're doing batch changes
-    bool tqrepaint = options() & KReplaceDialog::PromptOnReplace;
+    // Don't repaint if we're doing batch changes
+    bool repaint = options() & KReplaceDialog::PromptOnReplace;
 
     // Grab replacement string
     TQString rep = text.mid( matchingIndex, replacementLength );
@@ -395,7 +395,7 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex,
     KCommand *cmd = currentTextObj->replaceSelectionCommand(
         &cursor, rep, TQString(),
         KoTextDocument::HighlightSelection,
-        tqrepaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint );
+        repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint );
 
     connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ),
              this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) );
@@ -587,7 +587,7 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC
     m_languageItem->setCurrentText( KoGlobal::languageFromTag( m_ctx->m_language ) );
 
 
-    m_checkVertAlign = new TQCheckBox( i18n( "Vertical tqalignment:" ), page );
+    m_checkVertAlign = new TQCheckBox( i18n( "Vertical alignment:" ), page );
 
     m_familyItem = new KFontCombo(page);
     m_familyItem->setCurrentFont(m_ctx->m_family);
diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp
index f8c93f01..fa0818d8 100644
--- a/lib/kotext/KoStyleCollection.cpp
+++ b/lib/kotext/KoStyleCollection.cpp
@@ -242,7 +242,7 @@ void KoStyleCollection::printDebug() const
         kdDebug() << "Style " << style << "  " << style->name() << "  isOutline=" << style->isOutline() << endl;
         kdDebug() << "   format: " << style->format().key() <<endl;
         static const char * const s_align[] = { "Auto", "Left", "Right", "ERROR", "HCenter", "ERR", "ERR", "ERR", "Justify", };
-        kdDebug() << "  align: " << s_align[(TQt::AlignmentFlags)style->paragLayout().tqalignment] << endl;
+        kdDebug() << "  align: " << s_align[(TQt::AlignmentFlags)style->paragLayout().alignment] << endl;
         if ( style->paragLayout().counter )
             kdDebug() << "  counter level=" << style->paragLayout().counter->depth() << endl;
 
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index 19840621..2c759282 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -345,7 +345,7 @@ void KoStyleManager::updateGUI() {
 void KoStyleManager::updatePreview()
 {
     d->preview->setStyle(m_currentStyle);
-    d->preview->tqrepaint(true);
+    d->preview->repaint(true);
 }
 
 void KoStyleManager::save() {
@@ -408,7 +408,7 @@ TQString KoStyleManager::generateUniqueName()
 void KoStyleManager::addStyle() {
     save();
 
-    TQString str = i18n( "New Style Template (%1)" ).tqarg(numStyles++);
+    TQString str = i18n( "New Style Template (%1)" ).arg(numStyles++);
     if ( m_currentStyle )
     {
         m_currentStyle = new KoParagStyle( *m_currentStyle ); // Create a new style, initializing from the current one
diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h
index af848e1d..84c75349 100644
--- a/lib/kotext/KoStyleManager.h
+++ b/lib/kotext/KoStyleManager.h
@@ -181,7 +181,7 @@ private:
 Font            simple font dia
 Color           simple color dia
 Spacing and Indents     paragraph spacing dia (KWParagDia)
-alignments      KoParagDia tqalignment tab
+alignments      KoParagDia alignment tab
 borders         KoParagDia  borders tab
 numbering       KoParagDia  tab numbering
 tabulators      KoParagDia  tab tabs */
diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp
index fb496836..1b0f1076 100644
--- a/lib/kotext/KoTextCommand.cpp
+++ b/lib/kotext/KoTextCommand.cpp
@@ -211,7 +211,7 @@ KoTextCursor * KoParagFormatCommand::execute( KoTextCursor *c )
     }
     while ( p ) {
         p->setFormat( m_newFormat );
-        p->tqinvalidate(0);
+        p->invalidate(0);
         if ( p->paragId() == lastParag )
             break;
         p = p->next();
diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h
index d232bedc..7df4d515 100644
--- a/lib/kotext/KoTextCustomItem.h
+++ b/lib/kotext/KoTextCustomItem.h
@@ -57,7 +57,7 @@ public:
     virtual bool ownLine() const { return FALSE; }
     // Called for "ownline" items
     virtual void resize( int nwidth ) { width = nwidth; }
-    virtual void tqinvalidate() {};
+    virtual void invalidate() {};
 
     virtual bool isNested() const { return FALSE; }
     virtual int minimumWidth() const { return 0; }
@@ -69,7 +69,7 @@ public:
     int width;
     int height;
 
-    TQRect tqgeometry() const { return TQRect( xpos, ypos, width, height ); }
+    TQRect geometry() const { return TQRect( xpos, ypos, width, height ); }
 
     virtual bool enter( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE );
     virtual bool enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, const TQPoint & );
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index 126568ef..fe20b049 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -154,13 +154,13 @@ int KoTextDocument::widthUsed() const
     KoTextParag *p = fParag;
     int w = 0;
     while ( p ) {
-	int a = p->tqalignment();
+	int a = p->alignment();
 	p->setAlignment( TQt::AlignLeft );
-	p->tqinvalidate( 0 );
+	p->invalidate( 0 );
 	p->format();
 	w = TQMAX( w, p->rect().width() );
 	p->setAlignment( a );
-	p->tqinvalidate( 0 );
+	p->invalidate( 0 );
 	p = p->next();
     }
     return w;
@@ -247,11 +247,11 @@ TQString KoTextDocument::plainText() const
     return buffer;
 }
 
-void KoTextDocument::tqinvalidate()
+void KoTextDocument::invalidate()
 {
     KoTextParag *s = fParag;
     while ( s ) {
-	s->tqinvalidate( 0 );
+	s->invalidate( 0 );
 	s = s->next();
     }
 }
@@ -785,9 +785,9 @@ void KoTextDocument::removeSelectedText( int id, KoTextCursor *cursor )
 	p->move( dy );
         //// kotext
         if ( p->paragLayout().counter )
-            p->paragLayout().counter->tqinvalidate();
+            p->paragLayout().counter->invalidate();
         ////
-	p->tqinvalidate( 0 );
+	p->invalidate( 0 );
 	//p->setEndState( -1 );
 	p = p->next();
     }
diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h
index 5f2a0665..8cf9fd4d 100644
--- a/lib/kotext/KoTextDocument.h
+++ b/lib/kotext/KoTextDocument.h
@@ -94,7 +94,7 @@ public:
     void setFirstParag( KoTextParag *p );
     void setLastParag( KoTextParag *p );
 
-    void tqinvalidate();
+    void invalidate();
 
     //void setPreProcessor( KoTextPreProcessor *sh );
     //KoTextPreProcessor *preProcessor() const;
@@ -189,7 +189,7 @@ public:
 
     //bool focusNextPrevChild( bool next );
 
-    int tqalignment() const;
+    int alignment() const;
     void setAlignment( int a );
 
     int *tabArray() const;
@@ -535,7 +535,7 @@ inline KoTextFormatCollection *KoTextDocument::formatCollection() const
     return fCollection;
 }
 
-inline int KoTextDocument::tqalignment() const
+inline int KoTextDocument::alignment() const
 {
     return align;
 }
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 24214ae4..9b8e8869 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -675,7 +675,7 @@ void KoTextFormat::save( KoGenStyle& gs, KoSavingContext& context, KoTextFormat
 void KoTextFormat::update()
 {
     //kdDebug(32500) << this << " KoTextFormat::update " << fn.family() << " " << pointSize() << endl;
-    m_key = TQString(); // tqinvalidate key, recalc at the next key() call
+    m_key = TQString(); // invalidate key, recalc at the next key() call
     assert( d );
     d->clearCache(); // i.e. recalc at the next screenFont[Metrics]() call
 }
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 7bdfbc0c..d978ba43 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -131,8 +131,8 @@ int KoTextFormatterCore::leftMargin( bool firstLine, bool includeFirstLineMargin
             left += parag->firstLineMargin();
         // Add the width of the paragraph counter - first line of parag only.
         if( parag->counter() &&
-            ( parag->counter()->tqalignment() == TQt::AlignLeft ||
-              parag->counter()->tqalignment() == TQt::AlignAuto ) )
+            ( parag->counter()->alignment() == TQt::AlignLeft ||
+              parag->counter()->alignment() == TQt::AlignAuto ) )
             left += parag->counterWidth(); // in LU pixels
     }
     return left;
@@ -251,9 +251,9 @@ bool KoTextFormatterCore::format()
     bool lastWasNonInlineCustom = FALSE;
     bool abort = false;
 
-    int align = parag->tqalignment();
-    if ( align == TQt::AlignAuto && doc && doc->tqalignment() != TQt::AlignAuto )
-        align = doc->tqalignment();
+    int align = parag->alignment();
+    if ( align == TQt::AlignAuto && doc && doc->alignment() != TQt::AlignAuto )
+        align = doc->alignment();
 
     int col = 0;
 
@@ -810,7 +810,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
         if (space < 0)
             space = 0;
 
-        // do tqalignment Auto == Left in this case
+        // do alignment Auto == Left in this case
         if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) {
             if ( align & TQt::AlignHCenter )
                 space /= 2;
@@ -949,7 +949,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
     // now construct the reordered string out of the runs...
 
     int numSpaces = 0;
-    // set the correct tqalignment. This is a bit messy....
+    // set the correct alignment. This is a bit messy....
     if( align == TQt::AlignAuto ) {
         // align according to directionality of the paragraph...
         if ( text->isRightToLeft() )
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index 8732d71d..06394275 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -602,10 +602,10 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
         return;
     const bool checkNewLine = insertFlags & CheckNewLine;
     const bool removeSelected = ( insertFlags & DoNotRemoveSelected ) == 0;
-    const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0;
+    const bool repaint = ( insertFlags & DoNotRepaint ) == 0;
     //kdDebug(32500) << "KoTextObject::insert txt=" << txt << endl;
     bool tinyRepaint = !checkNewLine;
-    if ( tqrepaint )
+    if ( repaint )
         emit hideCursor();
     if ( textdoc->hasSelection( selectionId, true ) && removeSelected ) {
         kdDebug() << k_funcinfo << "removing selection " << selectionId << endl;
@@ -673,7 +673,7 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
     }
 
     // Speed optimization: if we only type a char, and it doesn't
-    // tqinvalidate the next parag, only format the current one
+    // invalidate the next parag, only format the current one
     // ### This idea is wrong. E.g. when the last parag grows and must create a new page.
 #if 0
     KoTextParag *parag = cursor->parag();
@@ -687,9 +687,9 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
     // Doing this here means callers don't have to do it, and cursor can be positionned correctly.
     ensureFormatted( cursor->parag() );
 
-    // Speed optimization: if we only type a char, only tqrepaint from current line
+    // Speed optimization: if we only type a char, only repaint from current line
     // (In fact the one before. When typing a space, a word could move up to the
-    // line before, we need to tqrepaint it too...)
+    // line before, we need to repaint it too...)
     if ( !checkNewLine && tinyRepaint && !wasChanged )
     {
         // insert() called format() which called setChanged().
@@ -703,12 +703,12 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
         parag->setLineChanged( origLine - 1 ); // if origLine=0, it'll pass -1, which is 'all'
     }
 
-    if ( tqrepaint ) {
+    if ( repaint ) {
         emit repaintChanged( this );
         emit ensureCursorVisible();
         emit showCursor();
-        // we typed the first char of a paragraph in AlignAuto mode -> show correct tqalignment in UI
-        if ( oldCursor.index() == 0 && oldCursor.parag()->tqalignment() == TQt::AlignAuto )
+        // we typed the first char of a paragraph in AlignAuto mode -> show correct alignment in UI
+        if ( oldCursor.index() == 0 && oldCursor.parag()->alignment() == TQt::AlignAuto )
             emit updateUI( true );
 
     }
@@ -722,8 +722,8 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat,
     if ( !removeSelected ) {
         // ## not sure why we do this. I'd prefer leaving the selection unchanged...
         // but then it'd need adjustements in the offsets etc.
-        if ( textdoc->removeSelection( selectionId ) && tqrepaint )
-            selectionChangedNotify(); // does the tqrepaint
+        if ( textdoc->removeSelection( selectionId ) && repaint )
+            selectionChangedNotify(); // does the repaint
     }
     if ( !customItemsMap.isEmpty()
          && !commandName.isNull() /* see replace-selection; #139890 */ ) {
@@ -1066,7 +1066,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat *
             if ( cursor->parag()->length() == 1 ) {
                 newFormat->addRef();
                 cursor->parag()->setFormat( newFormat );
-                cursor->parag()->tqinvalidate(0);
+                cursor->parag()->invalidate(0);
                 cursor->parag()->format();
                 emit repaintChanged( this );
             }
@@ -1146,7 +1146,7 @@ KCommand * KoTextObject::setAlignCommand( KoTextCursor * cursor, int align, KoTe
     if ( protectContent() )
         return 0L;
     if ( !textdoc->hasSelection( selectionId, true ) && cursor &&
-         (int)cursor->parag()->tqalignment() == align )
+         (int)cursor->parag()->alignment() == align )
         return 0L; // No change needed.
 
     emit hideCursor();
@@ -1165,7 +1165,7 @@ KCommand * KoTextObject::setAlignCommand( KoTextCursor * cursor, int align, KoTe
     }
     formatMore( 2 );
     emit repaintChanged( this );
-    undoRedoInfo.newParagLayout.tqalignment = align;
+    undoRedoInfo.newParagLayout.alignment = align;
     KoTextParagCommand *cmd = new KoTextParagCommand(
         textdoc, undoRedoInfo.id, undoRedoInfo.eid,
         undoRedoInfo.oldParagLayouts, undoRedoInfo.newParagLayout,
@@ -1547,7 +1547,7 @@ void KoTextObject::removeSelectedText( KoTextCursor * cursor, KoTextDocument::Se
         undoRedoInfo.clear();
 }
 
-KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint )
+KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool repaint )
 {
     if ( protectContent() )
         return 0L;
@@ -1578,7 +1578,7 @@ KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTex
 
     undoRedoInfo.type = UndoRedoInfo::Invalid; // we don't want clear() to create a command
     undoRedoInfo.clear();
-    if ( tqrepaint )
+    if ( repaint )
         selectionChangedNotify();
     return macroCmd;
 }
@@ -1592,8 +1592,8 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ
     if ( protectContent() )
         return 0L;
     Q_ASSERT( ( insertFlags & DoNotRemoveSelected ) == 0 ); // nonsensical
-    const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace
-    if ( tqrepaint )
+    const bool repaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace
+    if ( repaint )
         emit hideCursor();
     // This could be improved to use a macro command only when there's a selection to remove.
     KMacroCommand * macroCmd = new KMacroCommand( cmdName );
@@ -1604,7 +1604,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ
     format->addRef();
 
     // Remove selected text, if any
-    KCommand* removeSelCmd = removeSelectedTextCommand( cursor, selectionId, tqrepaint );
+    KCommand* removeSelCmd = removeSelectedTextCommand( cursor, selectionId, repaint );
     if ( removeSelCmd )
         macroCmd->addCommand( removeSelCmd );
 
@@ -1625,7 +1625,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ
     format->removeRef();
 
     setLastFormattedParag( c1.parag() );
-    if ( tqrepaint )
+    if ( repaint )
     {
         formatMore( 2 );
         emit repaintChanged( this );
@@ -1645,7 +1645,7 @@ KCommand * KoTextObject::insertParagraphCommand( KoTextCursor *cursor )
     return replaceSelectionCommand( cursor, "\n", TQString(), KoTextDocument::Standard, CheckNewLine );
 }
 
-void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint )
+void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool repaint )
 {
     if ( !m_highlightSelectionAdded )
     {
@@ -1656,20 +1656,20 @@ void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length,
         m_highlightSelectionAdded = true;
     }
 
-    removeHighlight(tqrepaint); // remove previous highlighted selection
+    removeHighlight(repaint); // remove previous highlighted selection
     KoTextCursor cursor( textdoc );
     cursor.setParag( parag );
     cursor.setIndex( index );
     textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor );
     cursor.setIndex( index + length );
     textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor );
-    if ( tqrepaint ) {
+    if ( repaint ) {
         parag->setChanged( true );
         emit repaintChanged( this );
     }
 }
 
-void KoTextObject::removeHighlight(bool tqrepaint)
+void KoTextObject::removeHighlight(bool repaint)
 {
     if ( textdoc->hasSelection( KoTextDocument::HighlightSelection, true ) )
     {
@@ -1677,7 +1677,7 @@ void KoTextObject::removeHighlight(bool tqrepaint)
         oldParag->setChanged( true );
         textdoc->removeSelection( KoTextDocument::HighlightSelection );
     }
-    if ( tqrepaint )
+    if ( repaint )
         emit repaintChanged( this );
 }
 
@@ -1831,7 +1831,7 @@ bool KoTextObject::formatMore( int count /* = 10 */, bool emitAfterFormatting /*
     }
 #ifdef DEBUG_FORMAT_MORE
     TQString id;
-    if ( m_lastFormatted ) id = TQString(" (%1)").tqarg(m_lastFormatted->paragId());
+    if ( m_lastFormatted ) id = TQString(" (%1)").arg(m_lastFormatted->paragId());
     kdDebug(32500) << "formatMore finished formatting. "
                    << " bottom=" << bottom
                    << " m_lastFormatted=" << m_lastFormatted << id
@@ -2041,13 +2041,13 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty
         case KoChangeCaseDia::TitleCase:
             for(uint i=0;i<text.length();i++)
             {
-                if(text.tqat(i)!=' ')
+                if(text.at(i)!=' ')
                 {
-                    TQChar prev = text.tqat(TQMAX(i-1,0));
+                    TQChar prev = text.at(TQMAX(i-1,0));
                     if(i==0 || prev  == ' ' || prev == '\n' || prev == '\t')
-                        text=text.replace(i, 1, text.tqat(i).upper() );
+                        text=text.replace(i, 1, text.at(i).upper() );
                     else
-                        text=text.replace(i, 1, text.tqat(i).lower() );
+                        text=text.replace(i, 1, text.at(i).lower() );
                 }
             }
             break;
@@ -2055,9 +2055,9 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty
             for(uint i=0;i<text.length();i++)
             {
                 TQString repl=TQString(text.at(i));
-                if(text.tqat(i)!=text.tqat(i).upper())
+                if(text.at(i)!=text.at(i).upper())
                     repl=repl.upper();
-                else if(text.tqat(i).lower()!=text.tqat(i))
+                else if(text.at(i).lower()!=text.at(i))
                     repl=repl.lower();
                 text=text.replace(i, 1, repl );
             }
@@ -2069,7 +2069,7 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty
                 {
                     TQChar prev = text.at(TQMAX(i-1,0));
                     if(i==0 || prev == '\n' ||prev.isPunct())
-                        text=text.replace(i, 1, text.tqat(i).upper() );
+                        text=text.replace(i, 1, text.at(i).upper() );
                 }
             }
             break;
@@ -2167,7 +2167,7 @@ KoTextCursor KoTextObject::pasteOasisText( const TQDomElement &bodyElem, KoOasis
                 context.styleStack().restore();
 
                 lastParagraph->setChanged( true );
-                lastParagraph->tqinvalidate( 0 );
+                lastParagraph->invalidate( 0 );
 
                 // Now split this parag, to make room for the next paragraphs
                 resultCursor.setParag( lastParagraph );
@@ -2692,7 +2692,7 @@ KCommand *KoTextFormatInterface::setDefaultFormatCommand()
 KCommand *KoTextFormatInterface::setAlignCommand(int align)
 {
     KoParagLayout format( *currentParagLayoutFormat() );
-    format.tqalignment=align;
+    format.alignment=align;
     return setParagLayoutFormatCommand(&format,KoParagLayout::Alignment);
 }
 
diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h
index 15574075..90693bed 100644
--- a/lib/kotext/KoTextObject.h
+++ b/lib/kotext/KoTextObject.h
@@ -251,7 +251,7 @@ public:
         CheckNewLine = 1, /// < if true, the text to be inserted is checked for '\\n' (as a paragraph delimiter)
         OverwriteMode = 2,
         DoNotRemoveSelected = 4, ///< whether to remove selected text before
-        DoNotRepaint = 8         ///< usually we tqrepaint in insert(), this allows to turn it off
+        DoNotRepaint = 8         ///< usually we repaint in insert(), this allows to turn it off
     };
 
     /**
@@ -286,7 +286,7 @@ public:
                                         KoTextDocument::SelectionId selectionId = KoTextDocument::Standard,
                                         int insertFlags = DefaultInsertFlags, // KDE4: TODO use TQFlags
                                         CustomItemsMap customItemsMap = CustomItemsMap() );
-    KCommand * removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint = true );
+    KCommand * removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool repaint = true );
     KCommand* insertParagraphCommand( KoTextCursor * cursor );
 
     /**
@@ -308,8 +308,8 @@ public:
     /** Highlighting support (for search/replace, spellchecking etc.).
      * Don't forget to ensure the paragraph is visible.
      */
-    void highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint );
-    void removeHighlight( bool tqrepaint );
+    void highlightPortion( KoTextParag * parag, int index, int length, bool repaint );
+    void removeHighlight( bool repaint );
 
     /** Implementation of setFormatCommand from KoTextFormatInterface - apply change to the whole document */
     KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false );
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index a081dfda..aba58abc 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -154,7 +154,7 @@ void KoTextParag::setPrev( KoTextParag *s )
 	doc->setFirstParag( this );
 }
 
-void KoTextParag::tqinvalidate( int /*chr, ignored*/ )
+void KoTextParag::invalidate( int /*chr, ignored*/ )
 {
     m_invalid = true;
 #if 0
@@ -186,7 +186,7 @@ void KoTextParag::setLineChanged( short int line )
 void KoTextParag::insert( int index, const TQString &s )
 {
     str->insert( index, s, formatCollection()->defaultFormat() );
-    tqinvalidate( index );
+    invalidate( index );
     //needPreProcess = TRUE;
 }
 
@@ -209,7 +209,7 @@ void KoTextParag::remove( int index, int len )
 	}
     }
     str->remove( index, len );
-    tqinvalidate( 0 );
+    invalidate( 0 );
     //needPreProcess = TRUE;
 }
 
@@ -252,7 +252,7 @@ void KoTextParag::join( KoTextParag *s )
 	extraData()->join( s->extraData() );
         }*/
     delete s;
-    tqinvalidate( 0 );
+    invalidate( 0 );
     //// kotext
     invalidateCounters();
     ////
@@ -403,14 +403,14 @@ void KoTextParag::format( int start, bool doMove )
 	bool makeInvalid = false; //p && p->lastInFrame;
 	//kdDebug(32500) << "might move of dy=" << dy << ". previous's lastInFrame (=makeInvalid): " << makeInvalid << endl;
 	while ( s && dy ) {
-            if ( s->movedDown ) { // (not in TQRT) : moved down -> tqinvalidate and stop moving down
-                s->tqinvalidate( 0 ); // (there is no point in moving down a parag that has a frame break...)
+            if ( s->movedDown ) { // (not in TQRT) : moved down -> invalidate and stop moving down
+                s->invalidate( 0 ); // (there is no point in moving down a parag that has a frame break...)
                 break;
             }
 	    if ( !s->isFullWidth() )
 		makeInvalid = TRUE;
 	    if ( makeInvalid )
-		s->tqinvalidate( 0 );
+		s->invalidate( 0 );
 	    s->move( dy );
 	    //if ( s->lastInFrame )
             //    makeInvalid = TRUE;
@@ -600,7 +600,7 @@ void KoTextParag::setFormat( int index, int len, const KoTextFormat *_f, bool us
                _f->shadowDistanceX() != of->shadowDistanceX() ||
                _f->shadowDistanceY() != of->shadowDistanceY()
                  ) ) {
-	    tqinvalidate( 0 );
+	    invalidate( 0 );
 	}
 	if ( flags == -1 || flags == KoTextFormat::Format || !fc ) {
 #ifdef DEBUG_COLLECTION
@@ -690,7 +690,7 @@ void KoTextParag::setDirection( TQChar::Direction d )
 {
     if ( str && str->direction() != d ) {
 	str->setDirection( d );
-	tqinvalidate( 0 );
+	invalidate( 0 );
         //// kotext
         m_layout.direction = d;
 	invalidateCounters(); // #47178
@@ -837,7 +837,7 @@ void KoTextParag::lineInfo( int l, int &y, int &h, int &bl ) const
     bl = ( *it )->baseLine;
 }
 
-uint KoTextParag::tqalignment() const
+uint KoTextParag::alignment() const
 {
     return align;
 }
@@ -946,15 +946,15 @@ void KoTextParag::setMargin( TQStyleSheetItem::Margin m, double _i )
     //kdDebug(32500) << "KoTextParag::setMargin " << m << " margin " << _i << endl;
     m_layout.margins[m] = _i;
     if ( m == TQStyleSheetItem::MarginTop && prev() )
-        prev()->tqinvalidate(0);     // for top margin (post-1.1: remove this, not necessary anymore)
-    tqinvalidate(0);
+        prev()->invalidate(0);     // for top margin (post-1.1: remove this, not necessary anymore)
+    invalidate(0);
 }
 
 void KoTextParag::setMargins( const double * margins )
 {
     for ( int i = 0 ; i < 5 ; ++i )
         m_layout.margins[i] = margins[i];
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setAlign( int align )
@@ -962,50 +962,50 @@ void KoTextParag::setAlign( int align )
     Q_ASSERT( align <= TQt::AlignJustify );
     align &= TQt::AlignHorizontal_Mask;
     setAlignment( align );
-    m_layout.tqalignment = align;
+    m_layout.alignment = align;
 }
 
 int KoTextParag::resolveAlignment() const
 {
-    if ( (int)m_layout.tqalignment == TQt::AlignAuto )
+    if ( (int)m_layout.alignment == TQt::AlignAuto )
         return str->isRightToLeft() ? TQt::AlignRight : TQt::AlignLeft;
-    return m_layout.tqalignment;
+    return m_layout.alignment;
 }
 
 void KoTextParag::setLineSpacing( double _i )
 {
     m_layout.setLineSpacingValue(_i);
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setLineSpacingType( KoParagLayout::SpacingType _type )
 {
     m_layout.lineSpacingType = _type;
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setTopBorder( const KoBorder & _brd )
 {
     m_layout.topBorder = _brd;
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setBottomBorder( const KoBorder & _brd )
 {
     m_layout.bottomBorder = _brd;
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setJoinBorder( bool join )
 {
     m_layout.joinBorder = join;
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setBackgroundColor ( const TQColor& color )
 {
     m_layout.backgroundColor = color;
-    tqinvalidate(0);
+    invalidate(0);
 }
 
 void KoTextParag::setNoCounter()
@@ -1060,17 +1060,17 @@ void KoTextParag::invalidateCounters()
 {
     // Invalidate this paragraph and all the following ones
     // (Numbering may have changed)
-    tqinvalidate( 0 );
+    invalidate( 0 );
     if ( m_layout.counter )
-        m_layout.counter->tqinvalidate();
+        m_layout.counter->invalidate();
     KoTextParag *s = next();
     // #### Possible optimization: since any invalidation propagates down,
     // it's enough to stop at the first paragraph with an already-invalidated counter, isn't it?
-    // This is only true if nobody else calls counter->tqinvalidate...
+    // This is only true if nobody else calls counter->invalidate...
     while ( s ) {
         if ( s->m_layout.counter )
-            s->m_layout.counter->tqinvalidate();
-        s->tqinvalidate( 0 );
+            s->m_layout.counter->invalidate();
+        s->invalidate( 0 );
         s = s->next();
     }
 }
@@ -1290,7 +1290,7 @@ int KoTextParag::rightMargin() const
     KoTextZoomHandler * zh = textDocument()->formattingZoomHandler();
     int cw=0;
     if( m_layout.counter && str->isRightToLeft() &&
-    	(( m_layout.counter->tqalignment() == TQt::AlignRight ) || ( m_layout.counter->tqalignment() == TQt::AlignAuto )))
+    	(( m_layout.counter->alignment() == TQt::AlignRight ) || ( m_layout.counter->alignment() == TQt::AlignAuto )))
 	    cw = counterWidth();
 
     return zh->ptToLayoutUnitPixX(
@@ -1603,7 +1603,7 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText
 	    // we flush before custom items
 	    flush = flush || nextchr->isCustom();
 	    // when painting justified we flush on spaces
-	    if ((tqalignment() & TQt::AlignJustify) == TQt::AlignJustify )
+	    if ((alignment() & TQt::AlignJustify) == TQt::AlignJustify )
 		//flush = flush || TQTextFormatter::isBreakable( str, i );
                 flush = flush || chr->whiteSpace;
 	    // when underlining or striking "word by word" we flush before/after spaces
@@ -2104,7 +2104,7 @@ void KoTextParag::setTabList( const KoTabulatorList &tabList )
     {
         setTabArray( 0 );
     }
-    tqinvalidate( 0 );
+    invalidate( 0 );
 }
 
 /** "Reimplemented" (compared to nextTabDefault) to implement non-left-aligned tabs */
@@ -2244,7 +2244,7 @@ void KoTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int
 {
     //kdDebug(32500) << "KoTextParag::setParagLayout flags=" << flags << endl;
     if ( flags & KoParagLayout::Alignment )
-        setAlign( tqlayout.tqalignment );
+        setAlign( tqlayout.alignment );
     if ( flags & KoParagLayout::Margins ) {
         if ( marginIndex == -1 )
             setMargins( tqlayout.margins );
@@ -2290,7 +2290,7 @@ void KoTextParag::setCustomItem( int index, KoTextCustomItem * custom, KoTextFor
     //addCustomItem();
     document()->registerCustomItem( custom, this );
     custom->recalc(); // calc value (e.g. for variables) and set initial size
-    tqinvalidate( 0 );
+    invalidate( 0 );
     setChanged( true );
 }
 
@@ -2349,7 +2349,7 @@ void KoTextParag::printRTDebug( int info )
         static const char * const s_align[] = { "Auto", "Left", "Right", "ERROR", "HCenter", "ERR", "ERR", "ERR", "Justify", };
         static const char * const s_linespacing[] = { "Single", "1.5", "2", "custom", "atLeast", "Multiple", "Fixed" };
         static const char * const s_dir[] = { "DirL", "DirR", "DirEN", "DirES", "DirET", "DirAN", "DirCS", "DirB", "DirS", "DirWS", "DirON", "DirLRE", "DirLRO", "DirAL", "DirRLE", "DirRLO", "DirPDF", "DirNSM", "DirBN" };
-        kdDebug(32500) << "  align: " << s_align[tqalignment()] << "  resolveAlignment: " << s_align[resolveAlignment()]
+        kdDebug(32500) << "  align: " << s_align[alignment()] << "  resolveAlignment: " << s_align[resolveAlignment()]
                   << "  isRTL:" << str->isRightToLeft()
                   << "  dir: " << s_dir[direction()] << endl;
         TQRect pixr = pixelRect( textDocument()->paintingZoomHandler() );
@@ -2906,7 +2906,7 @@ void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context
     setFormat( len - 1, 1, paragFormat(), TRUE );
 
     setChanged( true );
-    tqinvalidate( 0 );
+    invalidate( 0 );
 }
 
 void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 591242a2..f42c3285 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -93,7 +93,7 @@ public:
     void format( int start = -1, bool doMove = TRUE );
 
     /// Call this to ensure that format() will be called on this paragraph later on
-    void tqinvalidate( int chr /*ignored*/ = 0 );
+    void invalidate( int chr /*ignored*/ = 0 );
     /// Returns false if format() needs to be called on this paragraph
     bool isValid() const;
 
@@ -132,7 +132,7 @@ public:
 
     void setAlignment( uint a );
     void setAlignmentDirect( uint a ) { align = a; }
-    uint tqalignment() const;
+    uint alignment() const;
 
     virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
                        int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc
@@ -235,9 +235,9 @@ public:
     void setLineSpacingType( KoParagLayout::SpacingType _type );
 
 
-    /** Use this to change the paragraph tqalignment, not KoTextParag::setAlignment ! */
+    /** Use this to change the paragraph alignment, not KoTextParag::setAlignment ! */
     void setAlign( int align );
-    /** Return the real tqalignment: Auto is resolved to either Left or Right */
+    /** Return the real alignment: Auto is resolved to either Left or Right */
     int resolveAlignment() const;
 
     /// The part of the top margin that can be broken by a page break
@@ -328,7 +328,7 @@ public:
 
     /**
      * Load a section of text from a oasis based xml tree.
-     * @param parent the xml element that has content as tqchildren.
+     * @param parent the xml element that has content as children.
      * @param context the context
      * @param stripLeadingSpace whether to remove leading literal whitespace
      */
@@ -336,7 +336,7 @@ public:
 
     /**
      * Load a section of text from a oasis based xml tree.
-     * @param parent the xml element that has content as tqchildren.
+     * @param parent the xml element that has content as children.
      * @param context the context
      * @param stripLeadingSpace whether to remove leading literal whitespace
      * @param hasTrailingSpace whether there was trailing literal whitespace in the span's text
@@ -525,13 +525,13 @@ inline void KoTextParag::setAlignment( uint a )
     if ( a == align )
 	return;
     align = a;
-    tqinvalidate( 0 );
+    invalidate( 0 );
 }
 
 /*inline void KoTextParag::setListStyle( TQStyleSheetItem::ListStyle ls )
 {
     lstyle = ls;
-    tqinvalidate( 0 );
+    invalidate( 0 );
 }
 
 inline TQStyleSheetItem::ListStyle KoTextParag::listStyle() const
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index e272422d..6211e1d8 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -900,7 +900,7 @@ bool KoTextView::insertParagraph(const TQPoint &pos)
         if ( pos.x() + f->width(' ') >= textDocument()->width())
         {
             //FIXME me bidi.
-            //change parag tqalignment => right tqalignment
+            //change parag alignment => right alignment
             last->setAlignment( TQt::AlignRight );
         }
         else
@@ -1207,7 +1207,7 @@ bool KoTextView::openLink( KoLinkVariable* variable )
     }
     else
     {
-        KMessageBox::sorry( 0, i18n("%1 is not a valid link.").tqarg( variable->url() ) );
+        KMessageBox::sorry( 0, i18n("%1 is not a valid link.").arg( variable->url() ) );
         return false;
     }
 }
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 4b744faf..70eab87e 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -532,7 +532,7 @@ TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type)
             if ( parag )
             {
                 //kdDebug(32500) << "KoDoc::recalcVariables -> invalidating parag " << parag->paragId() << endl;
-                parag->tqinvalidate( 0 );
+                parag->invalidate( 0 );
                 parag->setChanged( true );
             }
         }
@@ -896,7 +896,7 @@ void KoVariable::recalcAndRepaint()
     if ( parag )
     {
         //kdDebug(32500) << "KoVariable::recalcAndRepaint -> invalidating parag " << parag->paragId() << endl;
-        parag->tqinvalidate( 0 );
+        parag->invalidate( 0 );
         parag->setChanged( true );
     }
     textDocument()->emitRepaintChanged();
@@ -1319,9 +1319,9 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context )
         else if ( value.lower() == "localeshort" )
             value = KGlobal::locale()->dateFormatShort();
         else if ( value.lower() == "localedatetime" )
-            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormat() ).tqarg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormat() ).arg( KGlobal::locale()->timeFormat() );
         else if ( value.lower() == "localedatetimeshort" )
-            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormatShort() ).tqarg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormatShort() ).arg( KGlobal::locale()->timeFormat() );
         klocaleFormat = true;
     }
     writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisDateStyle(context.mainStyles(), value, klocaleFormat ) );
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index 88f17975..fce8fc2d 100644
--- a/lib/kotext/KoVariable.h
+++ b/lib/kotext/KoVariable.h
@@ -405,7 +405,7 @@ public:
     TQVariant varValue() const { return m_varValue; }
 
     /**
-     * Ask this variable to recalculate and to tqrepaint itself
+     * Ask this variable to recalculate and to repaint itself
      * Only use this if you're working on a single variable (e.g. popupmenu).
      * Otherwise, better do the repainting all at once.
      * @see KoVariableCollection::recalcVariables()
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index d8a0374e..abb00a29 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -177,10 +177,10 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const
         if ( underscore > -1 ) {
             lang.truncate( underscore );
             if (encodings.find(lang) == encodings.end())
-                throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) );
+                throw KoHyphenatorException( TQString("No dictionary for %1").arg(lang) );
         }
         else
-            throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) );
+            throw KoHyphenatorException( TQString("No dictionary for %1").arg(lang) );
     }
     if (dicts.find(lang) == dicts.end())
     {
@@ -199,11 +199,11 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const
 #ifdef DEBUG_HYPHENATOR
                 kdDebug() << "No dictionary loaded" << endl;
 #endif
-                throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) ));
+                throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").arg(lang) ));
             }
         }
         else
-            throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) ));
+            throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").arg(lang) ));
     }
     return dicts[lang];
 }
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index a13adddb..6721f771 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -89,7 +89,7 @@ void KoTextFormatterTest::speedTest()
     // Format it 50 times
     for ( uint i = 0 ; i < 50 ; ++i )
     {
-      parag->tqinvalidate(0);
+      parag->invalidate(0);
       parag->format();
     }
     doc->clear(false);
diff --git a/lib/kross/api/callable.cpp b/lib/kross/api/callable.cpp
index f095f596..b85aa4cd 100644
--- a/lib/kross/api/callable.cpp
+++ b/lib/kross/api/callable.cpp
@@ -47,26 +47,26 @@ const TQString Callable::getClassName() const
 
 bool Callable::hasChild(const TQString& name) const
 {
-    return m_tqchildren.contains(name);
+    return m_children.contains(name);
 }
 
 Object::Ptr Callable::getChild(const TQString& name) const
 {
-    return m_tqchildren[name];
+    return m_children[name];
 }
 
 TQMap<TQString, Object::Ptr> Callable::getChildren() const
 {
-    return m_tqchildren;
+    return m_children;
 }
 
 bool Callable::addChild(const TQString& name, Object* object)
 {
 #ifdef KROSS_API_OBJECT_ADDCHILD_DEBUG
     krossdebug( TQString("Kross::Api::Callable::addChild() object.name='%1' object.classname='%2'")
-        .tqarg(name).tqarg(object->getClassName()) );
+        .arg(name).arg(object->getClassName()) );
 #endif
-    m_tqchildren.replace(name, Object::Ptr(object));
+    m_children.replace(name, Object::Ptr(object));
     return true;
 }
 
@@ -78,9 +78,9 @@ bool Callable::addChild(Callable* object)
 void Callable::removeChild(const TQString& name)
 {
 #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG
-    krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").tqarg(name) );
+    krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").arg(name) );
 #endif
-    m_tqchildren.remove(name);
+    m_children.remove(name);
 }
 
 void Callable::removeAllChildren()
@@ -88,13 +88,13 @@ void Callable::removeAllChildren()
 #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG
     krossdebug( "Kross::Api::Callable::removeAllChildren()" );
 #endif
-    m_tqchildren.clear();
+    m_children.clear();
 }
 
 Object::Ptr Callable::call(const TQString& name, List::Ptr args)
 {
 #ifdef KROSS_API_CALLABLE_CALL_DEBUG
-    krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").tqarg(name).tqarg(getName()).tqarg(args ? args->toString() : TQString("")) );
+    krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").arg(name).arg(getName()).arg(args ? args->toString() : TQString("")) );
 #endif
 
     if(name.isEmpty()) // return a self-reference if no functionname is defined.
@@ -111,7 +111,7 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args)
         TQString s = Variant::toString(args->item(0));
         Object::Ptr obj = getChild(s);
         if(! obj)
-            throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").tqarg(getName()).tqarg(s)) );
+            throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").arg(getName()).arg(s)) );
         return obj;
     }
     else if(name == "has") {
@@ -123,9 +123,9 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args)
     }
     else if(name == "list") {
         TQStringList list;
-        TQMap<TQString, Object::Ptr> tqchildren = getChildren();
-        TQMap<TQString, Object::Ptr>::Iterator it( tqchildren.begin() );
-        for(; it != tqchildren.end(); ++it)
+        TQMap<TQString, Object::Ptr> children = getChildren();
+        TQMap<TQString, Object::Ptr>::Iterator it( children.begin() );
+        for(; it != children.end(); ++it)
             list.append( it.key() );
         return new Variant(list);
     }
@@ -134,6 +134,6 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args)
     }
 
     // If there exists no such object return NULL.
-    krossdebug( TQString("Object '%1' has no callable object named '%2'.").tqarg(getName()).tqarg(name) );
+    krossdebug( TQString("Object '%1' has no callable object named '%2'.").arg(getName()).arg(name) );
     return 0;
 }
diff --git a/lib/kross/api/callable.h b/lib/kross/api/callable.h
index 63edb067..0e3dd3a6 100644
--- a/lib/kross/api/callable.h
+++ b/lib/kross/api/callable.h
@@ -92,9 +92,9 @@ namespace Kross { namespace Api {
             Object::Ptr getChild(const TQString& name) const;
 
             /**
-             * Return all tqchildren.
+             * Return all children.
              *
-             * \return A \a ObjectMap of tqchildren this Object has.
+             * \return A \a ObjectMap of children this Object has.
              */
             TQMap<TQString, Object::Ptr> getChildren() const;
 
@@ -125,7 +125,7 @@ namespace Kross { namespace Api {
             void removeChild(const TQString& name);
 
             /**
-             * Remove all tqchildren.
+             * Remove all children.
              */
             void removeAllChildren();
 
@@ -138,7 +138,7 @@ namespace Kross { namespace Api {
             /// Name this callable object has.
             TQString m_name;
             /// A list of childobjects.
-            TQMap<TQString, Object::Ptr> m_tqchildren;
+            TQMap<TQString, Object::Ptr> m_children;
     };
 
 }}
diff --git a/lib/kross/api/class.h b/lib/kross/api/class.h
index de1d898c..6224a61a 100644
--- a/lib/kross/api/class.h
+++ b/lib/kross/api/class.h
@@ -76,7 +76,7 @@ namespace Kross { namespace Api {
             /*
             virtual Object::Ptr call(const TQString& name, List::Ptr arguments)
             {
-                krossdebug( TQString("Class::call(%1)").tqarg(name) );
+                krossdebug( TQString("Class::call(%1)").arg(name) );
                 return Event<T>::call(name, arguments);
             }
             */
diff --git a/lib/kross/api/event.h b/lib/kross/api/event.h
index 26a92117..b75107f7 100644
--- a/lib/kross/api/event.h
+++ b/lib/kross/api/event.h
@@ -201,13 +201,13 @@ namespace Kross { namespace Api {
             virtual Object::Ptr call(const TQString& name, List::Ptr arguments)
             {
 #ifdef KROSS_API_EVENT_CALL_DEBUG
-                krossdebug( TQString("Event::call() name='%1' getName()='%2'").tqarg(name).tqarg(getName()) );
+                krossdebug( TQString("Event::call() name='%1' getName()='%2'").arg(name).arg(getName()) );
 #endif
 
                 Function* function = m_functions[name];
                 if(function) {
 #ifdef KROSS_API_EVENT_CALL_DEBUG
-                    krossdebug( TQString("Event::call() name='%1' is a builtin function.").tqarg(name) );
+                    krossdebug( TQString("Event::call() name='%1' is a builtin function.").arg(name) );
 #endif
                     return function->call(arguments);
                 }
diff --git a/lib/kross/api/eventscript.cpp b/lib/kross/api/eventscript.cpp
index 43c4c1cb..f9fe9f9a 100644
--- a/lib/kross/api/eventscript.cpp
+++ b/lib/kross/api/eventscript.cpp
@@ -40,7 +40,7 @@ const TQString EventScript::getClassName() const
 
 Object::Ptr EventScript::call(const TQString& name, KSharedPtr<List> arguments)
 {
-    krossdebug( TQString("EventScript::call() name=%1 arguments=%2").tqarg(name).tqarg(arguments->toString()) );
+    krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) );
     //TODO
     return 0;
 }
diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp
index 86e868f5..8f4d2c50 100644
--- a/lib/kross/api/eventsignal.cpp
+++ b/lib/kross/api/eventsignal.cpp
@@ -46,7 +46,7 @@ const TQString EventSignal::getClassName() const
 Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> arguments)
 {
 #ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG
-    krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").tqarg(m_signal).tqarg(arguments->toString()) );
+    krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) );
 #endif
 
     TQString n = m_signal;
@@ -56,7 +56,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen
 
     int signalid = m_sender->metaObject()->findSignal(n.latin1(), false);
     if(signalid < 0)
-        throw new Exception(TQString("No such signal '%1'.").tqarg(n));
+        throw new Exception(TQString("No such signal '%1'.").arg(n));
 
     TQUObject* uo = QtObject::toTQUObject(n, arguments);
     m_sender->qt_emit(signalid, uo); // emit the signal
diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp
index 56616904..3f6482db 100644
--- a/lib/kross/api/eventslot.cpp
+++ b/lib/kross/api/eventslot.cpp
@@ -46,7 +46,7 @@ const TQString EventSlot::getClassName() const
 Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments)
 {
 #ifdef KROSS_API_EVENTSLOT_CALL_DEBUG
-    krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").tqarg(m_slot).tqarg(arguments->toString()) );
+    krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").arg(m_slot).arg(arguments->toString()) );
 #endif
 
     TQString n = m_slot; //TODO name; //Variant::toString(args->item(0));
@@ -56,7 +56,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments)
 
     int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false);
     if(slotid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) );
+        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(n)) );
 
     TQUObject* uo = QtObject::toTQUObject(n, arguments);
     m_receiver->qt_invoke(slotid, uo); // invoke the slot
@@ -72,7 +72,7 @@ TQCString EventSlot::getSlot(const TQCString& signal)
     int startpos = signature.find("(");
     int endpos = signature.findRev(")");
     if(startpos < 0 || startpos > endpos) {
-        krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").tqarg(signal) );
+        krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").arg(signal) );
         return TQCString();
     }
     TQString signalname = signature.left(startpos);
@@ -83,13 +83,13 @@ TQCString EventSlot::getSlot(const TQCString& signal)
     TQMetaObject* mo = metaObject();
     int slotid = mo->findSlot(slot, false);
     if(slotid < 0) {
-        krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(slot) );
+        krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").arg(signal).arg(slot) );
         return TQCString();
     }
 
     const TQMetaData* md = mo->slot(slotid, false);
     if(md->access != TQMetaData::Public) {
-        krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").tqarg(signal).tqarg(slot) );
+        krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").arg(signal).arg(slot) );
         return TQCString();
     }
 
@@ -97,7 +97,7 @@ TQCString EventSlot::getSlot(const TQCString& signal)
 //const TQUMethod *method = md->method;
 
     krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5")
-        .tqarg(signal).tqarg(slot).tqarg(slotid).tqarg(params).tqarg(md->name) );
+        .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) );
     return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1".
 }
 
@@ -114,7 +114,7 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T
         EventSlot* eventslot = create(eventmanager);
         eventslot->connect(eventmanager, senderobj, signal, function, slot);
         m_slots.append(eventslot);
-        krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").tqarg(senderobj->name()).tqarg(signal).tqarg(function) );
+        krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").arg(senderobj->name()).arg(signal).arg(function) );
     }
     else {
         m_sender = senderobj;
@@ -122,10 +122,10 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T
         m_function = function;
         m_slot = myslot;
         if(! TQObject::connect((TQObject*)senderobj, signal, this, myslot)) {
-            krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) );
+            krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").arg(senderobj->name()).arg(signal).arg(function) );
             return false;
         }
-        krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) );
+        krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").arg(senderobj->name()).arg(signal).arg(function) );
     }
     return true;
 }
@@ -144,7 +144,7 @@ bool EventSlot::disconnect()
 void EventSlot::call(const TQVariant& variant)
 {
     krossdebug( TQString("EventSlot::call() sender='%1' signal='%2' function='%3'")
-                 .tqarg(m_sender->name()).tqarg(m_signal).tqarg(m_function) );
+                 .arg(m_sender->name()).arg(m_signal).arg(m_function) );
 
     Kross::Api::List* arglist = 0;
 
@@ -159,7 +159,7 @@ void EventSlot::call(const TQVariant& variant)
     }
     catch(Exception& e) {
         //TODO add hadError(), getError() and setError()
-        krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").tqarg(variant.toString()).tqarg(e.type()).tqarg(e.description()) );
+        krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").arg(variant.toString()).arg(e.type()).arg(e.description()) );
     }
 }
 
diff --git a/lib/kross/api/exception.cpp b/lib/kross/api/exception.cpp
index c6a0198f..cb0125c4 100644
--- a/lib/kross/api/exception.cpp
+++ b/lib/kross/api/exception.cpp
@@ -30,7 +30,7 @@ Exception::Exception(const TQString& error, long lineno)
     , m_error(error)
     , m_lineno(lineno)
 {
-    krosswarning( TQString("Kross::Api::Exception error='%1' lineno='%3'").tqarg(m_error).tqarg(m_lineno) );
+    krosswarning( TQString("Kross::Api::Exception error='%1' lineno='%3'").arg(m_error).arg(m_lineno) );
 }
 
 Exception::~Exception()
@@ -45,8 +45,8 @@ const TQString Exception::getClassName() const
 const TQString Exception::toString()
 {
     return (m_lineno != -1)
-        ? TQString("Exception at line %1: %2").tqarg(m_lineno).tqarg(m_error)
-        : TQString("Exception: %1").tqarg(m_error);
+        ? TQString("Exception at line %1: %2").arg(m_lineno).arg(m_error)
+        : TQString("Exception: %1").arg(m_error);
 }
 
 const TQString Exception::getError() const
diff --git a/lib/kross/api/interpreter.cpp b/lib/kross/api/interpreter.cpp
index 8d266930..86eae479 100644
--- a/lib/kross/api/interpreter.cpp
+++ b/lib/kross/api/interpreter.cpp
@@ -95,7 +95,7 @@ Interpreter* InterpreterInfo::getInterpreter()
     if(m_interpreter) // buffered
         return m_interpreter;
 
-    krossdebug( TQString("Loading the interpreter library for %1").tqarg(m_interpretername) );
+    krossdebug( TQString("Loading the interpreter library for %1").arg(m_interpretername) );
 
     // Load the krosspython library.
     KLibLoader *libloader = KLibLoader::self();
@@ -104,10 +104,10 @@ Interpreter* InterpreterInfo::getInterpreter()
     if(! library) {
         /*
         setException(
-            new Exception( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").tqarg(m_library).tqarg(m_interpretername) )
+            new Exception( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").arg(m_library).arg(m_interpretername) )
         );
         */
-        krosswarning( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").tqarg(m_library).tqarg(m_interpretername) );
+        krosswarning( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").arg(m_library).arg(m_interpretername) );
         return 0;
     }
 
diff --git a/lib/kross/api/list.cpp b/lib/kross/api/list.cpp
index 3d894116..9e2baf52 100644
--- a/lib/kross/api/list.cpp
+++ b/lib/kross/api/list.cpp
@@ -51,8 +51,8 @@ Object::Ptr List::item(uint idx, Object* defaultobject)
     if(idx >= list.count()) {
         if(defaultobject)
             return defaultobject;
-        krossdebug( TQString("List::item index=%1 is out of bounds. Raising TypeException.").tqarg(idx) );
-        throw Exception::Ptr( new Exception(TQString("List-index %1 out of bounds.").tqarg(idx)) );
+        krossdebug( TQString("List::item index=%1 is out of bounds. Raising TypeException.").arg(idx) );
+        throw Exception::Ptr( new Exception(TQString("List-index %1 out of bounds.").arg(idx)) );
     }
     return list[idx];
 }
diff --git a/lib/kross/api/module.h b/lib/kross/api/module.h
index 3e58305a..f27bdf5c 100644
--- a/lib/kross/api/module.h
+++ b/lib/kross/api/module.h
@@ -51,7 +51,7 @@ namespace Kross { namespace Api {
             explicit Module(const TQString& name)
                 : Class<Module>(name)
             {
-                krossdebug( TQString("Kross::Api::Module %1 created").tqarg(name) );
+                krossdebug( TQString("Kross::Api::Module %1 created").arg(name) );
             }
 
             /**
@@ -59,7 +59,7 @@ namespace Kross { namespace Api {
              */
             virtual ~Module()
             {
-                krossdebug( TQString("Kross::Api::Module %1 destroyed").tqarg(getName()) );
+                krossdebug( TQString("Kross::Api::Module %1 destroyed").arg(getName()) );
             }
 
             /**
diff --git a/lib/kross/api/object.cpp b/lib/kross/api/object.cpp
index 06ec55d5..43fa8b4b 100644
--- a/lib/kross/api/object.cpp
+++ b/lib/kross/api/object.cpp
@@ -30,21 +30,21 @@ Object::Object()
     : KShared()
 {
 #ifdef KROSS_API_OBJECT_CTOR_DEBUG
-    krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) );
+    krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) );
 #endif
 }
 
 Object::~Object()
 {
 #ifdef KROSS_API_OBJECT_DTOR_DEBUG
-    krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) );
+    krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) );
 #endif
     //removeAllChildren(); // not needed cause we use KShared to handle ref-couting and freeing.
 }
 
 const TQString Object::toString()
 {
-    return TQString("%1").tqarg(getClassName());
+    return TQString("%1").arg(getClassName());
 }
 
 Object::Ptr Object::call(const TQString& name, List::Ptr arguments)
@@ -52,12 +52,12 @@ Object::Ptr Object::call(const TQString& name, List::Ptr arguments)
     Q_UNUSED(arguments);
 
 #ifdef KROSS_API_OBJECT_CALL_DEBUG
-    krossdebug( TQString("Kross::Api::Object::call(%1) name=%2 class=%3").tqarg(name).tqarg(getName()).tqarg(getClassName()) );
+    krossdebug( TQString("Kross::Api::Object::call(%1) name=%2 class=%3").arg(name).arg(getName()).arg(getClassName()) );
 #endif
 
     if(name.isEmpty()) // return a self-reference if no functionname is defined.
         return this;
 
-    throw Exception::Ptr( new Exception(TQString("No callable object named '%2'").tqarg(name)) );
+    throw Exception::Ptr( new Exception(TQString("No callable object named '%2'").arg(name)) );
 }
 
diff --git a/lib/kross/api/object.h b/lib/kross/api/object.h
index 87bd2132..f23a6179 100644
--- a/lib/kross/api/object.h
+++ b/lib/kross/api/object.h
@@ -142,7 +142,7 @@ template<class T> inline T* Object::fromObject(Object::Ptr object)
 {
     T* t = (T*) object.data();
     if(! t)
-        throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").tqarg(object ? object->getClassName() : "")) );
+        throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) );
     return t;
 }
 
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 04736e2a..5fc1a36a 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -93,7 +93,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
     int startpos = signature.find("(");
     int endpos = signature.findRev(")");
     if(startpos < 0 || startpos > endpos)
-        throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").tqarg(signature)) );
+        throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").arg(signature)) );
 
     //TQString sig = signature.left(startpos);
     TQString params = signature.mid(startpos + 1, endpos - startpos - 1);
@@ -107,19 +107,19 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
 
 //TQString t;
 //for(int j=0; j<argcount; j++) t += "'" + Variant::toString(arguments->item(j)) + "' ";
-//krossdebug( TQString("1 ---------------------: (%1) %2").tqarg(argcount).tqarg(t) );
+//krossdebug( TQString("1 ---------------------: (%1) %2").arg(argcount).arg(t) );
 
     // Fill parameters.
     uint argcount = arguments ? arguments->count() : 0;
     for(uint i = 0; i < paramcount; i++) {
         if(paramlist[i].find(TQSTRING_OBJECT_NAME_STRING) >= 0) {
             const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString();
-            //krossdebug(TQString("EventSlot::toTQUObject s=%1").tqarg(s));
+            //krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s));
             static_TQUType_TQString.set( &(uo[i + 1]), s );
         }
         //TODO handle int, long, char*, TQStringList, etc.
         else {
-            throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").tqarg(paramlist[i]).tqarg(signature)) );
+            throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").arg(paramlist[i]).arg(signature)) );
         }
     }
 
@@ -175,7 +175,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
     TQString name = Kross::Api::Variant::toString(args->item(0));
     int slotid = m_object->metaObject()->findSlot(name.latin1(), false);
     if(slotid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) );
+        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(name)) );
 
     TQUObject* uo = QtObject::toTQUObject(name, args);
     m_object->qt_invoke(slotid, uo);
@@ -203,7 +203,7 @@ Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args)
     TQString name = Kross::Api::Variant::toString(args->item(0));
     int signalid = m_object->metaObject()->findSignal(name.latin1(), false);
     if(signalid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) );
+        throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").arg(name)) );
     m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject*
     return 0;
 }
@@ -211,16 +211,16 @@ Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::connectSignal(Kross::Api::List::Ptr args)
 {
     TQString signalname = Kross::Api::Variant::toString(args->item(0));
-    TQString signalsignatur = TQString("2%1").tqarg(signalname);
+    TQString signalsignatur = TQString("2%1").arg(signalname);
     const char* signalsig = signalsignatur.latin1();
 
     QtObject* obj = Kross::Api::Object::fromObject<Kross::Api::QtObject>(args->item(1));
     TQObject* o = obj->getObject();
     if(! o)
-        throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").tqarg(obj->getName())) );
+        throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").arg(obj->getName())) );
 
     TQString slotname = Kross::Api::Variant::toString(args->item(2));
-    TQString slotsignatur = TQString("1%1").tqarg(slotname);
+    TQString slotsignatur = TQString("1%1").arg(slotname);
     const char* slotsig = slotsignatur.latin1();
 
     return new Kross::Api::Variant(
diff --git a/lib/kross/api/variant.cpp b/lib/kross/api/variant.cpp
index e8d8bc1b..54e8ed7e 100644
--- a/lib/kross/api/variant.cpp
+++ b/lib/kross/api/variant.cpp
@@ -81,7 +81,7 @@ const TQString Variant::toString(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::String))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::String expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::String expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toString();
 }
 
@@ -89,7 +89,7 @@ int Variant::toInt(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::Int))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Int expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Int expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toInt();
 }
 
@@ -97,7 +97,7 @@ uint Variant::toUInt(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::UInt))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::UInt expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::UInt expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toUInt();
 }
 
@@ -105,7 +105,7 @@ double Variant::toDouble(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::Double))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Double expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Double expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toDouble();
 }
 
@@ -113,7 +113,7 @@ TQ_LLONG Variant::toLLONG(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::LongLong))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::LLONG expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::LLONG expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toLongLong();
 }
 
@@ -121,7 +121,7 @@ TQ_ULLONG Variant::toULLONG(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::ULongLong))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::ULLONG expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::ULLONG expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toULongLong();
 }
 
@@ -129,7 +129,7 @@ bool Variant::toBool(Object::Ptr object)
 {
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::Bool))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Bool expected, but got %1.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Bool expected, but got %1.").arg(variant.typeName()).latin1()) );
     return variant.toBool();
 }
 
@@ -146,7 +146,7 @@ TQStringList Variant::toStringList(Object::Ptr object)
     }
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::StringList))
-        throw Exception::Ptr( new Exception(TQString("Kross::Api::Variant::StringList expected, but got '%1'.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(TQString("Kross::Api::Variant::StringList expected, but got '%1'.").arg(variant.typeName()).latin1()) );
     return variant.toStringList();
 }
 
@@ -163,6 +163,6 @@ TQValueList<TQVariant> Variant::toList(Object::Ptr object)
     }
     const TQVariant& variant = toVariant(object);
     if(! variant.canCast(TQVariant::List))
-        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::List expected, but got '%1'.").tqarg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::List expected, but got '%1'.").arg(variant.typeName()).latin1()) );
     return variant.toList();
 }
diff --git a/lib/kross/main/mainmodule.cpp b/lib/kross/main/mainmodule.cpp
index dde74502..8c29180f 100644
--- a/lib/kross/main/mainmodule.cpp
+++ b/lib/kross/main/mainmodule.cpp
@@ -79,7 +79,7 @@ EventSignal::Ptr MainModule::addSignal(const TQString& name, TQObject* sender, T
 {
     EventSignal* event = new EventSignal(name, sender, signal);
     if(! addChild(name, event)) {
-        krosswarning( TQString("Failed to add signal name='%1' signature='%2'").tqarg(name).tqarg(signal.data()) );
+        krosswarning( TQString("Failed to add signal name='%1' signature='%2'").arg(name).arg(signal.data()) );
         return 0;
     }
     return event;
@@ -89,7 +89,7 @@ EventSlot::Ptr MainModule::addSlot(const TQString& name, TQObject* receiver, TQC
 {
     EventSlot* event = new EventSlot(name, receiver, slot);
     if(! addChild(name, event)) {
-        krosswarning( TQString("Failed to add slot name='%1' signature='%2'").tqarg(name).tqarg(slot.data()) );
+        krosswarning( TQString("Failed to add slot name='%1' signature='%2'").arg(name).arg(slot.data()) );
         return 0;
     }
     return event;
@@ -99,7 +99,7 @@ QtObject::Ptr MainModule::addTQObject(TQObject* object, const TQString& name)
 {
     QtObject* qtobject = new QtObject(object, name);
     if(! addChild(name, qtobject)) {
-        krosswarning( TQString("Failed to add TQObject name='%1'").tqarg(object->name()) );
+        krosswarning( TQString("Failed to add TQObject name='%1'").arg(object->name()) );
         return 0;
     }
     return qtobject;
@@ -109,7 +109,7 @@ EventAction::Ptr MainModule::addKAction(KAction* action, const TQString& name)
 {
     EventAction* event = new EventAction(name, action);
     if(! addChild(name, event)) {
-        krosswarning( TQString("Failed to add KAction name='%1'").tqarg(action->name()) );
+        krosswarning( TQString("Failed to add KAction name='%1'").arg(action->name()) );
         return 0;
     }
     return event;
diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp
index 646a8746..156eb2ac 100644
--- a/lib/kross/main/manager.cpp
+++ b/lib/kross/main/manager.cpp
@@ -169,7 +169,7 @@ Interpreter* Manager::getInterpreter(const TQString& interpretername)
     setException(0); // clear previous exceptions
 
     if(! d->interpreterinfos.contains(interpretername)) {
-        setException( new Exception(i18n("No such interpreter '%1'").tqarg(interpretername)) );
+        setException( new Exception(i18n("No such interpreter '%1'").arg(interpretername)) );
         return 0;
     }
 
@@ -206,22 +206,22 @@ Module::Ptr Manager::loadModule(const TQString& modulename)
         if(module)
             return module;
         else
-            krossdebug( TQString("Manager::loadModule(%1) =======> Modulename registered, but module is invalid!").tqarg(modulename) );
+            krossdebug( TQString("Manager::loadModule(%1) =======> Modulename registered, but module is invalid!").arg(modulename) );
     }
 
     KLibLoader* loader = KLibLoader::self();
     KLibrary* lib = loader->globalLibrary( modulename.latin1() );
     if(! lib) {
-        krosswarning( TQString("Failed to load module '%1': %2").tqarg(modulename).tqarg(loader->lastErrorMessage()) );
+        krosswarning( TQString("Failed to load module '%1': %2").arg(modulename).arg(loader->lastErrorMessage()) );
         return 0;
     }
-    krossdebug( TQString("Successfully loaded module '%1'").tqarg(modulename) );
+    krossdebug( TQString("Successfully loaded module '%1'").arg(modulename) );
 
     def_module_func func;
     func = (def_module_func) lib->symbol("init_module");
 
     if(! func) {
-        krosswarning( TQString("Failed to determinate init function in module '%1'").tqarg(modulename) );
+        krosswarning( TQString("Failed to determinate init function in module '%1'").arg(modulename) );
         return 0;
     }
 
@@ -235,14 +235,14 @@ Module::Ptr Manager::loadModule(const TQString& modulename)
     lib->unload();
 
     if(! module) {
-        krosswarning( TQString("Failed to load module '%1'").tqarg(modulename) );
+        krosswarning( TQString("Failed to load module '%1'").arg(modulename) );
         return 0;
     }
 
     // Don't remember module cause we like to have freeing it handled by the caller.
     //d->modules.replace(modulename, module);
 
-    //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").tqarg(modulename).tqarg(module->toString()) );
+    //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").arg(modulename).arg(module->toString()) );
     return module;
 }
 
diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp
index b658a0b1..f7e11618 100644
--- a/lib/kross/main/scriptaction.cpp
+++ b/lib/kross/main/scriptaction.cpp
@@ -152,9 +152,9 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement&
         if(icon.isNull())
             icon = KMimeType::iconForURL( KURL(file) );
         if(description.isEmpty())
-            description = TQString("%1<br>%2").tqarg(text.isEmpty() ? name : text).tqarg(file);
+            description = TQString("%1<br>%2").arg(text.isEmpty() ? name : text).arg(file);
         else
-            description += TQString("<br>%1").tqarg(file);
+            description += TQString("<br>%1").arg(file);
         ScriptContainer::setName(file);
     }
 
@@ -230,8 +230,8 @@ void ScriptAction::activate()
         TQString errormessage = Kross::Api::ScriptContainer::getException()->getError();
         TQString tracedetails = Kross::Api::ScriptContainer::getException()->getTrace();
         d->logs << TQString("<b>%1</b><br>%2")
-                   .tqarg( TQStyleSheet::escape(errormessage) )
-                   .tqarg( TQStyleSheet::escape(tracedetails) );
+                   .arg( TQStyleSheet::escape(errormessage) )
+                   .arg( TQStyleSheet::escape(tracedetails) );
         emit failed(errormessage, tracedetails);
     }
     else {
diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp
index a345dd02..7f7f980e 100644
--- a/lib/kross/main/scriptcontainer.cpp
+++ b/lib/kross/main/scriptcontainer.cpp
@@ -87,7 +87,7 @@ ScriptContainer::ScriptContainer(const TQString& name)
     : MainModule(name)
     , d( new ScriptContainerPrivate() ) // initialize d-pointer class
 {
-    //krossdebug( TQString("ScriptContainer::ScriptContainer() Ctor name='%1'").tqarg(name) );
+    //krossdebug( TQString("ScriptContainer::ScriptContainer() Ctor name='%1'").arg(name) );
 
     d->script = 0;
     d->name = name;
@@ -95,7 +95,7 @@ ScriptContainer::ScriptContainer(const TQString& name)
 
 ScriptContainer::~ScriptContainer()
 {
-    //krossdebug( TQString("ScriptContainer::~ScriptContainer() Dtor name='%1'").tqarg(d->name) );
+    //krossdebug( TQString("ScriptContainer::~ScriptContainer() Dtor name='%1'").arg(d->name) );
 
     finalize();
     delete d;
@@ -164,8 +164,8 @@ bool ScriptContainer::setOption(const TQString name, const TQVariant& value)
         if(info->hasOption(name)) {
             d->options.replace(name, value);
             return true;
-        } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such option").tqarg(name).tqarg(value.toString()) );
-    } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such interpreterinfo").tqarg(name).tqarg(value.toString()) );
+        } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such option").arg(name).arg(value.toString()) );
+    } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such interpreterinfo").arg(name).arg(value.toString()) );
     return false;
 }
 
@@ -244,19 +244,19 @@ bool ScriptContainer::initialize()
     finalize();
 
     if(! d->scriptfile.isNull()) {
-        krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").tqarg(d->scriptfile) );
+        krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").arg(d->scriptfile) );
 
         if(d->interpretername.isNull()) {
             d->interpretername = Manager::scriptManager()->getInterpreternameForFile( d->scriptfile );
             if(d->interpretername.isNull()) {
-                setException( new Exception(i18n("Failed to determinate interpreter for scriptfile '%1'").tqarg(d->scriptfile)) );
+                setException( new Exception(i18n("Failed to determinate interpreter for scriptfile '%1'").arg(d->scriptfile)) );
                 return false;
             }
         }
 
         TQFile f( d->scriptfile );
         if(! f.open(IO_ReadOnly)) {
-            setException( new Exception(i18n("Failed to open scriptfile '%1'").tqarg(d->scriptfile)) );
+            setException( new Exception(i18n("Failed to open scriptfile '%1'").arg(d->scriptfile)) );
             return false;
         }
         d->code = TQString( f.readAll() );
@@ -265,13 +265,13 @@ bool ScriptContainer::initialize()
 
     Interpreter* interpreter = Manager::scriptManager()->getInterpreter(d->interpretername);
     if(! interpreter) {
-        setException( new Exception(i18n("Unknown interpreter '%1'").tqarg(d->interpretername)) );
+        setException( new Exception(i18n("Unknown interpreter '%1'").arg(d->interpretername)) );
         return false;
     }
 
     d->script = interpreter->createScript(this);
     if(! d->script) {
-        setException( new Exception(i18n("Failed to create script for interpreter '%1'").tqarg(d->interpretername)) );
+        setException( new Exception(i18n("Failed to create script for interpreter '%1'").arg(d->interpretername)) );
         return false;
     }
     if(d->script->hadException()) {
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index bce26d5c..88877f5a 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -147,10 +147,10 @@ void ScriptGUIClient::reloadInstalledScripts()
 
 bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
 {
-    krossdebug( TQString("Install script package: %1").tqarg(scriptpackagefile) );
+    krossdebug( TQString("Install script package: %1").arg(scriptpackagefile) );
     KTar archive( scriptpackagefile );
     if(! archive.open(IO_ReadOnly)) {
-        KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").tqarg(scriptpackagefile));
+        KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").arg(scriptpackagefile));
         return false;
     }
 
@@ -167,17 +167,17 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
 
     if( TQDir(destination).exists() ) {
         if( KMessageBox::warningContinueCancel(0,
-            i18n("A script package with the name \"%1\" already exists. Replace this package?" ).tqarg(packagename),
+            i18n("A script package with the name \"%1\" already exists. Replace this package?" ).arg(packagename),
             i18n("Replace")) != KMessageBox::Continue )
                 return false;
 
         if(! KIO::NetAccess::del(destination, 0) ) {
-            KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(destination));
+            KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(destination));
             return false;
         }
     }
 
-    krossdebug( TQString("Copy script-package to destination directory: %1").tqarg(destination) );
+    krossdebug( TQString("Copy script-package to destination directory: %1").arg(destination) );
     const KArchiveDirectory* archivedir = archive.directory();
     archivedir->copyTo(destination, true);
 
@@ -188,7 +188,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
 bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath)
 {
     if(! KIO::NetAccess::del(scriptpackagepath, 0) ) {
-        KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(scriptpackagepath));
+        KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(scriptpackagepath));
         return false;
     }
     reloadInstalledScripts();
@@ -197,18 +197,18 @@ bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath)
 
 bool ScriptGUIClient::loadScriptConfigFile(const TQString& scriptconfigfile)
 {
-    krossdebug( TQString("ScriptGUIClient::loadScriptConfig file=%1").tqarg(scriptconfigfile) );
+    krossdebug( TQString("ScriptGUIClient::loadScriptConfig file=%1").arg(scriptconfigfile) );
 
     TQDomDocument domdoc;
     TQFile file(scriptconfigfile);
     if(! file.open(IO_ReadOnly)) {
-        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").tqarg(scriptconfigfile) );
+        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").arg(scriptconfigfile) );
         return false;
     }
     bool ok = domdoc.setContent(&file);
     file.close();
     if(! ok) {
-        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").tqarg(scriptconfigfile) );
+        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").arg(scriptconfigfile) );
         return false;
     }
 
@@ -244,7 +244,7 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile,
                 else {
                     // else just print a warning and fall through (so, install the action
                     // and don't care any longer of the duplicated name)...
-                    krosswarning( TQString("Kross::Api::ScriptGUIClient::loadScriptConfigDocument: There exists already a scriptaction with name \"%1\". Added anyway...").tqarg(action->name()) );
+                    krosswarning( TQString("Kross::Api::ScriptGUIClient::loadScriptConfigDocument: There exists already a scriptaction with name \"%1\". Added anyway...").arg(action->name()) );
                 }
             }
             installedcollection->attach( action );
@@ -353,7 +353,7 @@ bool ScriptGUIClient::executeScriptFile()
 
 bool ScriptGUIClient::executeScriptFile(const TQString& file)
 {
-    krossdebug( TQString("Kross::Api::ScriptGUIClient::executeScriptFile() file='%1'").tqarg(file) );
+    krossdebug( TQString("Kross::Api::ScriptGUIClient::executeScriptFile() file='%1'").arg(file) );
 
     ScriptAction::Ptr action = new ScriptAction(file);
     return executeScriptAction(action);
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index cb696c5a..e521023e 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -95,7 +95,7 @@ class ToolTip : public TQToolTip
             if(item) {
                 TQRect r( m_parent->itemRect(item) );
                 if(r.isValid() && item->action()) {
-                    tip(r, TQString("<qt>%1</qt>").tqarg(item->action()->toolTip()));
+                    tip(r, TQString("<qt>%1</qt>").arg(item->action()->toolTip()));
                 }
             }
         }
@@ -287,7 +287,7 @@ void WdgScriptsManager::slotUninstallScript()
 
     if( KMessageBox::warningContinueCancel(0,
         i18n("Uninstall the script package \"%1\" and delete the package's folder \"%2\"?")
-            .tqarg(item->action()->text()).tqarg(packagepath),
+            .arg(item->action()->text()).arg(packagepath),
         i18n("Uninstall")) != KMessageBox::Continue )
     {
         return;
@@ -321,7 +321,7 @@ void WdgScriptsManager::slotGetNewScript()
 {
 #ifdef KROSS_SUPPORT_NEWSTUFF
     const TQString appname = KApplication::kApplication()->name();
-    const TQString type = TQString("%1/script").tqarg(appname);
+    const TQString type = TQString("%1/script").arg(appname);
 
     if(! d->newstuff) {
         d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type);
@@ -336,7 +336,7 @@ void WdgScriptsManager::slotGetNewScript()
     TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)),
                      d, TQT_SLOT(slotProviders(Provider::List*)));
 
-    p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").tqarg(appname));
+    p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").arg(appname));
     d->exec();
 #endif
 }
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 900a347b..3aa790e6 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.hxx
@@ -54,7 +54,7 @@ namespace Py
 	// The purpose of this class is to serve as the most general kind of
 	// Python object, for the purpose of writing C++ extensions in Python
 	// Objects hold a PyObject* which they own. This pointer is always a
-	// valid pointer to a Python object. In tqchildren we must maintain this behavior.
+	// valid pointer to a Python object. In children we must maintain this behavior.
 	//
 	// Instructions on how to make your own class MyType descended from Object:
 	// (0) Pick a base class, either Object or perhaps SeqBase<T> or MapBase<T>.
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index 7213ad70..e162e601 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -303,7 +303,7 @@ returned by such a function, you need to know if the function returns you an <i>
 or <i>unowned</i> reference. Unowned references are unusual but there are some cases where
 unowned references are returned.</p>
 
-<p>Usually, <cite>Object</cite> and its tqchildren acquire a new reference when constructed from a
+<p>Usually, <cite>Object</cite> and its children acquire a new reference when constructed from a
 <cite>PyObject *</cite>. This is usually not the right behavior if the reference comes from one
 of the Python C API calls.</p>
 
@@ -1571,7 +1571,7 @@ converted to a standard string which is passed to std::ostream&amp; operator&lt;
 <p>The Python exception facility and the C++ exception facility can be merged via the use
 of try/catch blocks in the bodies of extension objects and module functions.</p>
 
-<h3>Class Exception and its tqchildren</h3>
+<h3>Class Exception and its children</h3>
 
 <p>A set of classes is provided. Each is derived from class Exception, and represents a
 particular sort of Python exception, such as IndexError, RuntimeError, ValueError. Each of
@@ -1612,7 +1612,7 @@ classes are shown here.</p>
   </tr>
   <tr>
     <td class=code></td>
-    <td>Constructors for other tqchildren of class Exception</td>
+    <td>Constructors for other children of class Exception</td>
   </tr>
   <tr>
     <td class=code> </td>
diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp
index f13cf93a..9d8c3ece 100644
--- a/lib/kross/python/pythonextension.cpp
+++ b/lib/kross/python/pythonextension.cpp
@@ -31,7 +31,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object)
     , m_object(object)
 {
 #ifdef KROSS_PYTHON_EXTENSION_CTOR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) );
 #endif
 
     behaviors().name("KrossPythonExtension");
@@ -55,7 +55,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object)
 PythonExtension::~PythonExtension()
 {
 #ifdef KROSS_PYTHON_EXTENSION_DTOR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) );
 #endif
     delete m_proxymethod;
 }
@@ -77,7 +77,7 @@ Py::Object PythonExtension::repr()
 Py::Object PythonExtension::getattr(const char* n)
 {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").tqarg(n) );
+    krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").arg(n) );
 #endif
 
     if(n[0] == '_') {
@@ -86,7 +86,7 @@ Py::Object PythonExtension::getattr(const char* n)
             TQStringList calls = m_object->getCalls();
             for(TQStringList::Iterator it = calls.begin(); it != calls.end(); ++it) {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-                krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").tqarg(n).tqarg(*it) );
+                krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").arg(n).arg(*it) );
 #endif
                 methods.append(Py::String( (*it).latin1() ));
             }
@@ -97,11 +97,11 @@ Py::Object PythonExtension::getattr(const char* n)
             Py::List members;
             Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(m_object.data());
             if(callable) {
-                TQMap<TQString, Kross::Api::Object::Ptr> tqchildren = callable->getChildren();
-                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( tqchildren.begin() );
-                for(; it != tqchildren.end(); ++it) {
+                TQMap<TQString, Kross::Api::Object::Ptr> children = callable->getChildren();
+                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( children.begin() );
+                for(; it != children.end(); ++it) {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").tqarg(n).tqarg(it.key()) );
+                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").arg(n).arg(it.key()) );
 #endif
                     members.append(Py::String( it.key().latin1() ));
                 }
@@ -109,11 +109,11 @@ Py::Object PythonExtension::getattr(const char* n)
             return members;
         }
 
-        //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").tqarg(n) ); return Py::None(); }
-        //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").tqarg(n) ); return Py::None(); }
+        //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").arg(n) ); return Py::None(); }
+        //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").arg(n) ); return Py::None(); }
 
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").tqarg(n) );
+        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").arg(n) );
 #endif
         return Py::PythonExtension<PythonExtension>::getattr_methods(n);
     }
@@ -130,7 +130,7 @@ Py::Object PythonExtension::getattr(const char* n)
 Py::Object PythonExtension::getattr_methods(const char* n)
 {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTRMETHOD_DEBUG
-    krossdebug( TQString("PythonExtension::getattr_methods name=%1").tqarg(n) );
+    krossdebug( TQString("PythonExtension::getattr_methods name=%1").arg(n) );
 #endif
     return Py::PythonExtension<PythonExtension>::getattr_methods(n);
 }
@@ -138,7 +138,7 @@ Py::Object PythonExtension::getattr_methods(const char* n)
 int PythonExtension::setattr(const char* name, const Py::Object& value)
 {
 #ifdef KROSS_PYTHON_EXTENSION_SETATTR_DEBUG
-    krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").tqarg(name).tqarg(value.as_string().c_str()) );
+    krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").arg(name).arg(value.as_string().c_str()) );
 #endif
     return Py::PythonExtension<PythonExtension>::setattr(name, value);
 }
@@ -185,13 +185,13 @@ Kross::Api::Dict::Ptr PythonExtension::toObject(const Py::Dict& dict)
 Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").tqarg(object.as_string().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").arg(object.as_string().c_str()) );
 #endif
     if(object == Py::None())
         return 0;
     PyTypeObject *type = (PyTypeObject*) object.type().ptr();
 #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").tqarg(type->tp_name) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").arg(type->tp_name) );
 #endif
     if(type == &PyInt_Type)
         return new Kross::Api::Variant(int(Py::Int(object)));
@@ -287,7 +287,7 @@ const Py::List PythonExtension::toPyObject(const TQValueList<TQVariant>& list)
 const Py::Object PythonExtension::toPyObject(const TQVariant& variant)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").tqarg(variant.typeName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").arg(variant.typeName()) );
 #endif
 
     switch(variant.type()) {
@@ -331,7 +331,7 @@ const Py::Object PythonExtension::toPyObject(const TQVariant& variant)
         } break;
 
         default: {
-            krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").tqarg(variant.typeName()) );
+            krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").arg(variant.typeName()) );
             return Py::None();
         }
     }
@@ -350,7 +350,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
     if(classname == "Kross::Api::Variant") {
         TQVariant v = static_cast<Kross::Api::Variant*>( object.data() )->getValue();
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").tqarg(v.toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").arg(v.toString()) );
 #endif
         return toPyObject(v);
     }
@@ -382,7 +382,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
     }
 
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").tqarg(object->getClassName()) );
+    krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").arg(object->getClassName()) );
 #endif
     return Py::asObject( new PythonExtension(object) );
 }
@@ -390,7 +390,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object)
 const Py::Tuple PythonExtension::toPyTuple(Kross::Api::List::Ptr list)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").tqarg(list ? list->getName() : "NULL") );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").arg(list ? list->getName() : "NULL") );
 #endif
     uint count = list ? list->count() : 0;
     Py::Tuple tuple(count);
@@ -409,20 +409,20 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject
         Kross::Api::List::Ptr arguments = toObject( Py::Tuple(args) );
 
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").tqarg(methodname).tqarg(arguments->toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").arg(methodname).arg(arguments->toString()) );
 #endif
 
         Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(self->m_object.data());
         if(callable && callable->hasChild(methodname)) {
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-            krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) );
+            krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").arg(methodname).arg(self->m_object->getName()) );
 #endif
             Py::Object result = toPyObject( callable->getChild(methodname)->call(TQString(), arguments) );
             result.increment_reference_count();
             return result.ptr();
         }
 #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").arg(methodname).arg(self->m_object->getName()) );
 #endif
         Py::Object result = toPyObject( self->m_object->call(methodname, arguments) );
         result.increment_reference_count();
@@ -430,12 +430,12 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject
     }
     catch(Py::Exception& e) {
         const TQString err = Py::value(e).as_string().c_str();
-        krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) );
+        krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) );
         //throw e;
     }
     catch(Kross::Api::Exception::Ptr e) {
         const TQString err = e->toString();
-        krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) );
+        krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) );
         // Don't throw here cause it will end in a crash deep in python. The
         // error is already handled anyway.
         //throw Py::Exception( (char*) e->toString().latin1() );
diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp
index 23f4b8fb..ded5dbc9 100644
--- a/lib/kross/python/pythoninterpreter.cpp
+++ b/lib/kross/python/pythoninterpreter.cpp
@@ -122,14 +122,14 @@ PythonInterpreter::PythonInterpreter(Kross::Api::InterpreterInfo* info)
     // Set the extended sys.path.
     PySys_SetPath( (char*) path.latin1() );
 
-    krossdebug(TQString("Python ProgramName: %1").tqarg(Py_GetProgramName()));
-    krossdebug(TQString("Python ProgramFullPath: %1").tqarg(Py_GetProgramFullPath()));
-    krossdebug(TQString("Python Version: %1").tqarg(Py_GetVersion()));
-    krossdebug(TQString("Python Platform: %1").tqarg(Py_GetPlatform()));
-    krossdebug(TQString("Python Prefix: %1").tqarg(Py_GetPrefix()));
-    krossdebug(TQString("Python ExecPrefix: %1").tqarg(Py_GetExecPrefix()));
-    krossdebug(TQString("Python Path: %1").tqarg(Py_GetPath()));
-    krossdebug(TQString("Python System Path: %1").tqarg(path));
+    krossdebug(TQString("Python ProgramName: %1").arg(Py_GetProgramName()));
+    krossdebug(TQString("Python ProgramFullPath: %1").arg(Py_GetProgramFullPath()));
+    krossdebug(TQString("Python Version: %1").arg(Py_GetVersion()));
+    krossdebug(TQString("Python Platform: %1").arg(Py_GetPlatform()));
+    krossdebug(TQString("Python Prefix: %1").arg(Py_GetPrefix()));
+    krossdebug(TQString("Python ExecPrefix: %1").arg(Py_GetExecPrefix()));
+    krossdebug(TQString("Python Path: %1").arg(Py_GetPath()));
+    krossdebug(TQString("Python System Path: %1").arg(path));
 
     // Initialize the main module.
     d->mainmodule = new PythonModule(this);
@@ -179,7 +179,7 @@ PythonInterpreter::PythonInterpreter(Kross::Api::InterpreterInfo* info)
     PyObject* pyrun = PyRun_String(s.latin1(), Py_file_input, moduledict.ptr(), moduledict.ptr());
     if(! pyrun) {
         Py::Object errobj = Py::value(Py::Exception()); // get last error
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to prepare the __main__ module: %1").tqarg(errobj.as_string().c_str())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to prepare the __main__ module: %1").arg(errobj.as_string().c_str())) );
     }
     Py_XDECREF(pyrun); // free the reference.
 
diff --git a/lib/kross/python/pythonmodule.cpp b/lib/kross/python/pythonmodule.cpp
index 24b43159..48131bb8 100644
--- a/lib/kross/python/pythonmodule.cpp
+++ b/lib/kross/python/pythonmodule.cpp
@@ -65,7 +65,7 @@ PythonModule::PythonModule(PythonInterpreter* interpreter)
 PythonModule::~PythonModule()
 {
 #ifdef KROSS_PYTHON_MODULE_DEBUG
-    krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").tqarg(name().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").arg(name().c_str()) );
 #endif
 
     delete d;
@@ -82,16 +82,16 @@ Py::Object PythonModule::import(const Py::Tuple& args)
         TQString modname = args[0].as_string().c_str();
         if(modname.startsWith("kross")) {
 #ifdef KROSS_PYTHON_MODULE_DEBUG
-            krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").tqarg(modname) );
+            krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").arg(modname) );
 #endif
             if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
-                krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) );
+                krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) );
             }
             else {
                 Kross::Api::Module::Ptr module = Kross::Api::Manager::scriptManager()->loadModule(modname);
                 if(module)
                     return PythonExtension::toPyObject( Kross::Api::Object::Ptr(module) );
-                krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) );
+                krosswarning( TQString("Loading of Kross module '%1' failed.").arg(modname) );
             }
 
         }
diff --git a/lib/kross/python/pythonobject.cpp b/lib/kross/python/pythonobject.cpp
index 9689d222..e72ad0bb 100644
--- a/lib/kross/python/pythonobject.cpp
+++ b/lib/kross/python/pythonobject.cpp
@@ -46,7 +46,7 @@ PythonObject::PythonObject(const Py::Object& object)
         if(o.isSequence()) t += "isSequence ";
         if(o.isTrue()) t += "isTrue ";
         if(o.isInstance()) t += "isInstance ";
-        krossdebug( TQString("PythonObject::PythonObject() method '%1' (%2)").tqarg( (*i).str().as_string().c_str() ).tqarg(t) );
+        krossdebug( TQString("PythonObject::PythonObject() method '%1' (%2)").arg( (*i).str().as_string().c_str() ).arg(t) );
 
         if(o.isCallable())
             m_calls.append( (*i).str().as_string().c_str() );
@@ -64,7 +64,7 @@ const TQString PythonObject::getClassName() const
 
 Kross::Api::Object::Ptr PythonObject::call(const TQString& name, Kross::Api::List::Ptr arguments)
 {
-    krossdebug( TQString("PythonObject::call(%1)").tqarg(name) );
+    krossdebug( TQString("PythonObject::call(%1)").arg(name) );
 
     if(m_pyobject.isInstance()) {
         //if(! m_calls.contains(n)) throw ...
@@ -72,11 +72,11 @@ Kross::Api::Object::Ptr PythonObject::call(const TQString& name, Kross::Api::Lis
         PyObject* r = PyObject_CallMethod(m_pyobject.ptr(), (char*) name.latin1(), 0);
         if(! r) { //FIXME happens too if e.g. number of arguments doesn't match !!!
             Py::Object errobj = Py::value(Py::Exception()); // get last error
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to call method '%1': %2").tqarg(name).tqarg(errobj.as_string().c_str())) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to call method '%1': %2").arg(name).arg(errobj.as_string().c_str())) );
         }
         Py::Object result(r, true);
 
-        //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").tqarg(name).tqarg(result.as_string().c_str()) );
+        //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").arg(name).arg(result.as_string().c_str()) );
         return PythonExtension::toObject(result);
     }
     /*TODO??? ELSE create class instance for class-definitions???
diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp
index 2329a1d1..8887e13d 100644
--- a/lib/kross/python/pythonscript.cpp
+++ b/lib/kross/python/pythonscript.cpp
@@ -88,7 +88,7 @@ void PythonScript::initialize()
 
     try {
         if(m_scriptcontainer->getCode().isNull())
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid scripting code for script '%1'").tqarg( m_scriptcontainer->getName() )) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid scripting code for script '%1'").arg( m_scriptcontainer->getName() )) );
 
         if(m_scriptcontainer->getName().isNull())
             throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Name for the script is invalid!")) );
@@ -96,10 +96,10 @@ void PythonScript::initialize()
         PyObject* pymod = PyModule_New( (char*) m_scriptcontainer->getName().latin1() );
         d->m_module = new Py::Module(pymod, true);
         if(! d->m_module)
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize local module context for script '%1'").tqarg( m_scriptcontainer->getName() )) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize local module context for script '%1'").arg( m_scriptcontainer->getName() )) );
 
 #ifdef KROSS_PYTHON_SCRIPT_INIT_DEBUG
-        krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(d->m_module->reference_count()) );
+        krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) );
 #endif
 
         // Set the "self" variable to point to the ScriptContainer
@@ -131,7 +131,7 @@ void PythonScript::initialize()
         PyObject* code = 0;
         bool restricted = m_scriptcontainer->getOption("restricted", TQVariant(false,0), true).toBool();
 
-        krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").tqarg(m_scriptcontainer->getName()).tqarg(restricted) );
+        krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").arg(m_scriptcontainer->getName()).arg(restricted) );
         if(restricted) {
 
             // Use the RestrictedPython module wrapped by the PythonSecurity class.
@@ -160,7 +160,7 @@ void PythonScript::initialize()
     }
     catch(Py::Exception& e) {
         TQString err = Py::value(e).as_string().c_str();
-        Kross::Api::Exception::Ptr exception = toException( TQString("Failed to compile python code: %1").tqarg(err) );
+        Kross::Api::Exception::Ptr exception = toException( TQString("Failed to compile python code: %1").arg(err) );
         e.clear(); // exception is handled. clear it now.
         throw exception;
     }
@@ -170,7 +170,7 @@ void PythonScript::finalize()
 {
 #ifdef KROSS_PYTHON_SCRIPT_FINALIZE_DEBUG
     if(d->m_module)
-        krossdebug( TQString("PythonScript::finalize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(d->m_module->reference_count()) );
+        krossdebug( TQString("PythonScript::finalize() module='%1' refcount='%2'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) );
 #endif
 
     delete d->m_module; d->m_module = 0;
@@ -205,7 +205,7 @@ Kross::Api::Exception::Ptr PythonScript::toException(const TQString& error)
         catch(Py::Exception& e) {
             TQString err = Py::value(e).as_string().c_str();
             e.clear(); // exception is handled. clear it now.
-            krosswarning( TQString("Kross::Python::PythonScript::toException() Failed to fetch a traceback: %1").tqarg(err) );
+            krosswarning( TQString("Kross::Python::PythonScript::toException() Failed to fetch a traceback: %1").arg(err) );
         }
 
         PyObject *next;
@@ -226,7 +226,7 @@ Kross::Api::Exception::Ptr PythonScript::toException(const TQString& error)
 
             //const char* filename = PyString_AsString(frame->f_code->co_filename);
             //const char* name = PyString_AsString(frame->f_code->co_name);
-            //errorlist.append( TQString("%1#%2: \"%3\"").tqarg(filename).tqarg(lineno).tqarg(name) );
+            //errorlist.append( TQString("%1#%2: \"%3\"").arg(filename).arg(lineno).arg(name) );
 
             next = PyObject_GetAttrString(traceback, "tb_next");
             Py_DECREF(traceback);
@@ -318,20 +318,20 @@ Kross::Api::Object::Ptr PythonScript::execute()
         Py::Object result(pyresult, true);
 
 #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG
-        krossdebug( TQString("PythonScript::execute() result=%1").tqarg(result.as_string().c_str()) );
+        krossdebug( TQString("PythonScript::execute() result=%1").arg(result.as_string().c_str()) );
 #endif
 
         for(Py::Dict::iterator it = moduledict.begin(); it != moduledict.end(); ++it) {
             Py::Dict::value_type vt(*it);
             if(PyClass_Check( vt.second.ptr() )) {
 #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG
-                krossdebug( TQString("PythonScript::execute() class '%1' added.").tqarg(vt.first.as_string().c_str()) );
+                krossdebug( TQString("PythonScript::execute() class '%1' added.").arg(vt.first.as_string().c_str()) );
 #endif
                 d->m_classes.append( vt.first.as_string().c_str() );
             }
             else if(vt.second.isCallable()) {
 #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG
-                krossdebug( TQString("PythonScript::execute() function '%1' added.").tqarg(vt.first.as_string().c_str()) );
+                krossdebug( TQString("PythonScript::execute() function '%1' added.").arg(vt.first.as_string().c_str()) );
 #endif
                 d->m_functions.append( vt.first.as_string().c_str() );
             }
@@ -347,13 +347,13 @@ Kross::Api::Object::Ptr PythonScript::execute()
                 errobj = Py::type(e);
             TQString err = errobj.as_string().c_str();
 
-            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(err) );
+            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").arg(err) );
             e.clear(); // exception is handled. clear it now.
             setException( exception );
         }
         catch(Py::Exception& e) {
             TQString err = Py::value(e).as_string().c_str();
-            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(err) );
+            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").arg(err) );
             e.clear(); // exception is handled. clear it now.
             setException( exception );
         }
@@ -369,8 +369,8 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross::
 {
 #ifdef KROSS_PYTHON_SCRIPT_CALLFUNC_DEBUG
     krossdebug( TQString("PythonScript::callFunction(%1, %2)")
-                 .tqarg(name)
-                 .tqarg(args ? TQString::number(args->count()) : TQString("NULL")) );
+                 .arg(name)
+                 .arg(args ? TQString::number(args->count()) : TQString("NULL")) );
 #endif
 
     if(hadException()) return 0; // abort if we had an unresolved exception.
@@ -387,7 +387,7 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross::
         PyObject* func = PyDict_GetItemString(moduledict.ptr(), name.latin1());
 
         if( (! d->m_functions.contains(name)) || (! func) )
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").arg(name)) );
 
         Py::Callable funcobject(func, true); // the funcobject takes care of freeing our func pyobject.
 
@@ -402,7 +402,7 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross::
     catch(Py::Exception& e) {
         TQString err = Py::value(e).as_string().c_str();
         e.clear(); // exception is handled. clear it now.
-        setException( new Kross::Api::Exception(TQString("Python Exception: %1").tqarg(err)) );
+        setException( new Kross::Api::Exception(TQString("Python Exception: %1").arg(err)) );
     }
     catch(Kross::Api::Exception::Ptr e) {
         setException(e);
@@ -433,16 +433,16 @@ Kross::Api::Object::Ptr PythonScript::classInstance(const TQString& name)
         // Try to determinate the class.
         PyObject* pyclass = PyDict_GetItemString(moduledict.ptr(), name.latin1());
         if( (! d->m_classes.contains(name)) || (! pyclass) )
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").tqarg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").arg(name)) );
 
         PyObject *pyobj = PyInstance_New(pyclass, 0, 0);//aclarg, 0);
         if(! pyobj)
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to create instance of class '%1'.").tqarg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to create instance of class '%1'.").arg(name)) );
 
         Py::Object classobject(pyobj, true);
 
 #ifdef KROSS_PYTHON_SCRIPT_CLASSINSTANCE_DEBUG
-        krossdebug( TQString("PythonScript::classInstance() inst='%1'").tqarg(classobject.as_string().c_str()) );
+        krossdebug( TQString("PythonScript::classInstance() inst='%1'").arg(classobject.as_string().c_str()) );
 #endif
         return PythonExtension::toObject(classobject);
     }
diff --git a/lib/kross/python/pythonsecurity.cpp b/lib/kross/python/pythonsecurity.cpp
index 941ed0c6..9a7712cb 100644
--- a/lib/kross/python/pythonsecurity.cpp
+++ b/lib/kross/python/pythonsecurity.cpp
@@ -90,7 +90,7 @@ void PythonSecurity::initRestrictedPython()
     catch(Py::Exception& e) {
         TQString err = Py::value(e).as_string().c_str();
         e.clear();
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize PythonSecurity module: %1").tqarg(err) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize PythonSecurity module: %1").arg(err) ) );
     }
 }
 
@@ -115,12 +115,12 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr
 
         PyObject* func = PyDict_GetItemString(m_pymodule->getDict().ptr(), "compile_restricted");
         if(! func)
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg("compile_restricted")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").arg("compile_restricted")) );
 
         Py::Callable funcobject(func, true); // the funcobject takes care of freeing our func pyobject.
 
         if(! funcobject.isCallable())
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' is not callable.").tqarg("compile_restricted")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' is not callable.").arg("compile_restricted")) );
 
         Py::Tuple args(3);
         args[0] = Py::String(source.utf8());
@@ -140,17 +140,17 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr
         /*
         Py::List ml = mainmoduledict;
         for(Py::List::size_type mi = 0; mi < ml.length(); ++mi) {
-            krossdebug( TQString("dir() = %1").tqarg( ml[mi].str().as_string().c_str() ) );
-            //krossdebug( TQString("dir().dir() = %1").tqarg( Py::Object(ml[mi]).dir().as_string().c_str() ) );
+            krossdebug( TQString("dir() = %1").arg( ml[mi].str().as_string().c_str() ) );
+            //krossdebug( TQString("dir().dir() = %1").arg( Py::Object(ml[mi]).dir().as_string().c_str() ) );
         }
         */
 
         Py::Object code(pycode);
-        krossdebug( TQString("%1 callable=%2").tqarg(code.as_string().c_str()).tqarg(PyCallable_Check(code.ptr())) );
+        krossdebug( TQString("%1 callable=%2").arg(code.as_string().c_str()).arg(PyCallable_Check(code.ptr())) );
         Py::List l = code.dir();
         for(Py::List::size_type i = 0; i < l.length(); ++i) {
-            krossdebug( TQString("dir() = %1").tqarg( l[i].str().as_string().c_str() ) );
-            //krossdebug( TQString("dir().dir() = %1").tqarg( Py::Object(l[i]).dir().as_string().c_str() ) );
+            krossdebug( TQString("dir() = %1").arg( l[i].str().as_string().c_str() ) );
+            //krossdebug( TQString("dir().dir() = %1").arg( Py::Object(l[i]).dir().as_string().c_str() ) );
         }
 
         return pycode;
@@ -158,7 +158,7 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr
     catch(Py::Exception& e) { 
         TQString err = Py::value(e).as_string().c_str();
         e.clear();
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' failed with python exception: %2").tqarg("compile_restricted").tqarg(err) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' failed with python exception: %2").arg("compile_restricted").arg(err) ) );
     }
 }
 
diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp
index 6c2cb40f..98474bf6 100644
--- a/lib/kross/ruby/rubyextension.cpp
+++ b/lib/kross/ruby/rubyextension.cpp
@@ -66,7 +66,7 @@ VALUE RubyExtension::call_method( Kross::Api::Object::Ptr object, int argc, VALU
     TQString funcname = rb_id2name(SYM2ID(argv[0]));
     TQValueList<Api::Object::Ptr> argsList;
 #ifdef KROSS_RUBY_EXTENSION_DEBUG
-    krossdebug(TQString("Building arguments list for function: %1 there are %2 arguments.").tqarg(funcname).tqarg(argc-1));
+    krossdebug(TQString("Building arguments list for function: %1 there are %2 arguments.").arg(funcname).arg(argc-1));
 #endif
     for(int i = 1; i < argc; i++)
     {
@@ -79,13 +79,13 @@ VALUE RubyExtension::call_method( Kross::Api::Object::Ptr object, int argc, VALU
             Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(object.data());
             if(callable && callable->hasChild(funcname)) {
 #ifdef KROSS_RUBY_EXTENSION_DEBUG
-                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing name='%1' is a child object of '%2'.").tqarg(funcname).tqarg(object->getName()) );
+                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing name='%1' is a child object of '%2'.").arg(funcname).arg(object->getName()) );
 #endif
                 result = callable->getChild(funcname)->call(TQString(), new Api::List(argsList));
             }
             else {
 #ifdef KROSS_RUBY_EXTENSION_DEBUG
-                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing try to call function with name '%1' in object '%2'.").tqarg(funcname).tqarg(object->getName()) );
+                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing try to call function with name '%1' in object '%2'.").arg(funcname).arg(object->getName()) );
 #endif
                 result = object->call(funcname, new Api::List(argsList));
             }
@@ -184,7 +184,7 @@ VALUE RubyExtension::convertFromException(Kross::Api::Exception::Ptr exc)
 Kross::Api::Object::Ptr RubyExtension::toObject(VALUE value)
 {
 #ifdef KROSS_RUBY_EXTENSION_DEBUG
-    krossdebug(TQString("RubyExtension::toObject of type %1").tqarg(TYPE(value)));
+    krossdebug(TQString("RubyExtension::toObject of type %1").arg(TYPE(value)));
 #endif
     switch( TYPE( value ) )
     {
@@ -251,7 +251,7 @@ Kross::Api::Object::Ptr RubyExtension::toObject(VALUE value)
         case T_MODULE:
         case T_ICLASS:
         case T_CLASS:
-            krosswarning(TQString("This ruby type '%1' cannot be converted to a Kross::Api::Object").tqarg(TYPE(value)));
+            krosswarning(TQString("This ruby type '%1' cannot be converted to a Kross::Api::Object").arg(TYPE(value)));
         default:
         case T_NIL:
             return 0;
@@ -329,7 +329,7 @@ VALUE RubyExtension::toVALUE(const TQVariant& variant)
         case TQVariant::ULongLong:
             return UINT2NUM((unsigned long)variant.toULongLong());
         default: {
-            krosswarning( TQString("Kross::Ruby::RubyExtension::toVALUE(TQVariant) Not possible to convert the TQVariant type '%1' to a VALUE.").tqarg(variant.typeName()) );
+            krosswarning( TQString("Kross::Ruby::RubyExtension::toVALUE(TQVariant) Not possible to convert the TQVariant type '%1' to a VALUE.").arg(variant.typeName()) );
             return Qundef;
         }
     }
diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp
index 4a4df32f..6af8ecbe 100644
--- a/lib/kross/ruby/rubyinterpreter.cpp
+++ b/lib/kross/ruby/rubyinterpreter.cpp
@@ -121,9 +121,9 @@ VALUE RubyInterpreter::require (VALUE obj, VALUE name)
 #endif
     TQString modname = StringValuePtr(name);
     if(modname.startsWith("kross")) {
-        krossdebug( TQString("RubyInterpreter::require() module=%1").tqarg(modname) );
+        krossdebug( TQString("RubyInterpreter::require() module=%1").arg(modname) );
         if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
-            krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) );
+            krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) );
         }
         else {
             Kross::Api::Module::Ptr module = Kross::Api::Manager::scriptManager()->loadModule(modname);
@@ -136,7 +136,7 @@ VALUE RubyInterpreter::require (VALUE obj, VALUE name)
 //                     rb_define_variable( ("$" + modname).ascii(), & RubyInterpreter::d->m_modules.insert( mStrVALUE::value_type( modname, rm) ).first->second );
                 return Qtrue;
             }
-            krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) );
+            krosswarning( TQString("Loading of Kross module '%1' failed.").arg(modname) );
         }
     } else {
         return rb_f_require(obj, name);
diff --git a/lib/kross/ruby/rubymodule.cpp b/lib/kross/ruby/rubymodule.cpp
index 73012b89..948a10ee 100644
--- a/lib/kross/ruby/rubymodule.cpp
+++ b/lib/kross/ruby/rubymodule.cpp
@@ -37,7 +37,7 @@ RubyModule::RubyModule(Kross::Api::Module::Ptr mod, TQString modname) : d(new Ru
 {
     d->m_module = mod;
     modname = modname.left(1).upper() + modname.right(modname.length() - 1 );
-    krossdebug(TQString("Module: %1").tqarg(modname));
+    krossdebug(TQString("Module: %1").arg(modname));
     VALUE rmodule = rb_define_module(modname.ascii());
     rb_define_module_function(rmodule,"method_missing",  (VALUE (*)(...))RubyModule::method_missing, -1);
     VALUE rm = RubyExtension::toVALUE( mod.data() );
@@ -52,7 +52,7 @@ VALUE RubyModule::method_missing(int argc, VALUE *argv, VALUE self)
 {
 #ifdef KROSS_RUBY_MODULE_DEBUG
     TQString funcname = rb_id2name(SYM2ID(argv[0]));
-    krossdebug(TQString("Function %1 missing in a module").tqarg(funcname));
+    krossdebug(TQString("Function %1 missing in a module").arg(funcname));
 #endif
 
     VALUE rubyObjectModule = rb_funcall( self, rb_intern("const_get"), 1, ID2SYM(rb_intern("MODULEOBJ")) );
diff --git a/lib/kross/ruby/rubyscript.cpp b/lib/kross/ruby/rubyscript.cpp
index dc0fbb16..370d4aa7 100644
--- a/lib/kross/ruby/rubyscript.cpp
+++ b/lib/kross/ruby/rubyscript.cpp
@@ -87,7 +87,7 @@ void RubyScript::compile()
 #ifdef KROSS_RUBY_SCRIPT_DEBUG
         krossdebug("Compilation has failed");
 #endif
-        setException( new Kross::Api::Exception(TQString("Failed to compile ruby code: %1").tqarg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
+        setException( new Kross::Api::Exception(TQString("Failed to compile ruby code: %1").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
         d->m_compile = 0;
     }
 #ifdef KROSS_RUBY_SCRIPT_DEBUG
@@ -133,7 +133,7 @@ Kross::Api::Object::Ptr RubyScript::execute()
 #endif
             setException( RubyExtension::convertToException( ruby_errinfo ) );
         } else {
-            setException( new Kross::Api::Exception(TQString("Failed to execute ruby code: %1").tqarg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
+            setException( new Kross::Api::Exception(TQString("Failed to execute ruby code: %1").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
         }
     }
 
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index 570e2610..1093a47b 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -82,13 +82,13 @@ int runScriptFile(const TQString& scriptfile)
             // We had an exception.
             TQString errormessage = scriptcontainer->getException()->getError();
             TQString tracedetails = scriptcontainer->getException()->getTrace();
-            std::cerr << TQString("%2\n%1").tqarg(tracedetails).tqarg(errormessage).latin1() << std::endl;
+            std::cerr << TQString("%2\n%1").arg(tracedetails).arg(errormessage).latin1() << std::endl;
             return ERROR_EXCEPTION;
         }
     }
     catch(Kross::Api::Exception::Ptr e) {
         // Normaly that shouldn't be the case...
-        std::cerr << TQString("EXCEPTION %1").tqarg(e->toString()).latin1() << std::endl;
+        std::cerr << TQString("EXCEPTION %1").arg(e->toString()).latin1() << std::endl;
         return ERROR_UNHALDEDEXCEPTION;
     }
     return ERROR_OK;
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index 42198201..7f304ba6 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -107,7 +107,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode)
         if(testclassinstance) {
             TQValueList<Kross::Api::Object*> ll;
             Kross::Api::Object* instancecallresult = testclassinstance->call("testClassFunction1", Kross::Api::List::create(ll));
-            //krossdebug( TQString("testClass.testClassFunction1 returnvalue => '%1'").tqarg( instancecallresult.toString() ) );
+            //krossdebug( TQString("testClass.testClassFunction1 returnvalue => '%1'").arg( instancecallresult.toString() ) );
         }
         */
 
@@ -121,7 +121,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode)
 */
     }
     catch(Kross::Api::Exception::Ptr e) {
-        std::cout << TQString("EXCEPTION %1").tqarg(e->toString()).latin1() << std::endl;
+        std::cout << TQString("EXCEPTION %1").arg(e->toString()).latin1() << std::endl;
     }
 
 /*TESTCASE
@@ -132,7 +132,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode)
         sc2->execute();
     }
     catch(Kross::Api::Exception& e) {
-        krossdebug( TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) );
+        krossdebug( TQString("EXCEPTION type='%1' description='%2'").arg(e.type()).arg(e.description()) );
     }
     //delete sc2;
 */
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
         }
     }
     else {
-        Kross::krosswarning( TQString("Failed to load scriptfile: %1").tqarg(scriptfilename) );
+        Kross::krosswarning( TQString("Failed to load scriptfile: %1").arg(scriptfilename) );
         result = -1;
     }
 
diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp
index eb687d02..884e7e37 100644
--- a/lib/kross/test/testobject.cpp
+++ b/lib/kross/test/testobject.cpp
@@ -48,24 +48,24 @@ TestObject::~TestObject()
 
 uint TestObject::func1(uint i)
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").tqarg(i) );
+    Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").arg(i) );
     return i;
 }
 
 void TestObject::func2(TQString s, int i)
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").tqarg(s).tqarg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").arg(s).arg(i));
 }
 
 TQString TestObject::func3(TQString s, int i)
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").tqarg(s).tqarg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").arg(s).arg(i));
     return s;
 }
 
 const TQString& TestObject::func4(const TQString& s, int i) const
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").tqarg(s).tqarg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").arg(s).arg(i));
     return s;
 }
 
@@ -83,13 +83,13 @@ void TestObject::testSlot2()
 
 void TestObject::stdoutSlot(const TQString& s)
 {
-    Kross::krossdebug(TQString("stdout: %1").tqarg(s));
+    Kross::krossdebug(TQString("stdout: %1").arg(s));
     //std::cout << "<stdout> " << s.latin1() << std::endl;
 }
 
 void TestObject::stderrSlot(const TQString& s)
 {
-    Kross::krossdebug(TQString("stderr: %1").tqarg(s));
+    Kross::krossdebug(TQString("stderr: %1").arg(s));
     //std::cout << "<stderr> " << s.latin1() << std::endl;
 }
 
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index 5aa33958..ec2960b0 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -53,7 +53,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco
         file = TQDir(TQDir::currentDirPath()).filePath("testscripting.rc");
     else Kross::krossdebug("-------------------------222222");
 
-    Kross::krossdebug(TQString("XML-file: %1").tqarg(file));
+    Kross::krossdebug(TQString("XML-file: %1").arg(file));
     m_scriptextension->setXMLFile(file);
 
     //menuFile->insertSeparator();
@@ -99,11 +99,11 @@ void TestWindow::execute()
     m_scriptcontainer->setCode(m_codeedit->text());
     Kross::Api::Object::Ptr result = m_scriptcontainer->execute();
     if(m_scriptcontainer->hadException()) {
-        Kross::krossdebug( TQString("EXCEPTION => %1").tqarg(m_scriptcontainer->getException()->toString()) );
+        Kross::krossdebug( TQString("EXCEPTION => %1").arg(m_scriptcontainer->getException()->toString()) );
     }
     else {
         TQString s = result ? result->toString() : TQString();
-        Kross::krossdebug( TQString("DONE => %1").tqarg(s) );
+        Kross::krossdebug( TQString("DONE => %1").arg(s) );
     }
 }
 
diff --git a/lib/kwmf/kowmfreadprivate.h b/lib/kwmf/kowmfreadprivate.h
index ea95e563..feebe0b3 100644
--- a/lib/kwmf/kowmfreadprivate.h
+++ b/lib/kwmf/kowmfreadprivate.h
@@ -112,7 +112,7 @@ public:
     /****************** Text *******************/
     /// set text color
     void setTextColor( TQ_UINT32 size, TQDataStream& stream );
-    /// set text tqalignment
+    /// set text alignment
     void setTextAlign( TQ_UINT32 size, TQDataStream& stream );
     /// draw text
     void textOut( TQ_UINT32 size, TQDataStream& stream );
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc
index 0a0d2c12..d8965537 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cc
@@ -351,7 +351,7 @@ bool KWmf::parse(
     bool isPlaceable;
     bool isEnhanced;
 
-    startedAt = stream.tqdevice()->at();
+    startedAt = stream.device()->at();
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
 
     for (int i = 0; i < s_maxHandles; i++)
@@ -477,7 +477,7 @@ bool KWmf::parse(
     }
     else
     {
-        stream.tqdevice()->at(startedAt);
+        stream.device()->at(startedAt);
         m_dpi = (unsigned)((double)576 / m_dpi);
         m_windowOrgX = 0;
         m_windowOrgY = 0;
@@ -487,7 +487,7 @@ bool KWmf::parse(
 
     //----- Read as enhanced metafile header
 
-    fileAt = stream.tqdevice()->at();
+    fileAt = stream.device()->at();
     stream >> eheader.iType;
     stream >> eheader.nSize;
     stream >> eheader.rclBounds.left;
@@ -539,7 +539,7 @@ bool KWmf::parse(
     {
         //    debug("WMF Header");
         //----- Read as standard metafile header
-        stream.tqdevice()->at(fileAt);
+        stream.device()->at(fileAt);
         stream >> header.mtType;
         stream >> header.mtHeaderSize;
         stream >> header.mtVersion;
@@ -558,7 +558,7 @@ bool KWmf::parse(
         */
     }
 
-    walk((size - (stream.tqdevice()->at() - startedAt)) / 2, stream);
+    walk((size - (stream.device()->at() - startedAt)) / 2, stream);
     return true;
 }
 
diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc
index e9cafee1..aabe4021 100644
--- a/lib/kwmf/qwmf.cc
+++ b/lib/kwmf/qwmf.cc
@@ -348,7 +348,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
     mWinding = false;
     mAbsoluteCoord = absolute;
 
-    mPainter.tqbegin( const_cast<TQPaintDevice*>(aTarget) );
+    mPainter.begin( const_cast<TQPaintDevice*>(aTarget) );
     if ( TQWMF_DEBUG )  {
         kdDebug() << "Bounding box : " << mBBox.left()
         << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // tqalignment
+    // alignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
diff --git a/lib/kwmf/qwmf.h b/lib/kwmf/qwmf.h
index 3bc668c9..cf05d617 100644
--- a/lib/kwmf/qwmf.h
+++ b/lib/kwmf/qwmf.h
@@ -139,7 +139,7 @@ public: // should be protected but cannot
     /****************** Text *******************/
     /** set text color */
     void setTextColor( long num, short* parms );
-    /** set text tqalignment */
+    /** set text alignment */
     void setTextAlign( long num, short* parms );
     /** draw text */
     void textOut( long num, short* parms );
diff --git a/lib/store/KoDirectoryStore.cpp b/lib/store/KoDirectoryStore.cpp
index 76e5aa72..894a7b39 100644
--- a/lib/store/KoDirectoryStore.cpp
+++ b/lib/store/KoDirectoryStore.cpp
@@ -72,7 +72,7 @@ bool KoDirectoryStore::openReadOrWrite( const TQString& name, int iomode )
             return false;
     }
     m_stream = TQT_TQIODEVICE(new TQFile( m_basePath + name ));
-    if ( !m_stream->tqopen( iomode ) )
+    if ( !m_stream->open( iomode ) )
     {
         delete m_stream;
         m_stream = 0L;
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index f3568606..5fff1e83 100644
--- a/lib/store/KoXmlWriter.cpp
+++ b/lib/store/KoXmlWriter.cpp
@@ -104,7 +104,7 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside )
 {
     Q_ASSERT( tagName != 0 );
 
-    // Tell parent that it has tqchildren
+    // Tell parent that it has children
     bool parentIndent = prepareForChild();
 
     m_tags.push( Tag( tagName, parentIndent && indentInside ) );
diff --git a/lib/store/KoXmlWriter.h b/lib/store/KoXmlWriter.h
index 5261dd5f..eaf453d2 100644
--- a/lib/store/KoXmlWriter.h
+++ b/lib/store/KoXmlWriter.h
@@ -226,7 +226,7 @@ private:
             : tagName( t ), hasChildren( false ), lastChildIsText( false ),
               openingTagClosed( false ), indentInside( ind ) {}
         const char* tagName;
-        bool hasChildren; ///< element or text tqchildren
+        bool hasChildren; ///< element or text children
         bool lastChildIsText; ///< last child is a text node
         bool openingTagClosed; ///< true once the '\>' in \<tag a="b"\> is written out
         bool indentInside; ///< whether to indent the contents of this tag
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index a27bfc41..fccb27c0 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -127,11 +127,11 @@ void StoreDropTest::showZipContents( TQByteArray data, const char* mimeType, boo
 TQString StoreDropTest::loadTextFile( KoStore* store, const TQString& fileName )
 {
     if ( !store->open( fileName ) )
-        return TQString( "%1 not found\n" ).tqarg( fileName );
+        return TQString( "%1 not found\n" ).arg( fileName );
 
     TQByteArray data = store->device()->readAll();
     store->close();
-    TQString txt = TQString( "Found %1: \n" ).tqarg( fileName );
+    TQString txt = TQString( "Found %1: \n" ).arg( fileName );
     txt += TQString::fromUtf8( data.data(), data.size() );
     txt += "\n";
     return txt;
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 29b12948..27e91426 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -117,7 +117,7 @@ int main( int argc, char **argv )
         KMimeType::Ptr inputMimetype = KMimeType::findByURL( uIn );
         if ( inputMimetype->name() == KMimeType::defaultMimeType() )
         {
-            kdError() << i18n("Mimetype for input file %1 not found!").tqarg(uIn.prettyURL()) << endl;
+            kdError() << i18n("Mimetype for input file %1 not found!").arg(uIn.prettyURL()) << endl;
             return 1;
         }
         KMimeType::Ptr outputMimetype;
@@ -127,7 +127,7 @@ int main( int argc, char **argv )
             outputMimetype = KMimeType::mimeType( mime );
             if ( outputMimetype->name() == KMimeType::defaultMimeType() )
             {
-                kdError() << i18n("Mimetype not found %1").tqarg(mime) << endl;
+                kdError() << i18n("Mimetype not found %1").arg(mime) << endl;
                 return 1;
             }
         }
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index fc6ca9c3..b5c3d5d0 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -241,7 +241,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 		int res = getNumber(txt, &pos);
 		if (pos >= len)
 			return;
-		switch (txt.tqat(pos).latin1()) {
+		switch (txt.at(pos).latin1()) {
 			case 'H':
 				hours = res;
 				break;
@@ -259,7 +259,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 	}
 	hours += days * 24;
 	appendItem(group1, labelid,
-		   i18n("%1:%2.%3").tqarg(hours).tqarg(minutes, 2).tqarg(seconds,2 ));
+		   i18n("%1:%2.%3").arg(hours).arg(minutes, 2).arg(seconds,2 ));
 }
 
 void KOfficePlugin::getDateTime(KFileMetaInfoGroup group1,
@@ -336,7 +336,7 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
       if (node.isElement()){
 	appendItem(groupuser,
 		   node.toElement().attribute(metaname,
-					      TQString("User %1").tqarg(i)),
+					      TQString("User %1").arg(i)),
 		   node.toElement().text());
       }
     }
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index 33d87564..dc0d9d68 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -302,7 +302,7 @@ void Thesaurus::setCaption()
 {
     KURL url = KURL();
     url.setPath(m_data_file);
-    m_dialog->setCaption(i18n("Related Words - %1").tqarg(url.fileName()));
+    m_dialog->setCaption(i18n("Related Words - %1").arg(url.fileName()));
 }
 
 // Enbale or disable back and forward button
@@ -429,7 +429,7 @@ void Thesaurus::thesExited(KProcess *)
 
     if( !m_thesproc_stderr.isEmpty() ) {
         KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep. "
-          "Output:<br>%1").tqarg(m_thesproc_stderr));
+          "Output:<br>%1").arg(m_thesproc_stderr));
         TQApplication::restoreOverrideCursor();
         return;
     }
@@ -590,10 +590,10 @@ void Thesaurus::findTermWordnet(const TQString &term)
     m_combobox->insertItem(i18n("Synonyms/Hypernyms - Ordered by Frequency"));
     m_combobox->insertItem(i18n("Synonyms - Ordered by Similarity of Meaning (verbs only)"));
     m_combobox->insertItem(i18n("Antonyms - Words with Opposite Meanings"));
-    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").tqarg(m_edit->currentText()));
-    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").tqarg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").arg(m_edit->currentText()));
     // 5:
-    m_combobox->insertItem(i18n("Holonyms - ... has a %1").tqarg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Holonyms - ... has a %1").arg(m_edit->currentText()));
     m_combobox->insertItem(i18n("Attributes"));
     m_combobox->insertItem(i18n("Cause To (for some verbs only)"));
     m_combobox->insertItem(i18n("Verb Entailment (for some verbs only)"));
@@ -648,13 +648,13 @@ void Thesaurus::wnExited(KProcess *)
     
     if( !m_wnproc_stderr.isEmpty() ) {
         m_resultbox->setText(i18n("<b>Error:</b> Failed to execute WordNet program 'wn'. "
-          "Output:<br>%1").tqarg(m_wnproc_stderr));
+          "Output:<br>%1").arg(m_wnproc_stderr));
         TQApplication::restoreOverrideCursor();
         return;
     }
 
     if( m_wnproc_stdout.isEmpty() ) {
-        m_resultbox->setText(i18n("No match for '%1'.").tqarg(m_edit->currentText()));
+        m_resultbox->setText(i18n("No match for '%1'.").arg(m_edit->currentText()));
     } else {
         // render in a table, each line one row:
         TQStringList lines = lines.split(TQChar('\n'), m_wnproc_stdout, false);
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index 17cefdf7..057cb079 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -1877,9 +1877,9 @@
 ;hushed;muted;subdued;quiet;#;soft;
 ;little;small;#;soft;
 ;low;low-toned;#;soft;
-;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-tqshaped;sounding;heavy;sonorous;
+;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-shaped;sounding;heavy;sonorous;
 ;rich;#;full;
-;orotund;rotund;round;pear-tqshaped;#;full;
+;orotund;rotund;round;pear-shaped;#;full;
 ;heavy;sonorous;#;full;
 ;thin;#;pale;
 ;pale;#;thin;
@@ -2701,10 +2701,10 @@
 ;sinful;unholy;wicked;#;unrighteous;
 ;cast-iron;iron;#;robust;
 ;decrepit;feeble;infirm;sapless;weak;weakly;#;frail;
-;round;circular;#;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-tqshaped;orbiculate;orbicular;
-;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
+;round;circular;#;ball-shaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-shaped;orbiculate;orbicular;
+;ball-shaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
 ;square;#;quadrate;right-angled;squared;squarish;
-;annular;annulate;annulated;circinate;circular;ringed;ring-tqshaped;#;rounded;
+;annular;annulate;annulated;circinate;circular;ringed;ring-shaped;#;rounded;
 ;rural;#;agrarian;agricultural;farming;agrestic;rustic;arcadian;bucolic;pastoral;rustic;campestral;countrified;countryfied;rustic;country;country-bred;country-style;country;cracker-barrel;folksy;homespun;frontier;hick;hobnailed;farm;
 ;agrarian;agricultural;farming;#;rural;
 ;urban;#;citified;cityfied;city-bred;city-born;urbanized;urbanised;
@@ -2853,9 +2853,9 @@
 ;noteworthy;remarkable;#;significant;important;
 ;operative;key;#;significant;important;
 ;light;#;insignificant;unimportant;
-;simple;unsubdivided;#;acerate;acerose;acicular;needle-tqshaped;needlelike;acuminate;apiculate;caudate;cordate;heart-tqshaped;cuneate;wedge-tqshaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-tqshaped;swordlike;bladelike;hastate;spearhead-tqshaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-tqshaped;peltate;shield-tqshaped;perfoliate;reniform;kidney-tqshaped;sagittate;sagittiform;arrow-tqshaped;spatulate;spatula-tqshaped;unlobed;
+;simple;unsubdivided;#;acerate;acerose;acicular;needle-shaped;needlelike;acuminate;apiculate;caudate;cordate;heart-shaped;cuneate;wedge-shaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-shaped;swordlike;bladelike;hastate;spearhead-shaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-shaped;peltate;shield-shaped;perfoliate;reniform;kidney-shaped;sagittate;sagittiform;arrow-shaped;spatulate;spatula-shaped;unlobed;
 ;linear;elongate;#;simple;unsubdivided;
-;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-tqshaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
+;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-shaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
 ;simple;#;elemental;ultimate;oversimplified;simplistic;simplex;simplified;unanalyzable;undecomposable;uncomplicated;unsophisticated;
 ;elemental;ultimate;#;simple;
 ;complex;#;analyzable;decomposable;Byzantine;convoluted;intricate;involved;knotty;labyrinthine;tangled;tortuous;colonial;compound;complicated;composite;compound;gordian;interlacing;interlinking;interlocking;interwoven;labyrinthine;labyrinthian;mazy;multifactorial;multiplex;thickening;
@@ -3897,7 +3897,7 @@
 ;motivation;motive;need;#;psychological feature;
 ;feeling;#;psychological feature;
 ;location;#;breathe;take a breath;respire;
-;tqshape;form;#;attribute;
+;shape;form;#;attribute;
 ;time;#;abstraction;
 ;space;#;abstraction;
 ;act;human action;human activity;#
@@ -4427,8 +4427,8 @@
 ;damage;harm;hurt;scathe;#;change of integrity;
 ;wound;wounding;#;damage;harm;hurt;scathe;
 ;burn;#;damage;harm;hurt;scathe;
-;fold;folding;#;change of tqshape;
-;protrusion;projection;jut;jutting;#;change of tqshape;
+;fold;folding;#;change of shape;
+;protrusion;projection;jut;jutting;#;change of shape;
 ;activity;#;act;human action;human activity;
 ;operation;#;activity;
 ;practice;pattern;#;activity;
@@ -6268,7 +6268,7 @@
 ;horn;#;noisemaker;
 ;horror;#;thing;
 ;horse;#;gymnastic apparatus;exerciser;
-;horseshoe;shoe;U-tqshaped plate;#;plate;scale;shell;
+;horseshoe;shoe;U-shaped plate;#;plate;scale;shell;
 ;hospital;infirmary;#;medical building;health facility;
 ;hostel;hostelry;inn;lodge;#;hotel;
 ;hotel;#;building;edifice;
@@ -6471,7 +6471,7 @@
 ;microphone;mike;#;electro-acoustic transducer;
 ;military post;post;#;military installation;
 ;mill;grinder;#;machine;
-;miller;milling machine;#;tqshaper;shaping machine;
+;miller;milling machine;#;shaper;shaping machine;
 ;mine;#;explosive device;
 ;mine;#;excavation;hole in the ground;
 ;miniature;toy;#;copy;
@@ -7239,7 +7239,7 @@
 ;perspective;linear perspective;#;appearance;visual aspect;
 ;phase;#;appearance;visual aspect;
 ;format;#;appearance;visual aspect;
-;form;tqshape;cast;#;appearance;visual aspect;
+;form;shape;cast;#;appearance;visual aspect;
 ;persona;image;#;appearance;visual aspect;
 ;semblance;color;colour;#;appearance;visual aspect;
 ;face;#;appearance;visual aspect;
@@ -7569,7 +7569,7 @@
 ;beat;#;pace;rate;
 ;dispatch;despatch;expedition;expeditiousness;#;celerity;quickness;rapidity;
 ;haste;hastiness;hurry;hurriedness;#;speed;swiftness;fastness;
-;tqshape;form;configuration;contour;#;spatial property;spatiality;
+;shape;form;configuration;contour;#;spatial property;spatiality;
 ;symmetry;symmetricalness;correspondence;balance;#;spatial property;spatiality;
 ;tilt;list;inclination;lean;leaning;#;position;spatial relation;
 ;gradient;grade;slope;#;position;spatial relation;
@@ -7577,12 +7577,12 @@
 ;upgrade;rise;rising slope;#;grade;
 ;pitch;rake;slant;#;gradient;grade;slope;
 ;point;pointedness;#;taper;
-;curvature;curve;#;tqshape;form;configuration;contour;
+;curvature;curve;#;shape;form;configuration;contour;
 ;position;spatial relation;#;relation;
 ;placement;arrangement;#;position;spatial relation;
 ;composition;composing;#;placement;arrangement;
 ;proportion;balance;#;placement;arrangement;
-;true;#;tqalignment;
+;true;#;alignment;
 ;position;posture;attitude;#;bodily property;
 ;presentation;#;position;posture;attitude;
 ;guard;#;position;posture;attitude;
@@ -7779,8 +7779,8 @@
 ;tone;#;quality;
 ;resistance;#;unresponsiveness;
 ;body;organic structure;physical structure;#;natural object;
-;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
-;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;
+;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
+;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;
 ;body;dead body;#;natural object;
 ;cadaver;corpse;stiff;clay;remains;#;body;dead body;
 ;mummy;#;body;dead body;
@@ -7794,7 +7794,7 @@
 ;system;#;body part;
 ;sheath;case;#;covering;natural covering;cover;
 ;skin;tegument;cutis;#;connective tissue;body covering;
-;tube;tube-tqshaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
+;tube;tube-shaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;passage;passageway;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;orifice;opening;porta;#;passage;passageway;
 ;duct;canal;channel;#;passage;passageway;
@@ -7845,7 +7845,7 @@
 ;chamber;#;cavity;bodily cavity;cavum;
 ;valve;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;stomach;tummy;tum;breadbasket;#;internal organ;viscus;
-;vessel;vas;#;tube;tube-tqshaped structure;
+;vessel;vas;#;tube;tube-shaped structure;
 ;liquid body substance;bodily fluid;body fluid;humor;humour;#;body substance;
 ;juice;succus;#;liquid body substance;bodily fluid;body fluid;humor;humour;
 ;milk;#;liquid body substance;bodily fluid;body fluid;humor;humour;nutriment;nourishment;nutrition;sustenance;aliment;alimentation;victuals;
@@ -8457,9 +8457,9 @@
 ;percept;perception;perceptual experience;#;representation;mental representation;internal representation;
 ;figure;#;percept;perception;perceptual experience;
 ;ground;#;percept;perception;perceptual experience;
-;form;tqshape;pattern;#;structure;
-;mosaic;#;form;tqshape;pattern;
-;strand;#;form;tqshape;pattern;
+;form;shape;pattern;#;structure;
+;mosaic;#;form;shape;pattern;
+;strand;#;form;shape;pattern;
 ;sight;#;visual percept;visual image;
 ;view;aspect;prospect;scene;vista;panorama;#;visual percept;visual image;
 ;background;ground;#;view;aspect;prospect;scene;vista;panorama;
@@ -8479,7 +8479,7 @@
 ;appearance;#;representation;mental representation;internal representation;
 ;illusion;semblance;#;appearance;
 ;front;#;appearance;
-;tqshape;embodiment;#;concretism;concrete representation;
+;shape;embodiment;#;concretism;concrete representation;
 ;belief;#;content;cognitive content;mental object;
 ;conviction;strong belief;article of faith;#;belief;
 ;faith;trust;#;belief;
@@ -10440,7 +10440,7 @@
 ;shock;#;mass;
 ;shock;#;pile;heap;mound;cumulus;
 ;combination;#;collection;aggregation;accumulation;assemblage;
-;combination;#;alliance;coalition;tqalignment;alinement;
+;combination;#;alliance;coalition;alignment;alinement;
 ;body;#;gathering;assemblage;
 ;public;#;body;
 ;world;domain;#;class;social class;socio-economic class;
@@ -10605,7 +10605,7 @@
 ;tribe;federation of tribes;#;nation;
 ;state;nation;country;land;commonwealth;res publica;body politic;#;political unit;
 ;member;#;unit;social unit;
-;bloc;axis;#;alliance;coalition;tqalignment;alinement;
+;bloc;axis;#;alliance;coalition;alignment;alinement;
 ;Europe;#;collection;aggregation;accumulation;assemblage;
 ;Asia;#;collection;aggregation;accumulation;assemblage;
 ;European Union;EU;European Community;EC;European Economic Community;EEC;Common Market;Europe;#;world organization;international organization;
@@ -10766,7 +10766,7 @@
 ;fleet;#;steamship company;steamship line;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
-;alliance;coalition;tqalignment;alinement;#;organization;organisation;
+;alliance;coalition;alignment;alinement;#;organization;organisation;
 ;United Nations;UN;#;world organization;international organization;
 ;International Monetary Fund;IMF;#;United Nations agency;UN agency;
 ;World Health Organization;WHO;#;United Nations agency;UN agency;
@@ -12048,7 +12048,7 @@
 ;general practitioner;GP;#;doctor;doc;physician;MD;Dr.;medico;
 ;geezer;bloke;#;man;adult male;
 ;general;full general;#;general officer;
-;generator;source;author;#;maker;tqshaper;
+;generator;source;author;#;maker;shaper;
 ;genius;mastermind;brain;#;intellectual;intellect;
 ;gentleman;#;man;adult male;
 ;ghostwriter;ghost;#;writer;author;
@@ -12170,7 +12170,7 @@
 ;mailman;postman;mail carrier;letter carrier;carrier;#;deliveryman;delivery boy;deliverer;
 ;major;#;commissioned military officer;
 ;major;#;student;pupil;educatee;
-;maker;tqshaper;#;creator;
+;maker;shaper;#;creator;
 ;male child;boy;#;male;male person;
 ;man;adult male;#;male;male person;
 ;man;#;male;male person;lover;
@@ -12178,7 +12178,7 @@
 ;man;#;person;individual;someone;somebody;mortal;human;soul;
 ;man;#;subordinate;subsidiary;underling;
 ;mannequin;manikin;mannikin;manakin;fashion model;model;#;assistant;helper;help;supporter;
-;manufacturer;producer;#;maker;tqshaper;
+;manufacturer;producer;#;maker;shaper;
 ;marauder;predator;vulture;#;attacker;aggressor;assailant;assaulter;
 ;Marine;devil dog;leatherneck;shipboard soldier;#;serviceman;military man;man;military personnel;
 ;marshal;marshall;#;lawman;law officer;peace officer;
@@ -13922,62 +13922,62 @@
 ;change;#;relation;
 ;difference;#;change;
 ;implication;logical implication;conditional relation;#;logical relation;
-;solid;#;tqshape;form;
-;plane;sheet;#;tqshape;form;
-;figure;#;tqshape;form;
-;line;#;tqshape;form;
+;solid;#;shape;form;
+;plane;sheet;#;shape;form;
+;figure;#;shape;form;
+;line;#;shape;form;
 ;cylinder;#;solid;
 ;heart;#;plane figure;two-dimensional figure;
-;curve;curved tqshape;#;line;
-;wave;#;curve;curved tqshape;
-;bend;crook;turn;#;curve;curved tqshape;
-;hook;crotchet;#;curve;curved tqshape;
-;envelope;#;curve;curved tqshape;
-;connection;connexion;link;#;tqshape;form;
+;curve;curved shape;#;line;
+;wave;#;curve;curved shape;
+;bend;crook;turn;#;curve;curved shape;
+;hook;crotchet;#;curve;curved shape;
+;envelope;#;curve;curved shape;
+;connection;connexion;link;#;shape;form;
 ;diameter;#;straight line;
-;pit;fossa;#;concave tqshape;concavity;cavity;bodily cavity;cavum;
-;recess;recession;niche;corner;#;concave tqshape;concavity;
+;pit;fossa;#;concave shape;concavity;cavity;bodily cavity;cavum;
+;recess;recession;niche;corner;#;concave shape;concavity;
 ;circle;#;ellipse;oval;
-;circle;#;tqshape;form;
+;circle;#;shape;form;
 ;chord;#;straight line;
 ;sector;#;plane figure;two-dimensional figure;
-;disk;disc;saucer;#;round tqshape;
+;disk;disc;saucer;#;round shape;
 ;ring;halo;annulus;anulus;doughnut;anchor ring;#;toroid;
-;loop;#;round tqshape;
-;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round tqshape;
+;loop;#;round shape;
+;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round shape;
 ;element;#;straight line;
 ;kink;twist;twirl;#;fold;crease;plication;flexure;crimp;bend;
 ;square;foursquare;#;rectangle;
-;triangle;trigon;trilateral;#;polygon;polygonal tqshape;
+;triangle;trigon;trilateral;#;polygon;polygonal shape;
 ;star;#;plane figure;two-dimensional figure;
 ;box;#;rectangle;
-;knot;gnarl;#;distorted tqshape;distortion;
-;arch;#;curve;curved tqshape;
-;bell;bell tqshape;campana;#;curve;curved tqshape;
+;knot;gnarl;#;distorted shape;distortion;
+;arch;#;curve;curved shape;
+;bell;bell shape;campana;#;curve;curved shape;
 ;angle;#;space;
 ;hour angle;HA;#;angular distance;
 ;dip;angle of dip;magnetic dip;magnetic inclination;inclination;#;angle;
 ;lead;#;angle;
-;bowl;trough;#;concave tqshape;concavity;
+;bowl;trough;#;concave shape;concavity;
 ;groove;channel;#;depression;impression;imprint;
-;scoop;pocket;#;concave tqshape;concavity;
-;node;knob;thickening;#;convex tqshape;convexity;
-;bow;arc;#;curve;curved tqshape;
-;depression;impression;imprint;#;concave tqshape;concavity;
+;scoop;pocket;#;concave shape;concavity;
+;node;knob;thickening;#;convex shape;convexity;
+;bow;arc;#;curve;curved shape;
+;depression;impression;imprint;#;concave shape;concavity;
 ;base;#;flank;
 ;balance;equilibrium;equipoise;counterbalance;#;structure;construction;
 ;symmetry;proportion;#;balance;equilibrium;equipoise;counterbalance;
-;sphere;#;round tqshape;
+;sphere;#;round shape;
 ;hemisphere;#;subfigure;
-;sphere;#;round tqshape;
+;sphere;#;round shape;
 ;ball;globe;orb;#;sphere;
-;cylinder;#;round tqshape;
-;column;tower;pillar;#;tqshape;form;
+;cylinder;#;round shape;
+;column;tower;pillar;#;shape;form;
 ;barrel;drum;#;cylinder;
 ;pipe;tube;#;cylinder;
-;drop;bead;pearl;#;round tqshape;
-;ridge;#;convex tqshape;convexity;
-;point;tip;peak;#;convex tqshape;convexity;
+;drop;bead;pearl;#;round shape;
+;ridge;#;convex shape;convexity;
+;point;tip;peak;#;convex shape;convexity;
 ;boundary;edge;bound;#;line;
 ;margin;border;perimeter;#;boundary;edge;bound;
 ;periphery;fringe;outer boundary;#;boundary;edge;bound;
@@ -13985,13 +13985,13 @@
 ;crown;peak;summit;#;upper bound;
 ;diagonal;bias;#;straight line;
 ;dip;#;depression;impression;imprint;
-;cup;#;concave tqshape;concavity;
+;cup;#;concave shape;concavity;
 ;incision;scratch;prick;slit;dent;#;depression;impression;imprint;
 ;score;scotch;#;incision;scratch;prick;slit;dent;
 ;wrinkle;furrow;crease;crinkle;seam;line;#;depression;impression;imprint;
 ;crevice;cranny;crack;fissure;chap;#;depression;impression;imprint;
-;fold;crease;plication;flexure;crimp;bend;#;angular tqshape;angularity;
-;space;#;amorphous tqshape;
+;fold;crease;plication;flexure;crimp;bend;#;angular shape;angularity;
+;space;#;amorphous shape;
 ;node;#;connection;connexion;link;
 ;articulation;join;joint;juncture;junction;#;connection;connexion;link;
 ;hole;#;space;
@@ -14005,7 +14005,7 @@
 ;block;cube;#;solid;
 ;tail;tail end;#;projection;
 ;tongue;knife;#;projection;
-;projection;#;convex tqshape;convexity;
+;projection;#;convex shape;convexity;
 ;medium;#;state;
 ;condition;#;state;
 ;condition;status;#;state;
@@ -14445,11 +14445,11 @@
 ;vulnerability;exposure;#;danger;
 ;tension;tensity;tenseness;tautness;#;condition;status;
 ;tonicity;tonus;tone;#;tension;tensity;tenseness;tautness;
-;condition;tqshape;#;good health;healthiness;
-;fitness;physical fitness;good tqshape;good condition;#;condition;tqshape;
+;condition;shape;#;good health;healthiness;
+;fitness;physical fitness;good shape;good condition;#;condition;shape;
 ;repair;#;condition;status;
 ;seaworthiness;fitness;#;soundness;
-;disability;disablement;handicap;impairment;#;unfitness;poor tqshape;bad condition;
+;disability;disablement;handicap;impairment;#;unfitness;poor shape;bad condition;
 ;putrescence;putridness;rottenness;corruption;#;putrefaction;rot;
 ;devastation;desolation;ruin;#;deterioration;impairment;
 ;wear;#;deterioration;impairment;
@@ -15115,20 +15115,20 @@
 ;affect;impact;bear upon;bear on;touch on;touch;#;change;alter;
 ;change by reversal;turn;reverse;#;change;
 ;switch over;switch;exchange;#;change by reversal;turn;reverse;
-;granulate;grain;#;change tqshape;change form;deform;
-;tie;#;tqshape;form;
-;terrace;#;tqshape;form;
-;fork;#;tqshape;form;
-;tqshape;form;#;change;alter;
-;dimension;#;tqshape;form;
-;roll;#;tqshape;form;
-;draw;#;tqshape;form;
-;strike;#;tqshape;form;
-;twist;#;tqshape;form;
-;granulate;grain;#;tqshape;form;
-;ridge;#;tqshape;form;
-;round;round out;round off;#;tqshape;form;
-;square;square up;#;tqshape;form;
+;granulate;grain;#;change shape;change form;deform;
+;tie;#;shape;form;
+;terrace;#;shape;form;
+;fork;#;shape;form;
+;shape;form;#;change;alter;
+;dimension;#;shape;form;
+;roll;#;shape;form;
+;draw;#;shape;form;
+;strike;#;shape;form;
+;twist;#;shape;form;
+;granulate;grain;#;shape;form;
+;ridge;#;shape;form;
+;round;round out;round off;#;shape;form;
+;square;square up;#;shape;form;
 ;round off;round down;round out;round;#;change;alter;
 ;change state;turn;#;change;
 ;fall;#;change state;turn;
@@ -15315,8 +15315,8 @@
 ;age;get on;mature;maturate;#;develop;
 ;turn;#;age;get on;mature;maturate;
 ;age;#;develop;
-;progress;come on;come along;advance;get on;get along;tqshape up;#;develop;
-;climb;#;progress;come on;come along;advance;get on;get along;tqshape up;
+;progress;come on;come along;advance;get on;get along;shape up;#;develop;
+;climb;#;progress;come on;come along;advance;get on;get along;shape up;
 ;age;#;change;alter;
 ;mature;maturate;grow;#;develop;
 ;grow;#;change;
@@ -15346,7 +15346,7 @@
 ;piece;patch;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;point;repoint;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;patch;patch up;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
-;dish;#;tqshape;form;
+;dish;#;shape;form;
 ;bulk;#;bulge;pouch;protrude;
 ;inflate;blow up;expand;amplify;#;increase;
 ;reform;#;better;improve;amend;ameliorate;meliorate;
@@ -15413,7 +15413,7 @@
 ;regulate;modulate;#;adjust;set;
 ;adapt;accommodate;#;change;alter;vary;
 ;fit;#;adapt;accommodate;
-;fit;#;tqshape;form;
+;fit;#;shape;form;
 ;qualify;dispose;#;prepare;groom;train;
 ;temper;harden;#;modify;
 ;anneal;temper;#;toughen;
@@ -15584,7 +15584,7 @@
 ;dull;#;weaken;
 ;cloud;#;dull;
 ;dull;#;change;
-;sharpen;taper;point;#;change tqshape;change form;deform;
+;sharpen;taper;point;#;change shape;change form;deform;
 ;flatten;drop;#;change;alter;
 ;phase;#;synchronize;synchronise;sync;
 ;blend;flux;mix;conflate;commingle;immix;fuse;coalesce;meld;combine;merge;#;change integrity;
@@ -15724,12 +15724,12 @@
 ;perfect;hone;#;better;improve;amend;ameliorate;meliorate;
 ;polish;round;round off;polish up;brush up;#;perfect;hone;
 ;polish;refine;fine-tune;down;#;better;improve;amend;ameliorate;meliorate;
-;deform;distort;strain;#;tqshape;form;
-;draw;#;change tqshape;change form;deform;
-;blow;#;tqshape;form;
-;block;#;tqshape;form;
-;block;#;tqshape;form;
-;cup;#;tqshape;form;
+;deform;distort;strain;#;shape;form;
+;draw;#;change shape;change form;deform;
+;blow;#;shape;form;
+;block;#;shape;form;
+;block;#;shape;form;
+;cup;#;shape;form;
 ;mar;impair;spoil;deflower;vitiate;#;damage;
 ;stamp;#;snuff out;extinguish;
 ;kill;obliterate;wipe out;#;take away;take out;
@@ -16156,11 +16156,11 @@
 ;format;#;determine;set;
 ;charge;#;determine;set;
 ;determine;#;specify;define;delineate;delimit;delimitate;
-;determine;tqshape;mold;influence;regulate;#;cause;do;make;
-;decide;#;determine;tqshape;mold;influence;regulate;
-;time;#;determine;tqshape;mold;influence;regulate;
-;index;#;determine;tqshape;mold;influence;regulate;
-;pace;#;determine;tqshape;mold;influence;regulate;
+;determine;shape;mold;influence;regulate;#;cause;do;make;
+;decide;#;determine;shape;mold;influence;regulate;
+;time;#;determine;shape;mold;influence;regulate;
+;index;#;determine;shape;mold;influence;regulate;
+;pace;#;determine;shape;mold;influence;regulate;
 ;deliberate;cogitate;#;chew over;think over;meditate;ponder;excogotate;contemplate;muse;reflect;mull;mull over;ruminate;speculate;
 ;see;#;deliberate;cogitate;
 ;contemplate;#;consider;take;deal;look at;
@@ -16403,7 +16403,7 @@
 ;swallow;take back;unsay;withdraw;#;renounce;repudiate;
 ;retreat;pull back;back out;back away;crawfish;crawfish out;pull in one's horns;withdraw;#
 ;revoke;annul;lift;countermand;reverse;repeal;overturn;rescind;vacate;#;cancel;strike down;
-;cancel;tqinvalidate;#;score;mark;
+;cancel;invalidate;#;score;mark;
 ;bracket;bracket out;#;edit;redact;
 ;cross off;cross out;strike out;strike off;mark;#;take away;take out;
 ;dismiss;disregard;brush aside;brush off;discount;push aside;ignore;#;reject;
@@ -17342,7 +17342,7 @@
 ;cling to;hold close;hold tight;clutch;#;hold;take hold;
 ;cling;cleave;adhere;stick;cohere;#;touch;adjoin;meet;contact;
 ;twist;#;turn;
-;twist;twine;distort;#;change tqshape;change form;deform;
+;twist;twine;distort;#;change shape;change form;deform;
 ;curl;wave;#;twist;
 ;grip;#;seize;prehend;clutch;
 ;wield;handle;#;manipulate;
@@ -17419,8 +17419,8 @@
 ;slice;slice up;#;cut;
 ;pink;#;cut;
 ;carve;cut up;#;cut;
-;carve;#;cut;tqshape;form;work;mold;mould;forge;
-;swage;upset;#;tqshape;form;work;mold;mould;forge;
+;carve;#;cut;shape;form;work;mold;mould;forge;
+;swage;upset;#;shape;form;work;mold;mould;forge;
 ;carve;chip at;#;cut;
 ;chop;hack;#;cut;
 ;chop;chop up;#;cut;
@@ -17430,7 +17430,7 @@
 ;nick;snick;#;cut;
 ;chip;knap;cut off;break off;#;cut;
 ;chip;chip off;come off;break away;break off;#;separate;divide;part;
-;chip;#;tqshape;form;work;mold;mould;forge;
+;chip;#;shape;form;work;mold;mould;forge;
 ;skim;skim off;cream off;cream;#;remove;take;take away;withdraw;
 ;egg;#;coat;surface;
 ;flour;#;dredge;
@@ -17467,7 +17467,7 @@
 ;fold;fold up;turn up;#;change surface;
 ;pucker;rumple;cockle;crumple;knit;#;wrinkle;ruckle;crease;crinkle;scrunch;scrunch up;crisp;
 ;contract;#;shrink;reduce;
-;bend;deform;twist;turn;#;change tqshape;change form;deform;
+;bend;deform;twist;turn;#;change shape;change form;deform;
 ;hole;#;hollow;hollow out;core out;
 ;rout;root;rootle;#;dig;delve;cut into;turn over;
 ;cave;undermine;#;hollow;hollow out;core out;
@@ -17954,7 +17954,7 @@
 ;thread;#;guide;run;draw;pass;
 ;wind;wind up;#;tighten;fasten;
 ;wind;wrap;roll;twine;#;move;displace;
-;encircle;circle;#;tqshape;form;
+;encircle;circle;#;shape;form;
 ;cheese;#;spool;
 ;ball;#;wind;wrap;roll;twine;
 ;clue;clew;#;wind;wrap;roll;twine;
@@ -18158,9 +18158,9 @@
 ;output;#;produce;make;create;
 ;pulse;pulsate;#;produce;make;create;
 ;machine;#;produce;make;create;
-;machine;#;tqshape;form;work;mold;mould;forge;
-;stamp;#;tqshape;form;work;mold;mould;forge;
-;beat;#;tqshape;form;work;mold;mould;forge;
+;machine;#;shape;form;work;mold;mould;forge;
+;stamp;#;shape;form;work;mold;mould;forge;
+;beat;#;shape;form;work;mold;mould;forge;
 ;elaborate;#;produce;make;create;
 ;compose;compile;#;make;
 ;catalogue;catalog;#;compose;compile;
@@ -18247,14 +18247,14 @@
 ;tie;#;fashion;forge;
 ;craft;#;fashion;forge;
 ;cooper;#;make;
-;tqshape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
-;hill;#;tqshape;form;work;mold;mould;forge;
+;shape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
+;hill;#;shape;form;work;mold;mould;forge;
 ;dip;#;create from raw material;create from raw stuff;
 ;raise;erect;rear;set up;put up;#;construct;build;make;
 ;level;raze;rase;dismantle;tear down;take down;pull down;#;destroy;destruct;
 ;press;press out;#;cast;mold;mould;
-;cast;mold;mould;#;tqshape;form;work;mold;mould;forge;
-;throw;#;tqshape;form;work;mold;mould;forge;
+;cast;mold;mould;#;shape;form;work;mold;mould;forge;
+;throw;#;shape;form;work;mold;mould;forge;
 ;cook;fix;ready;make;prepare;#;create from raw material;create from raw stuff;
 ;sandwich;#;organize;organise;prepare;devise;get up;machinate;
 ;devil;#;cook;fix;ready;make;prepare;
@@ -18290,7 +18290,7 @@
 ;gloss;polish;#;decorate;adorn;grace;ornament;embellish;beautify;
 ;japan;#;lacquer;
 ;blueprint;draft;draught;#;design;plan;
-;sculpt;sculpture;#;tqshape;form;work;mold;mould;forge;
+;sculpt;sculpture;#;shape;form;work;mold;mould;forge;
 ;paint;#;represent;interpret;
 ;paint;#;create;
 ;create;#;act;move;
@@ -18320,7 +18320,7 @@
 ;shade;fill in;#;draw;paint;
 ;vein;#;stain;
 ;color;colour;emblazon;#;decorate;adorn;grace;ornament;embellish;beautify;
-;model;mold;mould;#;tqshape;form;work;mold;mould;forge;
+;model;mold;mould;#;shape;form;work;mold;mould;forge;
 ;model;tqmock up;#;represent;interpret;
 ;sketch;outline;chalk out;#;draw;
 ;coin;#;create verbally;
@@ -19016,7 +19016,7 @@
 ;crook;curve;#;bend;flex;
 ;arch;curve;arc;#;bend;flex;
 ;straighten;unbend;#;change posture;
-;bend;flex;#;change tqshape;change form;deform;
+;bend;flex;#;change shape;change form;deform;
 ;dress;line up;#;position;
 ;line up;queue up;queue;#;stand;stand up;
 ;slope;incline;pitch;#;lean;tilt;tip;slant;angle;
@@ -19062,7 +19062,7 @@
 ;close;#;approach;near;come on;go up;draw near;draw close;come near;
 ;close;come together;#;move;
 ;push;crowd;#;approach;near;come on;go up;draw near;draw close;come near;
-;unfold;stretch;stretch out;extend;#;change tqshape;change form;deform;
+;unfold;stretch;stretch out;extend;#;change shape;change form;deform;
 ;tear;shoot;shoot down;charge;buck;#;rush;hotfoot;hasten;hie;speed;race;pelt along;rush along;cannonball along;bucket along;belt along;
 ;travel rapidly;speed;hurry;zip;#;travel;go;move;locomote;
 ;speed;#;travel;go;move;locomote;
@@ -19124,7 +19124,7 @@
 ;conduct;transmit;convey;carry;channel;#;bring;convey;take;
 ;clear;top;#;pass;overtake;overhaul;
 ;outdistance;outstrip;distance;#;leave behind;
-;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change tqshape;change form;deform;
+;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change shape;change form;deform;
 ;career;#;travel;go;move;locomote;
 ;circuit;#;travel;go;move;locomote;
 ;spread;scatter;spread out;#;circulate;pass around;pass on;distribute;
@@ -20038,8 +20038,8 @@
 ;cancel;strike down;#;declare;adjudge;hold;
 ;cancel;call off;#
 ;break;#;cancel;call off;
-;tqinvalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
-;break;#;tqinvalidate;annul;quash;void;avoid;nullify;
+;invalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
+;break;#;invalidate;annul;quash;void;avoid;nullify;
 ;sanction;#;authorize;authorise;pass;clear;
 ;issue;supply;#;distribute;
 ;distribute;#;transfer;
@@ -20369,7 +20369,7 @@
 ;connect;link;link up;join;unite;#
 ;bridge;bridge over;#;connect;link;tie;link up;
 ;root;#;become;
-;form;take form;take tqshape;spring;#;become;
+;form;take form;take shape;spring;#;become;
 ;originate;arise;rise;develop;uprise;spring up;grow;#;become;
 ;come forth;emerge;#;originate;arise;rise;develop;uprise;spring up;grow;
 ;break;#;come forth;emerge;