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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

2078 files changed, 13789 insertions, 13789 deletions

diff --git a/chalk/HACKING b/chalk/HACKING
index a48526b0c..c6f4ba66a 100644
--- a/chalk/HACKING
+++ b/chalk/HACKING
@@ -62,7 +62,7 @@ Variable/Parameter names
 
 Designer
 
-	Chalk has started to use designer. All dialogs and all widgets that have a layout
+	Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
 	manager must be done in designer. We don't add code nor add signal/slot connections
 	in designer
 
diff --git a/chalk/IMAGE_LIBRARIES b/chalk/IMAGE_LIBRARIES
index 1d26fb969..f2f0c1dc1 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 shapes before display.
+used by Karbon to render tqshapes before display.
 
 Advantages:
 
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc
index a67652f77..b769a3d3c 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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(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").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").tqarg(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").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
+    return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
 }
 
 double KisGenericLabHistogramProducer::maximalZoom() const {
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h
index 83222765e..8b913ece8 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.h
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.h
@@ -60,7 +60,7 @@ protected:
     /**
      * The order in which channels() returns is not the same as the internal representation,
      * that of the pixel internally. This method converts external usage to internal usage.
-     * This method uses some basic assumtpions about the layout of the pixel, so _extremely_
+     * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
      * exotic spaces might want to override this (see makeExternalToInternal source for
      * those assumptions)
      **/
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
index c0219836a..424e346df 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
 */
 
     // Load all colorspace modules
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     if (offers.empty()) {
diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cc
index ae4c07cba..2d0ad98f4 100644
--- a/chalk/chalkcolor/kis_profile.cc
+++ b/chalk/chalkcolor/kis_profile.cc
@@ -25,7 +25,7 @@
 #include LCMS_HEADER
 
 #include <tqimage.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <kdebug.h>
@@ -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.resize(bytesNeeded))
+    if(m_rawData.tqresize(bytesNeeded))
     {
         _cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
         cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
index f8f3c6ac3..901f29093 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
 {
     m_subject = 0;
 
-    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
+    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
 
     TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");
 
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index 42c3042bb..df0666c4e 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdockwindow.h>
 #include <tqpoint.h>
 #include <tqlabel.h>
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c
index d2e27cd1c..d69402948 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_repaint() routine
-    and are removed by the next_cell_for_repaint() function.  The
+    Points are added to this list by the need_to_tqrepaint() routine
+    and are removed by the next_cell_for_tqrepaint() 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_repaint = 0;
+static int   next_to_tqrepaint = 0;
 
 /* *********************************************************************** */
 
@@ -50,7 +50,7 @@ int number_of_repaints_needed()
 
 /* *********************************************************************** */
 
-void need_to_repaint(point)
+void need_to_tqrepaint(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 repaint
+   /*  If the list is already full then simply ignore the tqrepaint
        request - it will get done eventually anyway.  */
 
    if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;
 
 /* *********************************************************************** */
 
-void next_cell_for_repaint(cell, locus)
+void next_cell_for_tqrepaint(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_repaint(cell, locus)
    POINT_PTR locus;
 
 {
-   if (next_to_repaint >= next_free) {
-      next_to_repaint = next_free = 0;
+   if (next_to_tqrepaint >= next_free) {
+      next_to_tqrepaint = next_free = 0;
       *(cell) = NIL;
       return;
    }
 
-   *(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++;
+   *(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++;
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h
index 2df50140d..57453e7b8 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_repaint (/* POINT */);
+extern void need_to_tqrepaint (/* 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_repaint (/* *CELL_PTR, POINT_PTR  */);
+extern void next_cell_for_tqrepaint (/* *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 19097d9fc..b3855bda5 100644
--- a/chalk/colorspaces/wetsticky/ws/engine.c
+++ b/chalk/colorspaces/wetsticky/ws/engine.c
@@ -192,7 +192,7 @@ int      amount;
 
    }
 
-   need_to_repaint(destLocus);
+   need_to_tqrepaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c
index 03a7d4f32..fceb0c055 100644
--- a/chalk/colorspaces/wetsticky/ws/engine3.c
+++ b/chalk/colorspaces/wetsticky/ws/engine3.c
@@ -191,7 +191,7 @@ int      amount;
 
    }
 
-   need_to_repaint(destLocus);
+   need_to_tqrepaint(destLocus);
 }
 
 /* *********************************************************************** */
diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c
index 76a552a9c..953b10c8a 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_repaint(&cell, &p);
+      next_cell_for_tqrepaint(&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 f4cb49013..7c36a303b 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_repaint(&cell, &p);
+      next_cell_for_tqrepaint(&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 247bc7df9..31ee9d181 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").arg(width).arg(height);
+        //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(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").arg(width).arg(height);
+        //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
     }
 
     //scaledImage.save(filename, "PNG");
diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc
index 32283ad33..ea0351dfc 100644
--- a/chalk/core/kis_convolution_painter.cc
+++ b/chalk/core/kis_convolution_painter.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <cfloat>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqcolor.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 1981bd02b..043bf4e34 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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_UINT32)0;
                 } else {
                     r.numerator = (TQ_UINT32) attr.toUInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_INT32)0;
                 } else {
                     r.numerator = (TQ_INT32) attr.toInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (double)0);
                 } else {
@@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
     {
         case EXIF_TYPE_BYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(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").arg(i), asShort( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
             break;
         case EXIF_TYPE_LONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
             break;
         case EXIF_TYPE_RATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifRational r = asRational(i);
-                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_SBYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
             break;
         case EXIF_TYPE_UNDEFINED:
         {
             UByteArray value = asUndefined();
             TQByteArray data;
             data.setRawData((char*)value.data(), value.size());
-            TQByteArray encodedData;
-            KCodecs::base64Encode( data, encodedData );
+            TQByteArray tqencodedData;
+            KCodecs::base64Encode( data, tqencodedData );
             data.resetRawData( (char*)value.data(), value.size());
-            elmt.setAttribute("value", TQString(encodedData));
+            elmt.setAttribute("value", TQString(tqencodedData));
         }
             break;
         case EXIF_TYPE_SSHORT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
             break;
         case EXIF_TYPE_SLONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
             break;
         case EXIF_TYPE_SRATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifSRational r = asSRational(i);
-                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_FLOAT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
             break;
         case EXIF_TYPE_DOUBLE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(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 ").arg( asExifNumber( i ).m_byte );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
         case EXIF_TYPE_SHORT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_short );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
         case EXIF_TYPE_LONG:
-            return TQString("%1 ").arg( asExifNumber( i ).m_long );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
         case EXIF_TYPE_RATIONAL:
-            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
+            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
         case EXIF_TYPE_SBYTE:
-            return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
         case EXIF_TYPE_SSHORT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
         case EXIF_TYPE_SLONG:
-            return TQString("%1 ").arg( asExifNumber( i ).m_slong );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
         case EXIF_TYPE_SRATIONAL:
-            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
+            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
         case EXIF_TYPE_FLOAT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_float );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
         case EXIF_TYPE_DOUBLE:
-            return TQString("%1 ").arg( asExifNumber( i ).m_double );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
         default:
             return "unknow ";
     }
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc
index a025ce109..54e730a71 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cc
@@ -22,7 +22,7 @@
 #include <cfloat>
 #include <stack>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
 #include "tqpen.h"
@@ -209,7 +209,7 @@ struct FillSegment {
 //    FillSegment* parent;
 };
 
-typedef enum { None = 0, Added = 1, Checked = 2 } Status;
+typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
 
 KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
     if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
 
     stack.push(new FillSegment(startX, startY/*, 0*/));
 
-    Status* map = new Status[m_size];
+    tqStatus* map = new tqStatus[m_size];
 
-    memset(map, None, m_size * sizeof(Status));
+    memset(map, None, m_size * sizeof(tqStatus));
 
     int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
     emit notifyProgressStage(i18n("Making fill outline..."), 0);
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index 53f17ea8e..b7c8383ec 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
     Q_ASSERT(KisFilterRegistry::m_singleton == 0);
     KisFilterRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc
index 6dffc087d..efc370bb7 100644
--- a/chalk/core/kis_gradient.cc
+++ b/chalk/core/kis_gradient.cc
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include <tqimage.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <koColor.h>
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc
index 8d387e6fa..2258d8991 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <cfloat>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqcolor.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),
 
 bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
                        const KisPoint& gradientVectorEnd,
-                       enumGradientShape shape,
+                       enumGradientShape tqshape,
                        enumGradientRepeat repeat,
                        double antiAliasThreshold,
                        bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
 
     if (!m_gradient) return false;
 
-    GradientShapeStrategy *shapeStrategy = 0;
+    GradientShapeStrategy *tqshapeStrategy = 0;
 
-    switch (shape) {
+    switch (tqshape) {
     case GradientShapeLinear:
-        shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeBiLinear:
-        shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeRadial:
-        shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeSquare:
-        shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConical:
-        shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConicalSymetric:
-        shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     }
-    Q_CHECK_PTR(shapeStrategy);
+    Q_CHECK_PTR(tqshapeStrategy);
 
     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 = shapeStrategy->valueAt( x, y);
+            double t = tqshapeStrategy->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 = shapeStrategy->valueAt(sampleX, sampleY);
+                            double t = tqshapeStrategy->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 shapeStrategy;
+    delete tqshapeStrategy;
 
     emit notifyProgressDone();
 
diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h
index 2c0e29c27..fc31b117a 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 shape,
+               enumGradientShape tqshape,
                enumGradientRepeat repeat,
                double antiAliasThreshold,
                bool reverseGradient,
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index 0e2f90d25..1f08dbddc 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 children, nothing to show for it.
+            // No tqchildren, 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 children, a group layer is empty.
+    // No child -- clear the projection. Without tqchildren, 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 58a3ddab9..a516ac723 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() << " children "
+//                    << ", " << m_layers.count() << " tqchildren "
 //                    << ", projection: " << m_projection
 //                    << "\n";
             return v.visit(this);
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index ca4703827..726d0295f 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc
index 4cb51a989..ff66144d6 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.arg(m_generator++);
+    return m_prefix.tqarg(m_generator++);
 }
 
 TQ_INT32 KisNameServer::currentSeed() const
diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc
index ed51587b9..c64935fc7 100644
--- a/chalk/core/kis_painter.cc
+++ b/chalk/core/kis_painter.cc
@@ -26,7 +26,7 @@
 #include <climits>
 #include <strings.h>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
 #include "tqpen.h"
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 7d5de556c..012f20275 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry()
     Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
     KisPaintOpRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc
index c6f0c6459..161a4ff8e 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cc
@@ -33,7 +33,7 @@
 #include <tqpoint.h>
 #include <tqvaluevector.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 69b90fe3e..03d766162 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.rects();
+            TQMemArray<TQRect> rects = region.tqrects();
 
             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 f702d9206..10ab8dbb6 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 shapes,
+              (kis_resource_mediator). Resources are brush tqshapes,
               patterns (and colours, too?) Patrick intended a Flyweight
               here.
 
diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt
index 2b860773c..aa3bf87b7 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 shape cursors.
+tools, like rubber bands, vector paths, brush tqshape cursors.
 
 
diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features
index 4bca9d00c..1c737ce68 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 shapes. Support for colored and grayscale brushes and
+** gimp brush tqshapes. Support for colored and grayscale brushes and
    pipe brushes. Support from Gimp parasites in brushes.
-** custom brush shapes
-** text brush shapes
+** custom brush tqshapes
+** text brush tqshapes
 ** 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 b209cfa9f..69c6edca3 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="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" >
      <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="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" >
      <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="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" >
      <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>
@@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
     <UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" >
      <UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" >
+    <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" >
      <UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
@@ -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="invalidate" />
-    <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" >
+    <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: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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" >
      <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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" >
      <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="invalidate" />
-    <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" >
+    <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: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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" >
      <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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
      <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="invalidate" />
-    <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" >
+    <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: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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" >
      <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="invalidate" >
+    <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" >
      <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="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="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="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="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="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="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="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="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="2102" label="tileNum" />
       <listitem open="0" type="815" id="2105" label="tiles" />
       <listitem open="0" type="815" id="2106" label="validate" />
@@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="473" label="KisTileCacheInterface" />
       <listitem open="0" type="815" id="474" label="flush" />
       <listitem open="0" type="815" id="476" label="insert" />
-      <listitem open="0" type="815" id="478" label="sizeHint" />
+      <listitem open="0" type="815" id="478" label="tqsizeHint" />
       <listitem open="0" type="815" id="480" label="~KisTileCacheInterface" />
      </listitem>
      <listitem open="0" type="813" id="1996" label="KisTileCommand" >
@@ -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="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="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="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 ceacf630a..7d2427134 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_shapesslider" />
+      <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="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_shapesdocker" />
+      <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="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_shapesslider;" >
+          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
            <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_shapesdocker;" >
+          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
            <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_shapesslider;" >
+              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&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_shapesdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&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_shapesslider;" >
+       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
         <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_shapesslider;" >
+       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&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_shapesdocker;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
         <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_shapesdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline
index 88722a45e..081f9ed70 100644
--- a/chalk/doc/doc-outline
+++ b/chalk/doc/doc-outline
@@ -85,7 +85,7 @@ The current outline (working towards 1.6):
   - [TODO] properties, usage, converting, ...
 
 - Commands
-  - General layout
+  - General tqlayout
   - Menus
   - Toolbars
   - Palettes
@@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31):
   - Available colorspaces
 
 - Commands ([TODO] make up-to-date)
-  - General layout
+  - General tqlayout
   - Menus
   - Toolbars
   - Palettes
diff --git a/chalk/doc/selections b/chalk/doc/selections
index 37d787022..32bffe498 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 shape of the selection is 
+selection active still has a selection, but the tqshape of the selection is 
 transformed.
 
 If a layer is moved, the selection moves with the layer (this is not 
diff --git a/chalk/doc/the preview widget b/chalk/doc/the preview widget
index a403da86b..cc06b9de3 100644
--- a/chalk/doc/the preview widget
+++ b/chalk/doc/the preview widget
@@ -2,7 +2,7 @@
 On Tuesday 21 June 2005 14:16, Casper Boemann wrote:
 > Hi
 >
-> As you might have noticed I have changed the layout of the preview, to lo=
+> As you might have noticed I have changed the tqlayout of the preview, to lo=
 ok
 > more like digikam.
 >
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc
index 8d3604974..0217b7e17 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("shape", wCTA->widget()->cbShape->currentItem());
+        config->setProperty("tqshape", 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 shape = (config->getProperty("shape", value)) ? value.toInt() : 0;
+    int tqshape = (config->getProperty("tqshape", 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(shape)
+    switch(tqshape)
     {
         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 b12e6b11a..dc836971f 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cc
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_blur.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 
 #include <kcombobox.h>
@@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name
 void KisWdgBlur::setConfiguration(KisFilterConfiguration* config)
 {
     TQVariant value;
-    if (config->getProperty("shape", value))
+    if (config->getProperty("tqshape", value))
     {
         widget()->cbShape->setCurrentItem( value.toUInt() );
     }
diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui
index 8cd89f636..3e381bbe5 100644
--- a/chalk/plugins/filters/blur/wdgblur.ui
+++ b/chalk/plugins/filters/blur/wdgblur.ui
@@ -32,7 +32,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -49,7 +49,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -58,7 +58,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -76,13 +76,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>16</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>16</width>
                             <height>32767</height>
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc
index 38d310078..4ae92469c 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cc
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cc
@@ -31,7 +31,7 @@
 #include <vector>
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
index 2934623a8..513912eae 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="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -66,7 +66,7 @@ layer, the current layer will be used.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -82,7 +82,7 @@ layer, the current layer will be used.</string>
             <property name="title">
                 <string>Settings</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <grid>
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index 23c7e221e..abd1bb66c 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 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).
+        \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).
 
         \see CImg::get_append()
     **/
@@ -7772,7 +7772,7 @@ namespace cimg_library {
 
     //! Return a resized image.
     /**
-       \param src = Image giving the geometry of the resize.
+       \param src = Image giving the tqgeometry 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 geometry of the resize.
+       \param disp = Display giving the tqgeometry 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 geometry of the resize.
+       \param src = Image giving the tqgeometry 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 geometry of the resize.
+       \param disp = Display giving the tqgeometry 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 geometry.
+       \param sigma = regularity of the tensor-valued tqgeometry.
        \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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment 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 9c3a7543d..665dfc098 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 geometry");
+    const char *geom  = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry");
     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 geometry");
+    const char *geom     = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry");
     //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/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
index 46df5cc67..b65a435f9 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
@@ -19,7 +19,7 @@
  *
  * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé.
  */
-#include "layout.h"
+#include "tqlayout.h"
 #include "tqcheckbox.h"
 #include "tqpushbutton.h"
 
diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui
index 09d4e3236..397e52e6d 100644
--- a/chalk/plugins/filters/cimg/wdg_cimg.ui
+++ b/chalk/plugins/filters/cimg/wdg_cimg.ui
@@ -42,7 +42,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>51</width>
                     <height>20</height>
diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
index 75635c8c1..5b03ad70d 100644
--- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp
+++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
@@ -21,7 +21,7 @@
 #include "KisWdgColorify.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcolorbutton.h>
diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
index 90337f226..ad1c062e4 100644
--- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui
+++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -38,7 +38,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
index 14d4c26da..31b726bf0 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
@@ -21,7 +21,7 @@
 #include "kis_wdg_color_to_alpha.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcolorbutton.h>
diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
index 70ff3071a..525b221ca 100644
--- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
+++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -38,7 +38,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,7 +95,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index c0fcee28f..a97f809bd 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -23,7 +23,7 @@
 
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
@@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
         }
         n = n.nextSibling();
     }
-    // If the adjustment was cached, it now has changed - invalidate it
+    // If the adjustment was cached, it now has changed - tqinvalidate it
     delete m_adjustment;
     m_adjustment = 0;
 }
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
index 8b6aa949e..928badedc 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
index 3382102cc..1e576f662 100644
--- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
+++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -50,13 +50,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>250</width>
                             <height>20</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>250</width>
                             <height>20</height>
@@ -84,13 +84,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>254</width>
                             <height>254</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>254</width>
                             <height>254</height>
@@ -116,13 +116,13 @@
                             <property name="name">
                                 <cstring>kCurve</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>250</width>
                                     <height>250</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>250</width>
                                     <height>250</height>
@@ -143,13 +143,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>250</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>250</height>
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -193,7 +193,7 @@
                     <property name="text">
                         <string>Contrast</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -226,7 +226,7 @@
                     <property name="text">
                         <string>Brightness</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -253,7 +253,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>131</width>
                     <height>20</height>
diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
index 7f413abc0..8d95814cc 100644
--- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
+++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -65,13 +65,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>20</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>20</height>
@@ -134,13 +134,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>32767</height>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
index 860595e2d..03c0e3369 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -69,7 +69,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -115,7 +115,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>24</width>
                                     <height>20</height>
@@ -134,7 +134,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -153,7 +153,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
index 3db7389ca..2c1c87d9c 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
@@ -18,7 +18,7 @@
 
 #include "kis_custom_convolution_filter_configuration_widget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <klocale.h>
diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
index c20001d37..49826ccb9 100644
--- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
+++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_fastcolortransfer.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kurlrequester.h>
 
diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
index 97379ceac..c14bd51a8 100644
--- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
+++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>101</height>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
index b4d0487a3..b83baa116 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_lens_correction.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 
diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
index 25705322c..6ee2631a6 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
+++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -135,7 +135,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc
index b36e5ce97..7b836436e 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.begin(TQT_TQPAINTDEVICE(&pm), this);
+        p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
 
         pm.fill();
 
@@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )
             m_gamma = 1.0 / pow (10, tmp);
             break;
        }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
@@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
         return;
 
     m_dragging = false;
-    repaint(false);
+    tqrepaint(false);
 
     switch (m_grab_cursor) {
         case BlackCursor:
@@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e )
         }
     }
 
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KGradientSlider::leaveEvent( TQEvent * )
@@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * )
 void KGradientSlider::enableGamma(bool b)
 {
     m_gammaEnabled = b;
-    repaint(false);
+    tqrepaint(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);
         }
-        repaint(false);
+        tqrepaint(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);
         }
-        repaint(false);
+        tqrepaint(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);
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "kgradientslider.moc"
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
index 2dbf8a44d..b7c1cb00d 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui
index f365e3d14..841b78fb5 100644
--- a/chalk/plugins/filters/levelfilter/wdg_level.ui
+++ b/chalk/plugins/filters/levelfilter/wdg_level.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -70,13 +70,13 @@
                     <property name="name">
                         <cstring>histview</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>256</width>
                             <height>256</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>256</width>
                             <height>256</height>
@@ -88,7 +88,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -98,7 +98,7 @@
                             <property name="name">
                                 <cstring>ingradient</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>256</width>
                                     <height>20</height>
@@ -107,7 +107,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -134,7 +134,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>25</width>
                                             <height>20</height>
@@ -148,7 +148,7 @@
                                     <property name="text">
                                         <string>1.0</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignCenter</set>
                                     </property>
                                 </widget>
@@ -162,7 +162,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>25</width>
                                             <height>20</height>
@@ -194,7 +194,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -204,7 +204,7 @@
                             <property name="name">
                                 <cstring>outgradient</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>256</width>
                                     <height>20</height>
@@ -213,7 +213,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -240,7 +240,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>50</width>
                                             <height>20</height>
@@ -274,7 +274,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -291,7 +291,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
index 8692a50f5..c13db9527 100644
--- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
+++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_noise.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 
diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
index 2741e1164..3bafae01f 100644
--- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
+++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
index 72c0675b0..81ee1448f 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
@@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c
 
     KisColorSpace * cs = src->colorSpace();
 
-    TQDateTime dt = TQDateTime::currentDateTime();
+    TQDateTime dt = TQDateTime::tqcurrentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
 
     srand ((uint) dt.secsTo(Y2000));
diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
index 9c8a44d8e..ba157e14d 100644
--- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
+++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_random_pick.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 
diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
index 934d465fd..c9ce3acf5 100644
--- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
+++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
index be233d703..627d105cf 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_unsharp.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 
 #include <kcombobox.h>
diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui
index c2181eb88..faf74dd4d 100644
--- a/chalk/plugins/filters/unsharp/wdgunsharp.ui
+++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui
@@ -84,7 +84,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -115,7 +115,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
index fb6c59c59..e7537c277 100644
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
@@ -20,7 +20,7 @@
 
 #include "kis_wdg_wave.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <knuminput.h>
@@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intHAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("horizontalshape", value))
+    if (config->getProperty("horizontaltqshape", value))
     {
         widget()->cbHShape->setCurrentItem( value.toUInt() );
     }
@@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intVAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("verticalshape", value))
+    if (config->getProperty("verticaltqshape", value))
     {
         widget()->cbVShape->setCurrentItem( value.toUInt() );
     }
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc
index a7a9264e9..ddcfc4bd4 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("horizontalshape", wN->widget()->cbHShape->currentItem() );
+        config->setProperty("horizontaltqshape", 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("verticalshape", wN->widget()->cbVShape->currentItem() );
+        config->setProperty("verticaltqshape", 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 horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0;
+    int horizontaltqshape = (config && config->getProperty("horizontaltqshape", 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 verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0;
+    int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0;
     KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true );
     KisWaveCurve* verticalcurve;
-    if(verticalshape == 1)
+    if(verticaltqshape == 1)
         verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     else
         verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     KisWaveCurve* horizontalcurve;
-    if(horizontalshape == 1)
+    if(horizontaltqshape == 1)
         horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
     else
         horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
index e56f47604..b81322623 100644
--- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
+++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>60</width>
                     <height>20</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index 7338ef545..c5f938642 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
-// shape -- often a simple ellipse -- and filled that shape with a
+// tqshape -- often a simple ellipse -- and filled that tqshape with a
 // random 'spray' of single pixels.
 //
 // Other, more advanced graphics apps, like the Gimp or Photoshop,
-// take the brush shape and paint just as with the brush paint op,
+// take the brush tqshape 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 shapes, instead going for the old-fashioned
+// one. It won't use brush tqshapes, 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 shape -- it beats calculating
+    // For now: use the current brush tqshape -- it beats calculating
     // ellipes and cones, and it shows the working of the timer.
     if (!device) return;
 
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index c794c76a3..1ec165619 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -24,7 +24,7 @@
 
 #include <tqrect.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqtoolbutton.h>
@@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
     m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget);
     m_curveControl = new WdgBrushCurveControl(m_optionsWidget);
     TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
-    moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
     connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
 
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
index e88ecbe35..89207a506 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
+++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
@@ -39,7 +39,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -83,7 +83,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -127,7 +127,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout5</cstring>
+                            <cstring>tqlayout5</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -183,7 +183,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
index 69542a6ea..c5f4e6eb0 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
@@ -22,7 +22,7 @@
 
 #include <tqrect.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqtabwidget.h>
@@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
         m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2),
                 i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate."));
         TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
-        moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+        moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
         moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
         connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
     } else {
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 61e485a59..384e4e263 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -19,7 +19,7 @@
  */
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index c5c9d3246..6aff68c8d 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlistview.h>
@@ -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.").arg(palette->filename()), i18n("Palette"));
+                KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette"));
             }
         }
     }
@@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor()
             TQString channelValueText;
 
             if (m_normaliseValues) {
-                channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
+                channelValueText = i18n("%1%").tqarg(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_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 4fcf642bd..f15bf7781 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kcommand.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <tqcolor.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 0f0305e55..6df9f8da4 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
@@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient()
     m_endPos = KisPoint(0, 0);
 
     m_reverse = false;
-    m_shape = KisGradientPainter::GradientShapeLinear;
+    m_tqshape = 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_shape, 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_tqshape, 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, "shape_combo");
+    m_cmbShape = new TQComboBox(false, widget, "tqshape_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 shape)
+void KisToolGradient::slotSetShape(int tqshape)
 {
-    m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape);
+    m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape);
 }
 
 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 08ab06abb..29df8bf7b 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_shape;
+    KisGradientPainter::enumGradientShape m_tqshape;
     KisGradientPainter::enumGradientRepeat m_repeat;
 
     bool m_reverse;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
index 7b1df85b2..243052cfe 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
@@ -21,7 +21,7 @@
  */
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index c624d30a4..bf23b4412 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -19,7 +19,7 @@
 #include <tqfont.h>
 #include <tqrect.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqstring.h>
 #include <tqpixmap.h>
@@ -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").arg(m_font.pointSize()));
+    m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(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")
-        .arg(m_font.pointSize()), fontBox);
+        .tqarg(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/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
index 5463d3e34..7675b875d 100644
--- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
+++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
@@ -47,13 +47,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>200</width>
                     <height>32767</height>
@@ -70,7 +70,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -101,7 +101,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index 8f9eb2022..4a59c3845 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -20,7 +20,7 @@
 
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqrect.h>
 
@@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Brush"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
index 9fd07e6dd..faeb32d8b 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 shape. Not sure what kind of an icon could represent this... 
+ * brush tqshape. 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_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index 0dfe1e1c4..cc1646808 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -21,7 +21,7 @@
  */
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 #include <tqcheckbox.h>
@@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Contiguous Area Selection"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->setSpacing( 6 );
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index cfce3704e..d16ab740e 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e)
                 rc = rc.normalize();
                 
                 KisSelectionSP tmpSel = new KisSelection(dev);
-                KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1);
+                KisAutobrushCircleShape tqshape(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 - shape.valueAt(x,y);
+                        value = MAX_SELECTED - tqshape.valueAt(x,y);
                         tmpSel->setSelected( x+rc.x(), y+rc.y(), value);
                     }
                 switch(m_selectAction)
@@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index a6f52abc1..118281e17 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -20,7 +20,7 @@
 
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>
@@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Eraser"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
index cb8b82ed2..c796ec3c7 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 shape. Not sure what kind of an icon could represent
+ * current eraser tqshape. 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/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index cf8bb81e6..8bac379ce 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index f1a6436da..85a53c94c 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index f4e4743d5..54bfbdd6d 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -24,7 +24,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 371075088..8f5c9e5f8 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.rects ();
+        TQMemArray <TQRect> rects = m_handlesRegion.tqrects ();
         for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it)
         {
             gc.fillRect (*it, TQt::black);
diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
index 5cbcd4762..8d3bf1d82 100644
--- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
+++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -138,7 +138,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -185,7 +185,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index 69e7953e8..e18b096c2 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -21,7 +21,7 @@
 #include <math.h>
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
index 9d47647d2..663e1324d 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
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 582c89cd7..c2a3715b0 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("beziershape", i18n("Bezier Painting Tool")); }
+    virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); }
 };
 
 #endif //__KIS_TOOL_CURVE_PAINT_H_
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
index 2a8d10471..ed1200d4f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index 463ef6411..d4a8605d8 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -23,7 +23,7 @@
 
 #include <tqapplication.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>
@@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
index b759c8f6f..e14abcb5d 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h
index ad77204ec..e7bfd89ef 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("exampleshape", i18n("Example Tool")); }
+    virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); }
 };
 
 
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index b8d221ea9..42806771f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -22,7 +22,7 @@
 #include <set>
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist)
 TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
 {
     m_optWidget = super::createOptionWidget(parent);
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
     box->setColStretch(0, 1);
     box->setColStretch(1, 1);
diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
index 1384ff58f..035eff3be 100644
--- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
+++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
index a23de04bd..e53c96da8 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
@@ -21,7 +21,7 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kaction.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 54dd393d2..ae07e5895 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 74274cdda..700efa4b6 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -19,7 +19,7 @@
  */
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc
index 53743ae16..037f6bb52 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h
index 8128dcdf3..947dae25c 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("starshape", i18n("Star Tool")); }
+    virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); }
 };
 
 
diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui
index a6395037a..3f4f30f57 100644
--- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui
+++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
index 5375d5648..2cf6806e7 100644
--- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
+++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -43,7 +43,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout1</cstring>
+                                <cstring>tqlayout1</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -72,7 +72,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -103,7 +103,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -111,7 +111,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -140,7 +140,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -178,7 +178,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index 552e4c40f..1d2c4d611 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *
 
     setCaption(i18n("Color Range"));
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev);
 
diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
index 876f03199..67c6028b5 100644
--- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
+++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -37,7 +37,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -144,7 +144,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -233,7 +233,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
index 00c0c8200..0498505d1 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")
-                    .arg(image->colorSpace()->id().name()),
+                    .tqarg(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")
-                    .arg(dev->colorSpace()->id().name()),
+                    .tqarg(dev->colorSpace()->id().name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
             "lab16degradation") != KMessageBox::Continue) return;
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
index 31163eb72..6f9af1c60 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
@@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys());
 
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index ddb47f471..fedb1fd17 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
@@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
     m_page = new WdgDropshadow(this, "dropshadow");
     Q_CHECK_PTR(m_page);
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     KConfig * cfg = KGlobal::config();
     m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );
diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
index 2354cfbc0..69aae6249 100644
--- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
+++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
@@ -116,7 +116,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>200</width>
                     <height>20</height>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>200</width>
                     <height>20</height>
@@ -169,7 +169,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>190</width>
                     <height>20</height>
@@ -194,7 +194,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>120</width>
                     <height>31</height>
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
index f130a46b3..60313cb22 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
@@ -22,7 +22,7 @@
 #include "kis_dlg_filtersgallery.h"
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
 
@@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
     connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* )));
     // Initialize configWidgetHolder
     m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal );
-    //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+    //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
     // Initialize preview widget
     
     if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice())
@@ -64,10 +64,10 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
         m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() );
     }
     connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
-    resize( minimumSizeHint());
-    m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
+    resize( tqminimumSizeHint());
+    m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
     m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder);
-    m_widget->configWidgetHolder->layout()->add(m_labelNoCW);
+    m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW);
     m_labelNoCW->hide();
 }
 
@@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
     m_currentFilter = kisitem->filter();
     if(m_currentConfigWidget != 0)
     {
-        m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget);
+        m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
         delete m_currentConfigWidget;
         m_currentConfigWidget = 0;
     } else {
@@ -94,8 +94,8 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
        m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice());
     
     if(m_currentConfigWidget != 0) {
-        //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-        m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget);
+        //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+        m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
     }
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
index 03972a16b..4b8127709 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
@@ -49,7 +49,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
index 0ceb3dd40..90acf1309 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
@@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget *  parent, const char * name)
 
     setCaption(i18n("Histogram"));
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 }
 
 DlgHistogram::~DlgHistogram()
diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui
index be6f9552a..320b7d7af 100644
--- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui
+++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -75,7 +75,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -124,7 +124,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>256</width>
                     <height>150</height>
@@ -133,7 +133,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
index 6ee07f306..8a6567528 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
@@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget *  parent,
     m_page->cmbFilterType->setCurrentText("Mitchell");
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     unblockAll();
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
index d084060bc..6d24d60ac 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
@@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget *  parent,
     m_page->cmbFilterType->setCurrentText("Mitchell");
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     unblockAll();
 
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
index 8e8ca43df..1686fe97a 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>65</width>
                             <height>20</height>
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>65</width>
                             <height>20</height>
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -197,7 +197,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -214,7 +214,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -307,7 +307,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <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 b9b3e400a..13cd72a8c 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="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -93,7 +93,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <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 72a70c8a3..d3a8326a9 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="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
index 300161a8c..bb21f6f77 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
@@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget *  parent, const char * name) :
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
index 566dabc46..5e327aa8b 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
@@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget *  parent, const char * name) : sup
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
index 5b4c8747e..b69b998fa 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
@@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget *  parent, const char * name) :
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
index e4a3386d2..dafb66698 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
@@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc
index 5b65a9e4a..8a137374a 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cc
@@ -27,7 +27,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqdatetime.h>
 
 #include <klocale.h>
@@ -140,7 +140,7 @@ void PerfTest::slotPerfTest()
         }
         if (dlgPerfTest->page()->chkShape->isChecked()) {
             kdDebug() << "Shapetest\n";
-            TQString s = shapeTest(testCount);
+            TQString s = tqshapeTest(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")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(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")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(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")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(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")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(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")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque patternfill  of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
     }
 
@@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
 
 }
 
-TQString PerfTest::shapeTest(TQ_UINT32 testCount)
+TQString PerfTest::tqshapeTest(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").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    rotated  1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+            report = report.append(TQString("    converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+            report = report.append(TQString("    filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(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").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(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").arg(numViewsPainted));
+    report = report.append(TQString("    painted current view at %1 frames per second\n").tqarg(numViewsPainted));
 
     return report;
 }
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h
index 959233e4c..cbd8799fb 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 shapeTest(TQ_UINT32 testCount);
+    TQString tqshapeTest(TQ_UINT32 testCount);
     TQString layerTest(TQ_UINT32 testCount);
     TQString scaleTest(TQ_UINT32 testCount);
     TQString rotateTest(TQ_UINT32 testCount);
diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
index b019e9e11..20f668255 100644
--- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
+++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
@@ -233,7 +233,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
index 9440a8fe4..03bd6b52c 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
@@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));
diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
index af18881a6..884776f1f 100644
--- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
+++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -48,7 +48,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -65,7 +65,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -79,7 +79,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -96,7 +96,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -110,7 +110,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -177,7 +177,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -219,7 +219,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>91</height>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index 585290ae3..6e942c389 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -25,7 +25,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqvbox.h>
 
 #include <kaccel.h>
@@ -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.")
-            .arg(url.prettyURL());
+            .tqarg(url.prettyURL());
         KMessageBox::error(this, text, caption);
     }
 
@@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )
 
 void KSnapshot::slotCopy()
 {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     cb->setPixmap( snapshot );
 }
 
@@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 )
             return w;
     }
     Window root, parent;
-    Window* children;
-    unsigned int nchildren;
+    Window* tqchildren;
+    unsigned int ntqchildren;
     Window ret = None;
-    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
+    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
         for( unsigned int i = 0;
-             i < nchildren && ret == None;
+             i < ntqchildren && ret == None;
              ++i )
-            ret = findRealWindow( children[ i ], depth + 1 );
-        if( children != NULL )
-            XFree( children );
+            ret = findRealWindow( tqchildren[ i ], depth + 1 );
+        if( tqchildren != NULL )
+            XFree( tqchildren );
     }
     return ret;
 }
@@ -365,12 +365,12 @@ void KSnapshot::performGrab()
         h += 2 * border;
 
         Window parent;
-        Window* children;
-        unsigned int nchildren;
+        Window* tqchildren;
+        unsigned int ntqchildren;
         if( XQueryTree( qt_xdisplay(), child, &root, &parent,
-                &children, &nchildren ) != 0 ) {
-            if( children != NULL )
-                XFree( children );
+                &tqchildren, &ntqchildren ) != 0 ) {
+            if( tqchildren != NULL )
+                XFree( tqchildren );
             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 shape of the window;
+            //The ShapeBounding region is the outermost tqshape 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/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
index 5c0951a8e..eb8fa60a1 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
@@ -44,7 +44,7 @@ public:
     KSnapshotThumb(TQWidget *parent, const char *name = 0)
         : TQLabel(parent, name)
         {
-            setAlignment(AlignHCenter | AlignVCenter);
+            tqsetAlignment(AlignHCenter | AlignVCenter);
         }
     virtual ~KSnapshotThumb() {}
 
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
index 65ae3c99f..346439022 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
@@ -23,7 +23,7 @@
             <property name="name">
                 <cstring>lblImage</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>130</height>
@@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -167,7 +167,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>156</width>
                     <height>16</height>
@@ -225,7 +225,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index d7b7729d5..ec5ba7cc0 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -21,7 +21,7 @@
 #include "regiongrabber.h"
 
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
@@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name )
 
 void SizeTip::setTip( const TQRect &rect )
 {
-  TQString tip = TQString( "%1x%2" ).arg( rect.width() )
-      .arg( rect.height() );
+  TQString tip = TQString( "%1x%2" ).tqarg( rect.width() )
+      .tqarg( rect.height() );
 
   setText( tip );
   adjustSize();
@@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect )
 
 void SizeTip::positionTip( const TQRect &rect )
 {
-  TQRect tipRect = geometry();
+  TQRect tipRect = tqgeometry();
   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( geometry().bottomRight() );
+      tipRect.moveBottomRight( tqgeometry().bottomRight() );
   }
 
   move( tipRect.topLeft() );
@@ -161,8 +161,8 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
-      TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
+  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(),
+      TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) );
 
   p.end();
 }
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index 45c1705af..04f7b6537 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.").arg(csname ) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(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> children = manager->getChildren();
-    kdDebug(41011) << " there are " << children.size() << endl;
-    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
+    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++)
     {
         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 5ddb004de..d719edd6e 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 shape
+             * This function return a Brush with a circular tqshape
              * 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 shape
+             * This function return a Brush with a rectangular tqshape
              * 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 e2f09a582..ecac55013 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").arg("process") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("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 1486d4153..c93d6e880 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.").arg(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.").tqarg(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 0b22ebf56..b01ba0a89 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").arg("getPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("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").arg("setPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("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 9f27adc6a..5f800f6ae 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").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) );
+        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) ) );
     }
     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").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
+        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))) ) );
         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 5aee14319..449913036 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").arg("applyConvolution")) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("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").arg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("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").arg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("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 c8ef92c50..e166de7cb 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").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("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").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("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").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("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").arg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("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 7f6a9b05b..1ec25dcdd 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
-    shape = rand * 7
+    tqshape = rand * 7
     painter.setStrokeStyle(1)
-    if( shape < 1 )
+    if( tqshape < 1 )
         painter.paintAt(rand * width , rand * height,1.1)
-    elsif(shape < 2 )
+    elsif(tqshape < 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(shape < 3)
+    elsif(tqshape < 3)
         painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1)
-    elsif(shape < 4)
+    elsif(tqshape < 4)
         painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1)
-    elsif(shape < 5)
+    elsif(tqshape < 5)
         randomizeStyle(painter)
         painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1)
-    elsif(shape < 6)
+    elsif(tqshape < 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(shape < 7)
+    elsif(tqshape < 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 68610cc58..b7c784fc1 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
-            shape = rand * 7
+            tqshape = rand * 7
             painter.setStrokeStyle(1)
-            if( shape < 1 )
+            if( tqshape < 1 )
                 painter.paintAt(rand * @width , rand * @height,1.1)
-            elsif(shape < 2 )
+            elsif(tqshape < 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(shape < 3)
+            elsif(tqshape < 3)
                 painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1)
-            elsif(shape < 4)
+            elsif(tqshape < 4)
                 painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(shape < 5)
+            elsif(tqshape < 5)
                 randomizeStyle(painter)
                 painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(shape < 6)
+            elsif(tqshape < 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(shape < 7)
+            elsif(tqshape < 7)
                 randomizeStyle(painter)
                 painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
             end
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
index 3da5db516..99078d0f2 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
@@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS,
     m_page = new WdgSeparations(this, "separate_image");
     Q_CHECK_PTR(m_page);
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->lblColormodel->setText(layerCS);
     m_page->grpOutput->hide();
diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
index 7e611f676..f1eeeaa22 100644
--- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
+++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
@@ -82,7 +82,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
index 26a05d842..a2c43aa91 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
@@ -29,7 +29,7 @@ using namespace std;
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -46,11 +46,11 @@ DlgShearImage::DlgShearImage( TQWidget *  parent,
     m_lock = false;
 
     m_page = new WdgShearImage(this, "shear_image");
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));
diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
index 6facd42ac..848eb3284 100644
--- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
+++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
@@ -56,7 +56,7 @@
                     <property name="name">
                         <cstring>shearAngleY</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>100</height>
diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
index de5850d6d..3382fe1fc 100644
--- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
+++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -92,7 +92,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui
index a9c7adea5..65f20e23d 100644
--- a/chalk/plugins/viewplugins/variations/wdg_variations.ui
+++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui
@@ -64,13 +64,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
@@ -95,13 +95,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
@@ -121,7 +121,7 @@
                 <property name="text">
                     <string>Current Pick</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -132,7 +132,7 @@
                 <property name="text">
                     <string>Original</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -228,7 +228,7 @@
     </widget>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>layout5</cstring>
+            <cstring>tqlayout5</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -268,7 +268,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>187</height>
@@ -287,7 +287,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>32767</width>
                         <height>556</height>
@@ -322,13 +322,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -348,7 +348,7 @@
                         <property name="text">
                             <string>Lighter</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -364,13 +364,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -390,7 +390,7 @@
                         <property name="text">
                             <string>Current Pick</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -406,13 +406,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -432,7 +432,7 @@
                         <property name="text">
                             <string>Darker</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -460,13 +460,13 @@
                 <verstretch>0</verstretch>
             </sizepolicy>
         </property>
-        <property name="minimumSize">
+        <property name="tqminimumSize">
             <size>
                 <width>540</width>
                 <height>556</height>
             </size>
         </property>
-        <property name="maximumSize">
+        <property name="tqmaximumSize">
             <size>
                 <width>540</width>
                 <height>556</height>
@@ -497,13 +497,13 @@
                     <height>150</height>
                 </rect>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -531,7 +531,7 @@
             <property name="text">
                 <string>More Red</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -550,7 +550,7 @@
             <property name="text">
                 <string>More Cyan</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -574,13 +574,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -608,7 +608,7 @@
             <property name="text">
                 <string>More Green</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -632,13 +632,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -671,13 +671,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -710,13 +710,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -744,7 +744,7 @@
             <property name="text">
                 <string>Current Pick</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -763,7 +763,7 @@
             <property name="text">
                 <string>More Yellow</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -787,13 +787,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -829,13 +829,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -863,7 +863,7 @@
             <property name="text">
                 <string>More Magenta</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -882,7 +882,7 @@
             <property name="text">
                 <string>More Blue</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/chalk/sdk/kis_canvas_controller.h b/chalk/sdk/kis_canvas_controller.h
index bdcb3ab0e..6ed8f1b94 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 repaint itself.
+     * Tell all of the canvas to tqrepaint itself.
      */
     virtual void updateCanvas() = 0;
 
 
     /**
-     * Tell the canvas to repaint the rectangle defined by x, y, w and h.
+     * Tell the canvas to tqrepaint 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 repaint the specified rectangle. The coordinates
+     * Tell the canvas tqrepaint the specified rectangle. The coordinates
      * are image coordinates, not view coordinates.
      */
     virtual void updateCanvas(const TQRect& rc) = 0;
diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc
index 09955e9e3..cfe6905db 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cc
@@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name)
     , m_image(TQPixmap())
 {
     m_label = new TQLabel( viewport());
-    setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     setCursor(KisCursor::handCursor());
     addChild(m_label);
 }
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 1d7932cb4..c7f9e0ad8 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -73,21 +73,21 @@ void KCurve::reset(void)
 {
     m_grab_point   = NULL;    
     m_guideVisible = false;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setCurveGuide(TQColor color)
 {
     m_guideVisible = true;
     m_colorGuide   = color;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setPixmap(TQPixmap pix)
 {
     if (m_pix) delete m_pix;
     m_pix = new TQPixmap(pix);
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::keyPressEvent(TQKeyEvent *e)
@@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e)
             m_points.remove(m_grab_point);
         }
         m_grab_point = closest_point;
-        repaint(false);
+        tqrepaint(false);
     }
     else
         TQWidget::keyPressEvent(e);
@@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *)
     
     TQPixmap pm(size());
     TQPainter p1;
-    p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+    p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
     
     //  draw background
     if(m_pix)
@@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e )
         }
         p = m_points.next();
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
@@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
     
     setCursor( KCursor::arrowCursor() );    
     m_dragging = false;
-    repaint(false);
+    tqrepaint(false);
     emit modified();
 }
 
@@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
     double x = e->pos().x() / (float)width();
     double y = 1.0 - e->pos().y() / (float)height();
     
-    if (m_dragging == false)   // If no point is selected set the the cursor shape if on top
+    if (m_dragging == false)   // If no point is selected set the the cursor tqshape if on top
     {
         double distance = 1000;
         double ydistance = 1000;
@@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
         emit modified();
     }
         
-    repaint(false);
+    tqrepaint(false);
 }
 
 double KCurve::getCurveValue(double x)
diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc
index bd5b80fb4..318bf3055 100644
--- a/chalk/ui/kis_autogradient.cc
+++ b/chalk/ui/kis_autogradient.cc
@@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color)
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( color, segment->endColor().alpha() ) );
-    gradientSlider->repaint();
+    gradientSlider->tqrepaint();
 
     paramChanged();
 }
@@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }
@@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index b1f9d724e..0bc9ae087 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "layout.h"
+#include "tqlayout.h"
 #include "tqlabel.h"
 #include "tqpixmap.h"
 #include "tqpainter.h"
@@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
     hl->addWidget(m_exposureLabel);
 
     m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this);
-    m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     hl->addWidget(m_exposureDoubleWidget);
     TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images"));
     l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding));
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index d567b76a4..20de3c5b7 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 #include <koIconChooser.h>
@@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
 
     m_lbName = new TQLabel(this);
 
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
 
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
@@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item)
     if (kisItem) {
         KisBrush *brush = static_cast<KisBrush *>(kisItem->resource());
 
-        TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height());
+        TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height());
 
         m_lbName->setText(text);
         m_slSpacing->setValue(brush->spacing());
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc
index d38c7ea10..168724186 100644
--- a/chalk/ui/kis_canvas.cc
+++ b/chalk/ui/kis_canvas.cc
@@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height)
     dynamic_cast<TQWidget *>(m_canvasWidget)->update(x, y, width, height);
 }
 
-void KisCanvas::repaint()
+void KisCanvas::tqrepaint()
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint();
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint();
 }
 
-void KisCanvas::repaint(bool erase)
+void KisCanvas::tqrepaint(bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase);
 }
 
-void KisCanvas::repaint(int x, int y, int width, int height, bool erase)
+void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase);
 }
 
-void KisCanvas::repaint(const TQRect& r, bool erase)
+void KisCanvas::tqrepaint(const TQRect& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
-void KisCanvas::repaint(const TQRegion& r, bool erase)
+void KisCanvas::tqrepaint(const TQRegion& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
 bool KisCanvas::isUpdatesEnabled() const
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index 5f7174688..4d92a4ce9 100644
--- a/chalk/ui/kis_canvas.h
+++ b/chalk/ui/kis_canvas.h
@@ -313,11 +313,11 @@ public:
     void update();
     void update(const TQRect& r);
     void update(int x, int y, int width, int height);
-    void repaint();
-    void repaint(bool erase);
-    void repaint(int x, int y, int width, int height, bool erase = true);
-    void repaint(const TQRect& r, bool erase = true);
-    void repaint(const TQRegion& r, bool erase = true);
+    void tqrepaint();
+    void tqrepaint(bool erase);
+    void tqrepaint(int x, int y, int width, int height, bool erase = true);
+    void tqrepaint(const TQRect& r, bool erase = true);
+    void tqrepaint(const TQRegion& r, bool erase = true);
 
     void updateGeometry();
 
diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc
index 9b3666e89..ed5be01d5 100644
--- a/chalk/ui/kis_canvas_painter.cc
+++ b/chalk/ui/kis_canvas_painter.cc
@@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const
+const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
@@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable)
     }
 }
 
-const TQWMatrix& KisCanvasPainter::worldMatrix() const
+const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
 {
     if (m_canvasWidgetPainter != 0) {
-        return m_canvasWidgetPainter->worldMatrix();
+        return m_canvasWidgetPainter->tqworldMatrix();
     }
     return m_defaultWorldMatrix;
 }
@@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text
     }
 }
 
-void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags);
     }
 }
 
-void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(p, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags);
     }
 }
 
diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h
index a5ad2d843..9a719eeab 100644
--- a/chalk/ui/kis_canvas_painter.h
+++ b/chalk/ui/kis_canvas_painter.h
@@ -78,7 +78,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -168,8 +168,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
@@ -241,7 +241,7 @@ public:
     void setViewport(int x, int y, int w, int h);
 
     void setWorldXForm(bool);
-    const TQWMatrix&worldMatrix() const;
+    const TQWMatrix&tqworldMatrix() const;
     void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     void saveWorldMatrix();
@@ -331,8 +331,8 @@ public:
     void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc
index 7eb3607a2..d52f5ec93 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqobject.h>
 #include <tqimage.h>
 #include <tqmessagebox.h>
@@ -52,7 +52,7 @@ KisClipboard::KisClipboard()
     clipboardDataChanged();
 
     // Make sure we are notified when clipboard changes
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
          this, TQT_SLOT( clipboardDataChanged() ) );
 }
 
@@ -132,20 +132,20 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
     multiDrag->addDragObject( storeDrag );
 
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     cb->setData(multiDrag);
     m_pushedClipboard = true;
 }
 
 KisPaintDeviceSP KisClipboard::clip()
 {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
     if(cbData && cbData->provides(mimeType))
     {
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
@@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged()
 {
     if (!m_pushedClipboard) {
         m_hasClip = false;
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         TQImage qimg = cb->image();
         TQMimeSource *cbData = cb->data();
         TQCString mimeType("application/x-chalk-selection");
@@ -235,7 +235,7 @@ bool KisClipboard::hasClip()
 TQSize KisClipboard::clipSize()
 {
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
@@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize()
     
     if(cbData && cbData->provides(mimeType)) {
         
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index 2a2c4b8da..4d2103d81 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -81,7 +81,7 @@ void KisColorCup::slotClicked()
     emit changed(m_color);
 }
 
-TQSize KisColorCup::sizeHint() const
+TQSize KisColorCup::tqsizeHint() const
 {
     return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
             expandedTo(TQApplication::globalStrut());
@@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
     TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
     r.rect(&x, &y, &w, &h);
 
-    int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
+    int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
     x += margin;
     y += margin;
     w -= 2*margin;
     h -= 2*margin;
 
     if (isOn() || isDown()) {
-        x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-        y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+        x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+        y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
     }
 
-    qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
+    qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
     if ( m_color.isValid() )
         painter->fillRect( x+1, y+1, w-2, h-2, m_color );
 
     if ( hasFocus() ) {
         TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
     }
 
 }
diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h
index 8c7fd2b5a..2cf9ddefe 100644
--- a/chalk/ui/kis_color_cup.h
+++ b/chalk/ui/kis_color_cup.h
@@ -72,7 +72,7 @@ signals:
 
 public:
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
 
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 21debef1b..fab8c4bbb 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqframe.h>
 #include <tqwidget.h>
@@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view)
 
     m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup");
 
-    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout");
+    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout");
 
     TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab");
     m_brushesTab->setTabShape(TQTabWidget::Triangular);
@@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view)
 {
     m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout");
 
     TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab");
     m_patternsTab->setTabShape(TQTabWidget::Triangular);
@@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
 {
     m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout");
 
     TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab");
     m_gradientTab->setTabShape(TQTabWidget::Triangular);
diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc
index 412632372..93c829778 100644
--- a/chalk/ui/kis_custom_image_widget.cc
+++ b/chalk/ui/kis_custom_image_widget.cc
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tqpushbutton.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <KoUnitWidgets.h>
 #include <tqlabel.h>
 
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index ac762953e..f84bf24d1 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() {
 
     if (!m_palette->save()) {
         KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.")
-                                   .arg(m_palette->filename()), i18n("Palette"));
+                                   .tqarg(m_palette->filename()), i18n("Palette"));
         return;
     }
 
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index 5d09bf3b4..1cdd309c4 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
     }
     setCaption(caption);
     TQWidget * page = new TQWidget(this, "page widget");
-    TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6);
     setMainWidget(page);
 
     m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
     m_preview->slotSetDevice( dev );
 
     connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
-    layout->addWidget(m_preview, 1, 1);
+    tqlayout->addWidget(m_preview, 1, 1);
 
-    TQVBoxLayout *v1 = new TQVBoxLayout( layout );
+    TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout );
     TQHBoxLayout *hl = new TQHBoxLayout( v1 );
 
     TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName");
@@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
 
     m_layerName = new KLineEdit(page, "m_layerName");
     m_layerName->setText(layerName);
-    m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     hl->addWidget(m_layerName, 0, 1);
     connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) );
 
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 83893b0b8..13caff982 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -102,10 +102,10 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
 
     m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
                                         m_configWidgetHolder);
-    m_configWidgetHolder->layout()->add(m_labelNoConfigWidget);
+    m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
     m_labelNoConfigWidget->hide();
 
-    resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
+    resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
 
     m_currentConfigWidget = 0;
 
@@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if ( m_currentConfigWidget != 0 )
     {
-        m_configWidgetHolder->layout()->remove(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
 
         delete m_currentConfigWidget;
         m_currentConfigWidget = 0;
@@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if (m_currentConfigWidget != 0)
     {
-        m_configWidgetHolder->layout()->add(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
     } else {
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 2d5e8a909..5c1367388 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
     m_page = new WdgApplyProfile(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     // XXX: This is BAD! (bsar)
     fillCmbProfiles(KisID("RGBA", ""));
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index 20fdac289..ca6a1b721 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -19,11 +19,11 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent,
     m_image = image;
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->txtName->setText(image->name());
     m_page->m_createButton->hide();
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc
index 5dc650471..7742969b2 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cc
@@ -17,7 +17,7 @@
  */
 #include <limits.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>
 #include <tqstring.h>
@@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
     : super(parent, name, f, name, Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     opacity = int((opacity * 100.0) / 255 + 0.5);
 
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc
index c762a3c56..154dbf2cc 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cc
@@ -20,7 +20,7 @@
  */
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
     : super(parent, name, true, "", Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     setCaption(i18n("New Layer"));
 
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index b9313fa9d..a19edebeb 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )
 
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
+    m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
     grpDockability->setButton(cfg.dockability());
     numDockerFontSize->setValue((int)cfg.dockerFontSize());
 }
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
 {
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
+    m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
     grpDockability->setButton(cfg.getDefaultDockability());
     numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
 }
 
 enumCursorStyle GeneralTab::cursorStyle()
 {
-    return (enumCursorStyle)m_cmbCursorShape->currentItem();
+    return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
 }
 
 enumKoDockability GeneralTab::dockability()
@@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
                                                                           TQWidget *parent, const char *name)
     : super(parent, name, true, "", Ok | Cancel)
 {
-    setCaption(i18n("Configure %1").arg(deviceName));
+    setCaption(i18n("Configure %1").tqarg(deviceName));
 
     m_page = new WdgTabletDeviceSettings(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
         TQString axisString;
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 70141dead..6bae7e781 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc)
 }
 
 bool KisDoc::loadChildren(KoStore* store) {
-    TQPtrListIterator<KoDocumentChild> it(children());
+    TQPtrListIterator<KoDocumentChild> it(tqchildren());
     for( ; it.current(); ++it ) {
         if (!it.current()->loadDocument(store)) {
             return false;
diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc
index 8768e81ad..6c03b3e95 100644
--- a/chalk/ui/kis_double_widget.cc
+++ b/chalk/ui/kis_double_widget.cc
@@ -20,7 +20,7 @@
  */
 
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 
 #include <knuminput.h>
@@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max)
     connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
     connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
 
-    m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout");
+    m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout");
 
     m_layout->addWidget(m_slider);
     m_layout->addSpacing(5);
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index a2775bc7d..e8bf5ba86 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -18,7 +18,7 @@
  */
 
 #include "tqsignalmapper.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
@@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac)
 
         // Create action
         KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac,
-                                  TQString("chalk_filter_%1").arg((*it) . id()).ascii());
+                                  TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());
 
         // Add action to the right submenu
         KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
@@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i)
         if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "lab16degradation") != KMessageBox::Continue) return;
@@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i)
         else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "rgba8degradation") != KMessageBox::Continue) return;
@@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i)
 
         widgetLayout->addWidget(m_lastWidget, 0 , 0);
 
-        m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize());
+        m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize());
 
         refreshPreview();
 
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 0112ceb0c..f2d63cc39 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -154,7 +154,7 @@ void KisFiltersListView::init()
     setCaption(i18n("Filters List"));
     setItemsMovable(false);
     setSelectionMode(TQIconView::Single);
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
     setMinimumWidth(160);
 
 }
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc
index f66bb80ae..203f0718a 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cc
@@ -17,7 +17,7 @@
  */
 #include <klocale.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kdialogbase.h>
@@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c
     KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient");
     connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show()));
     
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
     
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index a8fdf71e7..cda77d689 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
 {
     TQWidget::paintEvent( pe );
     TQPixmap pixmap( width(), height() );
-    pixmap.fill( colorGroup().background() );
+    pixmap.fill( tqcolorGroup().background() );
     TQPainter painter( &pixmap );
     painter.setPen( TQt::black );
     painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE );
@@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
                     height()- HANDLE_SIZE - MARGIN,
                     tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ),
                     HANDLE_SIZE );
-            painter.fillRect( selection, TQBrush( colorGroup().highlight() ) );
+            painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) );
         }
 
         TQPointArray triangle(3);
@@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
             emit sigSelectedSegment( m_selectedSegment );
         }
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e )
@@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e )
     if ( m_drag != NO_DRAG)
         emit sigChangedSegment( m_currentSegment );
 
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e )
@@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id )
             break;
     }
     emit sigSelectedSegment( m_selectedSegment );
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "kis_gradient_slider_widget.moc"
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 2d704d862..1375caccb 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvalidator.h>
 
 #include <knuminput.h>
@@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val)
     l->insertStretch(0, 1);
     d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox");
 
-    d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     d->m_numinput->setSuffix("%");
     l->addWidget( d->m_numinput );
 
@@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val)
     d->m_prevValue = val;
     setValue(val);
     setFocusProxy(d->m_numinput);
-    layout();
+    tqlayout();
 
     connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int)));
     connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
@@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/)
     lower = kMin(upper, lower);
     d->m_slider->setRange(lower, upper);
 
-    layout();
+    tqlayout();
 }
 
 void KisIntSpinbox::setMinValue(int min)
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index 5920c3d0a..c081111f0 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 #include <tqcursor.h>
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 31756d7c9..424c405db 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -21,11 +21,11 @@
 
 #include <tqbutton.h>
 #include <tqtoolbutton.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqrect.h>
@@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
     vbox->setAutoAdd(true);
 
     m_lst = new WdgLayerBox(this);
-    setMinimumSize(m_lst->minimumSizeHint());
+    setMinimumSize(m_lst->tqminimumSizeHint());
 
     TQToolTip::add(m_lst->bnAdd, i18n("Create new layer"));
 
@@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
     TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);
 
     if (pixmap.isNull())
-        KMessageBox::error(0, i18n("Cannot find %1").arg(filename),
+        KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename),
                            i18n("Canvas"));
 
     return pixmap;
@@ -626,7 +626,7 @@ void KisLayerBox::printChalkLayers() const
         return;
     TQString s = root->name();
     if( dynamic_cast<KisGroupLayer*>( root ) )
-        s = TQString("[%1]").arg( s );
+        s = TQString("[%1]").tqarg( s );
     if( m_image->activeLayer().data() == root )
         s.prepend("*");
     kdDebug() << (TQString().fill(' ', indent) +  s) << endl;
@@ -658,7 +658,7 @@ void KisLayerBox::printLayerboxLayers() const
     }
     TQString s = root->displayName();
     if( root->isFolder() )
-        s = TQString("[%1]").arg( s );
+        s = TQString("[%1]").tqarg( s );
     if( list()->activeLayer() == root )
         s.prepend("*");
     kdDebug() << (TQString().fill(' ', indent) +  s) << endl;
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 24ae27382..985bd0c69 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -181,16 +181,16 @@ TQString KisLayerItem::tooltip() const
     TQString text = super::tooltip();
     text = text.left( text.length() - 8 ); //HACK -- strip the </table>
     TQString row = "<tr><td>%1</td><td>%2</td></tr>";
-    text += row.arg( i18n( "Opacity:" ) ).arg( "%1%" ).arg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) );
-    text += row.arg( i18n( "Composite mode:" ) ).arg( m_layer->compositeOp().id().name() );
+    text += row.tqarg( i18n( "Opacity:" ) ).tqarg( "%1%" ).tqarg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) );
+    text += row.tqarg( i18n( "Composite mode:" ) ).tqarg( m_layer->compositeOp().id().name() );
     if( KisPaintLayer *player = dynamic_cast<KisPaintLayer*>( m_layer ) )
     {
-        text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() );
+        text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() );
         if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() )
-            text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() );
+            text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() );
     }
     if( KisAdjustmentLayer *alayer = dynamic_cast<KisAdjustmentLayer*>( m_layer ) )
-        text += row.arg( i18n( "Filter: " ) ).arg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() );
+        text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() );
     if( KisPartLayerImpl *player = dynamic_cast<KisPartLayerImpl*>( m_layer ) ) {
         TQString type = player->docType();
 
@@ -198,7 +198,7 @@ TQString KisLayerItem::tooltip() const
             type = player->childDoc()->document()->instance()->aboutData()->programName();
         }
 
-        text += row.arg( i18n( "Document type: " ) ).arg( type );
+        text += row.tqarg( i18n( "Document type: " ) ).tqarg( type );
     }
     text += "</table>";
 
diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui
index 2b866c2f7..ca238b60e 100644
--- a/chalk/ui/kis_matrix_widget.ui
+++ b/chalk/ui/kis_matrix_widget.ui
@@ -104,7 +104,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc
index 56d8265c4..806998bf7 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_bool_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc
index 5bccdcef8..486bc7701 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_double_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <knuminput.h>
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc
index 0cecabcc9..130a03d10 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cc
@@ -19,7 +19,7 @@
 #include "kis_multi_integer_filter_widget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <knuminput.h>
diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc
index e6551f816..6ae123055 100644
--- a/chalk/ui/kis_opengl_canvas_painter.cc
+++ b/chalk/ui/kis_opengl_canvas_painter.cc
@@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const
+const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h
index 24f2e2e26..47983ce2f 100644
--- a/chalk/ui/kis_opengl_canvas_painter.h
+++ b/chalk/ui/kis_opengl_canvas_painter.h
@@ -85,7 +85,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -175,8 +175,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 6a5a3885b..20197dd26 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <klocale.h>
@@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget()
     if (m_optionWidget != 0) {
         m_layout->remove(m_optionWidget);
         m_optionWidget->hide();
-        m_layout->invalidate();
+        m_layout->tqinvalidate();
     }
 
     const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice());
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 2bfe1985a..a424d9acc 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
@@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth,
     minSize += TQSize(cellSize);
 
     setMinimumSize(minSize);
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
 }
 
 KisPaletteView::~KisPaletteView()
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 3618e8ad4..2feb74c81 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
@@ -67,16 +67,16 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
 
     m_currentPalette = 0;
 
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
     combo = new TQComboBox( false, this );
     combo->setFocusPolicy( TQ_ClickFocus );
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     m_view = new KisPaletteView(this, 0, minWidth, cols);
-    layout->addWidget( m_view );
+    tqlayout->addWidget( m_view );
 
-    //setFixedSize(sizeHint());
+    //setFixedSize(tqsizeHint());
 
     connect(combo, TQT_SIGNAL(activated(const TQString &)),
             this, TQT_SLOT(slotSetPalette(const TQString &)));
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 5846a67b3..ace299654 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -94,19 +94,19 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child)
 // Called when another layer is made inactive
 void KisPartLayerImpl::childDeactivated(bool activated)
 {
-    // We probably changed, notify the image that it needs to repaint where we currently updated
-    // We use the original geometry
+    // We probably changed, notify the image that it needs to tqrepaint where we currently updated
+    // We use the original tqgeometry
     if (m_activated && !activated /* no clue, but debugging suggests it is false here */) {
         TQPtrList<KoView> views = m_doc->parentDocument()->views();
         Q_ASSERT(views.count());
         views.at(0)->disconnect(TQT_SIGNAL(activated(bool)));
         m_activated = false;
-        setDirty(m_doc->geometry());
+        setDirty(m_doc->tqgeometry());
     }
 }
 
 void KisPartLayerImpl::setX(TQ_INT32 x) {
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here,
     // since the part is not necesarily started at (0,0)
@@ -115,7 +115,7 @@ void KisPartLayerImpl::setX(TQ_INT32 x) {
 }
 
 void KisPartLayerImpl::setY(TQ_INT32 y) {
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here,
     // since the part is not necesarily started at (0,0)
@@ -125,7 +125,7 @@ void KisPartLayerImpl::setY(TQ_INT32 y) {
 
 void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) {
     uchar *j = img.bits();
-    TQRect rect = m_doc->geometry();
+    TQRect rect = m_doc->tqgeometry();
 
     for (int y2 = y; y2 < h + y; ++y2) {
         for (int x2 = x; x2 < w + x; ++x2) {
diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h
index 377b37a08..d2ff10eb2 100644
--- a/chalk/ui/kis_part_layer.h
+++ b/chalk/ui/kis_part_layer.h
@@ -95,10 +95,10 @@ public:
 
     virtual void setX(TQ_INT32 x);
     virtual void setY(TQ_INT32 y);
-    virtual TQ_INT32 x() const { return m_doc->geometry() . x(); }
-    virtual TQ_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); }
-    virtual TQRect extent() const { return m_doc->geometry(); }
-    virtual TQRect exactBounds() const { return m_doc->geometry(); }
+    virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); }
+    virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); }
+    virtual TQRect extent() const { return m_doc->tqgeometry(); }
+    virtual TQRect exactBounds() const { return m_doc->tqgeometry(); }
 
     virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h);
 
@@ -113,7 +113,7 @@ public:
     virtual bool saveToXML(TQDomDocument doc, TQDomElement elem);
 private slots:
     /// Repaints our device with the data from the embedded part
-    //void repaint();
+    //void tqrepaint();
     /// When we activate the embedding, we clear ourselves
     void childActivated(KoDocumentChild* child);
     void childDeactivated(bool activated);
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc
index 39ffe61e8..70484b0a3 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <koIconChooser.h>
 
@@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super
 {
     m_lbName = new TQLabel(this);
 
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
 
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
@@ -47,7 +47,7 @@ void KisPatternChooser::update(KoIconItem *item)
     if (item) {
         KisPattern *pattern = static_cast<KisPattern *>(kisItem->resource());
 
-        TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height());
+        TQString text = TQString("%1 (%2 x %3)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height());
 
         m_lbName->setText(text);
     }
diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc
index e9fb84437..e2857c192 100644
--- a/chalk/ui/kis_previewdialog.cc
+++ b/chalk/ui/kis_previewdialog.cc
@@ -20,7 +20,7 @@
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kis_previewwidget.h"
 #include "kis_previewdialog.h"
@@ -28,14 +28,14 @@
 KisPreviewDialog::KisPreviewDialog( TQWidget *  parent, const char * name, bool modal, const TQString &caption)
     : super (parent, name, modal, caption, Ok | Cancel, Ok)
 {
-    TQHBox* layout = new TQHBox(this);
-    layout->setSpacing( 6 );
+    TQHBox* tqlayout = new TQHBox(this);
+    tqlayout->setSpacing( 6 );
 
-    m_containerFrame = new TQFrame( layout, "container" );
+    m_containerFrame = new TQFrame( tqlayout, "container" );
 
-    m_preview = new KisPreviewWidget( layout, "previewWidget" );
+    m_preview = new KisPreviewWidget( tqlayout, "previewWidget" );
 
-    setMainWidget(layout);
+    setMainWidget(tqlayout);
 }
 
 KisPreviewDialog::~KisPreviewDialog()
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index 9bc7eb464..2598e79d3 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 #include <tqcolor.h>
diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui
index 6ba863538..f1b522446 100644
--- a/chalk/ui/kis_previewwidgetbase.ui
+++ b/chalk/ui/kis_previewwidgetbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -56,13 +56,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>150</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>1000</width>
                             <height>1000</height>
@@ -73,7 +73,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,7 +122,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -130,7 +130,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
index 5bf891ac7..4233bc11d 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
@@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un
     TQWidget *widget = dynamic_cast<TQWidget *>(canvasWidget);
 
     if (widget != 0) {
-        return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped);
+        return m_painter.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped);
     } else {
         return false;
     }
@@ -46,7 +46,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un
 
 bool KisTQPaintDeviceCanvasPainter::begin(const TQPaintDevice* paintDevice, bool unclipped)
 {
-    return m_painter.begin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
+    return m_painter.tqbegin(const_cast<TQPaintDevice*>(paintDevice), unclipped);
 }
 
 bool KisTQPaintDeviceCanvasPainter::end()
@@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable)
     m_painter.setWorldXForm(enable);
 }
 
-const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const
+const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const
 {
-    return m_painter.worldMatrix();
+    return m_painter.tqworldMatrix();
 }
 
 void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine)
@@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr
 
 void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.drawPolyline(pointArray, index, npoints);
+    m_painter.tqdrawPolyline(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints)
 {
-    m_painter.drawPolygon(pointArray, winding, index, npoints);
+    m_painter.tqdrawPolygon(pointArray, winding, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.drawConvexPolygon(pointArray, index, npoints);
+    m_painter.tqdrawConvexPolygon(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index)
@@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T
 #endif // USE_QT4
 }
 
-void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
-    m_painter.drawTextItem(x, y, ti, textflags);
+    m_painter.tqdrawTextItem(x, y, ti, textflags);
 }
 
-void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
-    m_painter.drawTextItem(p, ti, textflags);
+    m_painter.tqdrawTextItem(p, ti, textflags);
 }
 
 TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h
index cef260b40..0dca73228 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.h
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h
@@ -80,7 +80,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -170,8 +170,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc
index 8a8929a74..44e86caed 100644
--- a/chalk/ui/kis_ruler.cc
+++ b/chalk/ui/kis_ruler.cc
@@ -131,7 +131,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
     if (m_pixmapBuffer) {
         if (m_orientation == Qt::Horizontal) {
             if (m_currentPosition != -1)
-                repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
+                tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
 
             if (x != -1) {
                 bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT);
@@ -139,7 +139,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
             }
         } else {
             if (m_currentPosition != -1)
-                repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
+                tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
 
             if (y != -1) {
                 bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH);
@@ -184,8 +184,8 @@ void KisRuler::drawRuler()
         return;
 
     p.begin(m_pixmapBuffer);
-    p.setPen(colorGroup().text());
-    p.setBackgroundColor(colorGroup().base());
+    p.setPen(tqcolorGroup().text());
+    p.setBackgroundColor(tqcolorGroup().base());
     p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height());
 
     switch (m_unit) {
diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h
index de98548cd..1205632b0 100644
--- a/chalk/ui/kis_save_visitor.h
+++ b/chalk/ui/kis_save_visitor.h
@@ -50,7 +50,7 @@ public:
         //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8)));
 
         TQString location = m_external ? TQString() : m_uri;
-        location += m_img->name() + TQString("/layers/layer%1").arg(m_count);
+        location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count);
 
         // Layer data
         if (m_store->open(location)) {
@@ -70,7 +70,7 @@ public:
             if (annotation) {
                 // save layer profile
                 location = m_external ? TQString() : m_uri;
-                location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".icc";
+                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".icc";
 
                 if (m_store->open(location)) {
                     m_store->write(annotation->annotation());
@@ -85,7 +85,7 @@ public:
             if (mask) {
                 // save layer profile
                 location = m_external ? TQString() : m_uri;
-                location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".mask";
+                location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask";
 
                 if (m_store->open(location)) {
                     if (!mask->write(m_store)) {
@@ -130,7 +130,7 @@ public:
 
         if (layer->selection()) {
             TQString location = m_external ? TQString() : m_uri;
-            location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".selection";
+            location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".selection";
 
             // Layer data
             if (m_store->open(location)) {
@@ -147,7 +147,7 @@ public:
         if (layer->filter()) {
             TQString location = m_external ? TQString() : m_uri;
             location = m_external ? TQString() : m_uri;
-            location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".filterconfig";
+            location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".filterconfig";
 
             if (m_store->open(location)) {
                 TQString s = layer->filter()->toString();
diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h
index b5e3d9308..155807523 100644
--- a/chalk/ui/kis_savexml_visitor.h
+++ b/chalk/ui/kis_savexml_visitor.h
@@ -54,7 +54,7 @@ public:
         layerElement.setAttribute("visible", layer->visible());
         layerElement.setAttribute("locked", layer->locked());
         layerElement.setAttribute("layertype", "paintlayer");
-        layerElement.setAttribute("filename", TQString("layer%1").arg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count));
         layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id());
         layerElement.setAttribute("hasmask", layer->hasMask());
         m_elem.appendChild(layerElement);
@@ -124,7 +124,7 @@ public:
         layerElement.setAttribute("visible", layer->visible());
         layerElement.setAttribute("locked", layer->locked());
         layerElement.setAttribute("layertype", "adjustmentlayer");
-        layerElement.setAttribute("filename", TQString("layer%1").arg(m_count));
+        layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count));
         layerElement.setAttribute("x", layer->x());
         layerElement.setAttribute("y", layer->y());
         m_elem.appendChild(layerElement);
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index 60ab80c75..0655b8342 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -18,7 +18,7 @@
 
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
 
@@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection)
 //                   this, TQT_SLOT(save()),
 //                   collection, "save_selection");
 
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged()));
 }
 
diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc
index 175627224..32933b5ac 100644
--- a/chalk/ui/kis_selection_options.cc
+++ b/chalk/ui/kis_selection_options.cc
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <kcolorbtn.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kis_canvas_controller.h"
 #include "kis_canvas_subject.h"
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index b2ae9f365..ad681c75d 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cc
@@ -63,7 +63,7 @@ void KisTextBrush::getFont()
 
 void KisTextBrush::rebuildTextBrush()
 {
-	lblFont->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
+	lblFont->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
 	lblFont->setFont(m_font);
 	m_textBrushResource->setFont(m_font);
 	m_textBrushResource->setText(lineEdit->text());
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 807b8ffcc..d6e600af5 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -56,9 +56,9 @@ KisTool::~KisTool()
 TQWidget* KisTool::createOptionWidget(TQWidget* parent)
 {
     
-    d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent);
+    d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
     d->optionWidget->setCaption(d->uiname);
-    d->optionWidget->setAlignment(TQt::AlignCenter);
+    d->optionWidget->tqsetAlignment(TQt::AlignCenter);
     return d->optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index bda3b7e74..b9abdc75d 100644
--- a/chalk/ui/kis_tool.h
+++ b/chalk/ui/kis_tool.h
@@ -47,7 +47,7 @@ class KisMoveEvent;
 class KisCanvasPainter;
 
 enum enumToolType {
-    TOOL_SHAPE = 0,   // Geometric shapes like ellipses and lines
+    TOOL_SHAPE = 0,   // Geometric tqshapes like ellipses and lines
     TOOL_FREEHAND = 1, // Freehand drawing tools
     TOOL_TRANSFORM = 2, // Tools that transform the layer
     TOOL_FILL = 3, // Tools that fill parts of the canvas
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index bc478d4e4..51eb1407b 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent)
 {
     m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent);
     m_optionWidget->setCaption(i18n("No Active Tool"));
-    m_optionWidget->setAlignment(TQt::AlignCenter);
+    m_optionWidget->tqsetAlignment(TQt::AlignCenter);
     return m_optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index bb7dbc1e9..adbf9b8ab 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -20,7 +20,7 @@
  */
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqrect.h>
 
@@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {
     }
 
     KisCanvas *canvas = controller->kiscanvas();
-    canvas->repaint();
+    canvas->tqrepaint();
 
     KisBrush *brush = m_subject->currentBrush();
     // There may not be a brush present, and we shouldn't crash in that case
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index e3cf71521..9d37dae64 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -18,7 +18,7 @@
 
 #include <tqwidget.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
@@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget()
     return m_optionWidget;
 }
 
-void KisToolPaint::addOptionWidgetLayout(TQLayout *layout)
+void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout)
 {
     Q_ASSERT(m_optionWidget != 0);
     Q_ASSERT(m_optionWidgetLayout != 0);
     int rowCount = m_optionWidgetLayout->numRows();
-    m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1);
+    m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1);
 }
 
 void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label)
diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h
index 05dbf450b..7fb4b8193 100644
--- a/chalk/ui/kis_tool_paint.h
+++ b/chalk/ui/kis_tool_paint.h
@@ -20,7 +20,7 @@
 #define KIS_TOOL_PAINT_H_
 
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <koffice_export.h>
 
@@ -88,8 +88,8 @@ public slots:
 protected:
     void notifyModified() const;
 
-    // Add the tool-specific layout to the default option widget's layout.
-    void addOptionWidgetLayout(TQLayout *layout);
+    // Add the tool-specific tqlayout to the default option widget's tqlayout.
+    void addOptionWidgetLayout(TQLayout *tqlayout);
 
 private:
     void updateCompositeOpComboBox();
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc
index 045b43f9a..e7696f0b3 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cc
@@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0;
 KisToolRegistry::KisToolRegistry()
 {
     // Load all modules: color models, paintops, filters
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc
index 0c9ddc4a8..9e76f1596 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -17,7 +17,7 @@
  */
 
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
@@ -29,7 +29,7 @@
 
 KisToolShape::KisToolShape(const TQString& UIName) : super(UIName)
 {
-    m_shapeOptionsWidget = 0;
+    m_tqshapeOptionsWidget = 0;
     m_optionLayout = 0;
 }
 
@@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent)
 {
     TQWidget *widget = super::createOptionWidget(parent);
 
-    m_shapeOptionsWidget = new WdgGeometryOptions(0);
-    Q_CHECK_PTR(m_shapeOptionsWidget);
+    m_tqshapeOptionsWidget = new WdgGeometryOptions(0);
+    Q_CHECK_PTR(m_tqshapeOptionsWidget);
 
     m_optionLayout = new TQGridLayout(widget, 2, 1);
    // super::addOptionWidgetLayout(m_optionLayout);
 
-    m_shapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true);
-    m_shapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true);
-    addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3);
+    m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true);
+    m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true);
+    addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3);
 
     return widget;
 }
 
 KisPainter::FillStyle KisToolShape::fillStyle(void)
 {
-    if (m_shapeOptionsWidget) {
-        return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem());
+    if (m_tqshapeOptionsWidget) {
+        return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem());
     } else {
         return KisPainter::FillStyleNone;
     }
diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h
index 45767fe4c..e8974c791 100644
--- a/chalk/ui/kis_tool_shape.h
+++ b/chalk/ui/kis_tool_shape.h
@@ -46,7 +46,7 @@ protected:
 
 private:
     TQGridLayout *m_optionLayout;
-        WdgGeometryOptions *m_shapeOptionsWidget;
+        WdgGeometryOptions *m_tqshapeOptionsWidget;
 };
 
 #endif // KIS_TOOL_SHAPE_H_
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 629072ffe..4455f17db 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);
 
     // Load all plugins
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
     KTrader::OfferList::ConstIterator iter;
     for(iter = offers.begin(); iter != offers.end(); ++iter)
@@ -494,11 +494,11 @@ void KisView::setupRulers()
 void KisView::updateStatusBarZoomLabel ()
 {
     if (zoom() < 1 - EPSILON) {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4));
     } else {
-        m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0));
+        m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0));
     }
-    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("0.8888  ")));
+    m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888  ")));
 }
 
 void KisView::updateStatusBarSelectionLabel()
@@ -513,7 +513,7 @@ void KisView::updateStatusBarSelectionLabel()
         if (dev) {
             if (dev->hasSelection()) {
                 TQRect r = dev->selection()->selectedExactRect();
-                m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").arg(r.x()).arg(r.y()).arg( r.width()).arg( r.height()));
+                m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height()));
                 return;
             }
         }
@@ -682,7 +682,7 @@ void KisView::setupActions()
     new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()),
                 actionCollection(), "edit_palette");
 
-    // XXX: This triggers a repaint of the image, but way too early
+    // XXX: This triggers a tqrepaint of the image, but way too early
     //showRuler();
 
 }
@@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
     }
 
     KisImageSP img = currentImg();
-    TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
+    TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
     TQ_INT32 drawH;
     TQ_INT32 drawW;
     TQ_INT32 docW;
@@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *)
 
             if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) {
 
-                TQMemArray<TQRect> rects = exposedRegion.rects();
+                TQMemArray<TQRect> rects = exposedRegion.tqrects();
 
                 for (unsigned int i = 0; i < rects.count(); i++) {
                     TQRect r = rects[i];
@@ -958,11 +958,11 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                     TQRegion rg(vr);
                     rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height())));
 
-                    TQMemArray<TQRect> rects = rg.rects();
+                    TQMemArray<TQRect> rects = rg.tqrects();
 
                     for (unsigned int i = 0; i < rects.count(); i++) {
                         TQRect er = rects[i];
-                        gc.fillRect(er, colorGroup().mid());
+                        gc.fillRect(er, tqcolorGroup().mid());
                     }
                     wr &= TQRect(0, 0, img->width(), img->height());
                 }
@@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                 }
 //                    paintGuides();
             } else {
-                gc.fillRect(vr, colorGroup().mid());
+                gc.fillRect(vr, tqcolorGroup().mid());
             }
         }
     }
@@ -1025,7 +1025,7 @@ void KisView::paintTQPaintDeviceView(const TQRegion& canvasRegion)
     Q_ASSERT(m_canvas->TQPaintDeviceWidget() != 0);
 
     if (m_canvas->TQPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) {
-        TQMemArray<TQRect> rects = canvasRegion.rects();
+        TQMemArray<TQRect> rects = canvasRegion.tqrects();
 
         for (unsigned int i = 0; i < rects.count(); i++) {
             TQRect r = rects[i];
@@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect)
 
     glDrawBuffer(GL_BACK);
 
-    TQColor widgetBackgroundColor = colorGroup().mid();
+    TQColor widgetBackgroundColor = tqcolorGroup().mid();
 
     glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect)
     } else {
         updateTQPaintDeviceCanvas(imageRect);
         //m_canvas->update(windowToView(imageRect));
-        m_canvas->repaint(windowToView(imageRect));
+        m_canvas->tqrepaint(windowToView(imageRect));
     }
 }
 
@@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas()
     updateCanvas(imageRect);
 
     // Enable this if updateCanvas does an m_canvas->update()
-    //m_canvas->repaint();
+    //m_canvas->tqrepaint();
 }
 
 void KisView::selectionDisplayToggled(bool displaySelection)
@@ -2965,7 +2965,7 @@ void KisView::layerDuplicate()
         return;
 
     KisLayerSP dup = active->clone();
-    dup->setName(i18n("Duplicate of '%1'").arg(active->name()));
+    dup->setName(i18n("Duplicate of '%1'").tqarg(active->name()));
     img->addLayer(dup, active->parent().data(), active);
     if (dup) {
         img->activate( dup );
@@ -3086,7 +3086,7 @@ void KisView::scrollH(int value)
                 bitBlt(&m_canvasPixmap, xShift, 0, &m_canvasPixmap, 0, 0, m_canvasPixmap.width() - xShift, m_canvasPixmap.height());
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         } else if (xShift < 0) {
 
@@ -3098,7 +3098,7 @@ void KisView::scrollH(int value)
                 bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, -xShift, 0, m_canvasPixmap.width() + xShift, m_canvasPixmap.height());
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         }
 	if (m_oldTool) {
@@ -3131,7 +3131,7 @@ void KisView::scrollV(int value)
                 bitBlt(&m_canvasPixmap, 0, yShift, &m_canvasPixmap, 0, 0, m_canvasPixmap.width(), m_canvasPixmap.height() - yShift);
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         } else if (yShift < 0) {
 
@@ -3143,7 +3143,7 @@ void KisView::scrollV(int value)
                 bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, 0, -yShift, m_canvasPixmap.width(), m_canvasPixmap.height() + yShift);
 
                 updateTQPaintDeviceCanvas(viewToWindow(drawRect));
-                m_canvas->repaint();
+                m_canvas->tqrepaint();
             }
         }
 	if (m_oldTool) {
@@ -3470,7 +3470,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
 
         // We ignore device change due to mouse events for a short duration
         // after a tablet event, since these are almost certainly mouse events
-        // sent to receivers that don't accept the tablet event.
+        // sent to tqreceivers that don't accept the tablet event.
         m_tabletEventTimer.start();
         break;
     }
@@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
         mgr = img->guides();
 
         if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
-            bool flag = geometry().contains(pt);
+            bool flag = tqgeometry().contains(pt);
             KisGuideSP gd;
 
             if (m_currentGuide == 0 && flag) {
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 3ec87a6e7..542e257df 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -19,7 +19,7 @@
  */
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqframe.h>
 #include <tqlabel.h>
@@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v )
 
 void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos)
 {
-    m_page->txtX->setText(TQString("%L1").arg(xpos, 5));
-    m_page->txtY->setText(TQString("%L1").arg(ypos, 5));
+    m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5));
+    m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5));
 }
 
 void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider)
@@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r)
 
                 TQPainter painter(&m_thumbnail);
 
-                painter.fillRect(thumbnailRect, colorGroup().mid());
+                painter.fillRect(thumbnailRect, tqcolorGroup().mid());
                 painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage);
             }
         }
@@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView()
 
         TQPainter painter(&m_viewBuffer);
 
-        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid());
+        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid());
 
         if (!m_thumbnail.isNull()) {
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 19f492006..96e1e032a 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -142,9 +142,9 @@ public:
     {
         m_img = m_item->tooltipPreview();
         m_timer.start( 15000, true );
-        if( !isVisible() || sizeHint() != size() )
+        if( !isVisible() || tqsizeHint() != size() )
         {
-            resize( sizeHint() );
+            resize( tqsizeHint() );
             position();
         }
         if( !isVisible() )
@@ -168,8 +168,8 @@ public:
     {
         TQPixmap buf( width(), height() );
         TQPainter p( &buf );
-        buf.fill( colorGroup().background() );
-        p.setPen( colorGroup().foreground() );
+        buf.fill( tqcolorGroup().background() );
+        p.setPen( tqcolorGroup().foreground() );
         p.drawRect( buf.rect() );
 
         TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() );
@@ -188,12 +188,12 @@ public:
             p.translate( m_img.width() + 10, 0 );
         }
 
-        text.draw( &p, 0, 0, rect(), colorGroup() );
+        text.draw( &p, 0, 0, rect(), tqcolorGroup() );
 
         painter->drawPixmap( 0, 0, buf );
     }
 
-    virtual TQSize sizeHint() const
+    virtual TQSize tqsizeHint() const
     {
         if( !m_item )
             return TQSize( 0, 0 );
@@ -217,7 +217,7 @@ public:
     void position()
     {
         const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
-        const TQSize size = sizeHint();
+        const TQSize size = tqsizeHint();
         const int width = size.width(), height = size.height();
         const TQRect tmp = m_item->rect();
         const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() );
@@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const
 {
     TQString tip;
     tip += "<table cellspacing=\"0\" cellpadding=\"0\">";
-    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( displayName() );
+    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").tqarg( displayName() );
     TQString row = "<tr><td>%1</td><td>%2</td></tr>";
     for( int i = 0, n = listView()->d->properties.count(); i < n; ++i )
         if( !isFolder() || listView()->d->properties[i].validForFolders )
         {
             if( d->properties[i] )
-                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) );
+                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) );
             else
-                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) );
+                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) );
         }
     tip += "</table>";
     return tip;
@@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum
 
     p.setFont( font() );
 
-    const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled();
+    const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled();
 
     const TQColor bg = isSelected()  ? cg_.highlight()
                     : isAlternate() ? listView()->alternateBackground()
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 31a044f22..6b957a26d 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos )
     TQListBoxItem* selectedItem = listBox->itemAt( pos );
     if (selectedItem)
     {
-        TQRect positionToolTip = listBox->itemRect( selectedItem );
+        TQRect positionToolTip = listBox->tqitemRect( selectedItem );
         TQString toolTipText = m_originalWidget->itemHighlighted();
         if (!toolTipText.isNull())
             tip(positionToolTip, toolTipText);
@@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const
     return false;
 }
 
-TQSize SqueezedComboBox::sizeHint() const
+TQSize SqueezedComboBox::tqsizeHint() const
 {
     constPolish();
     TQFontMetrics fm = fontMetrics();
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 50f4bc778..03a1cdb93 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -117,9 +117,9 @@ public:
     TQString itemHighlighted( );
 
     /**
-     * Sets the sizeHint() of this widget.
+     * Sets the tqsizeHint() of this widget.
      */
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 private slots:
     void slotTimeOut();
diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui
index 39de910a8..5227d7fb9 100644
--- a/chalk/ui/wdgapplyprofile.ui
+++ b/chalk/ui/wdgapplyprofile.ui
@@ -71,7 +71,7 @@
                     <property name="text">
                         <string>The image data you want to paste does not have an ICM profile associated with it. If you do not select a profile, Chalk will assume that the image data is encoded in the import profile defined in the Settings dialog.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui
index 6d3a572dc..00683ca95 100644
--- a/chalk/ui/wdgautobrush.ui
+++ b/chalk/ui/wdgautobrush.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout21</cstring>
+                                <cstring>tqlayout21</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -129,13 +129,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -169,7 +169,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout23</cstring>
+                                <cstring>tqlayout23</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -242,13 +242,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -273,7 +273,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -291,7 +291,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>95</width>
                             <height>95</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui
index aec6907d0..94a8a1372 100644
--- a/chalk/ui/wdgautogradient.ui
+++ b/chalk/ui/wdgautogradient.ui
@@ -45,7 +45,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>30</height>
@@ -57,7 +57,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <property name="font">
                         <font>
@@ -71,7 +71,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <property name="font">
                                 <font>
@@ -95,7 +95,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout8</cstring>
+                                        <cstring>tqlayout8</cstring>
                                     </property>
                                     <property name="font">
                                         <font>
@@ -129,7 +129,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
@@ -150,7 +150,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout9</cstring>
+                                        <cstring>tqlayout9</cstring>
                                     </property>
                                     <property name="font">
                                         <font>
@@ -184,7 +184,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
@@ -207,7 +207,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <property name="font">
                                 <font>
@@ -287,7 +287,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11_2</cstring>
+                        <cstring>tqlayout11_2</cstring>
                     </property>
                     <property name="font">
                         <font>
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 506e28031..2b2b7910f 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -39,7 +39,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -53,7 +53,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -71,13 +71,13 @@
                             <property name="name">
                                 <cstring>txtX</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -105,13 +105,13 @@
                             <property name="name">
                                 <cstring>txtY</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -137,7 +137,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -158,13 +158,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>75</width>
                             <height>75</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>200</width>
                             <height>75</height>
@@ -186,7 +186,7 @@
             <property name="name">
                 <cstring>toolbar</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32</height>
@@ -195,7 +195,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index f4a0f6958..6f9e41e6b 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>20</height>
@@ -228,7 +228,7 @@ The different rendering intent methods will affect only what is shown on screen,
                     <property name="text">
                         <string>&lt;p&gt;Select what color profile to add when pasting from external applications that do not use a color profile.&lt;/p&gt;</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen,
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen,
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui
index f1c67ffa7..dba17daca 100644
--- a/chalk/ui/wdgcustombrush.ui
+++ b/chalk/ui/wdgcustombrush.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -103,7 +103,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui
index 5b03a7f00..7936f20b8 100644
--- a/chalk/ui/wdgcustompattern.ui
+++ b/chalk/ui/wdgcustompattern.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -49,7 +49,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -65,7 +65,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -84,7 +84,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui
index 757b6b278..64b33f161 100644
--- a/chalk/ui/wdgdisplaysettings.ui
+++ b/chalk/ui/wdgdisplaysettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -49,7 +49,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>31</height>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 9383fbfd7..53f3ef90c 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -37,10 +37,10 @@
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="text">
-                                <string>&amp;Cursor shape:</string>
+                                <string>&amp;Cursor tqshape:</string>
                             </property>
                             <property name="buddy" stdset="0">
-                                <cstring>m_cmbCursorShape</cstring>
+                                <cstring>m_cmbtqCursorShape</cstring>
                             </property>
                         </widget>
                         <widget class="TQComboBox">
@@ -65,7 +65,7 @@
                                 </property>
                             </item>
                             <property name="name">
-                                <cstring>m_cmbCursorShape</cstring>
+                                <cstring>m_cmbtqCursorShape</cstring>
                             </property>
                         </widget>
                     </hbox>
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui
index dbb90e0ab..18c1f528d 100644
--- a/chalk/ui/wdggridsettings.ui
+++ b/chalk/ui/wdggridsettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -192,7 +192,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>34</width>
                             <height>20</height>
@@ -214,7 +214,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -222,7 +222,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -294,13 +294,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -320,7 +320,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -357,7 +357,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -427,7 +427,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui
index 02c151294..d977802ef 100644
--- a/chalk/ui/wdglayerbox.ui
+++ b/chalk/ui/wdglayerbox.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>10</height>
@@ -74,7 +74,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -84,13 +84,13 @@
                     <property name="name">
                         <cstring>bnAdd</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -110,13 +110,13 @@
                     <property name="name">
                         <cstring>bnLower</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -136,13 +136,13 @@
                     <property name="name">
                         <cstring>bnRaise</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -162,13 +162,13 @@
                     <property name="name">
                         <cstring>bnProperties</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -191,7 +191,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -202,13 +202,13 @@
                     <property name="name">
                         <cstring>bnDelete</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index 82548e11e..dd3104831 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>131</width>
                             <height>61</height>
@@ -230,7 +230,7 @@
                     <property name="text">
                         <string>Description:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -316,7 +316,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>480</width>
                             <height>21</height>
@@ -359,7 +359,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>0</height>
diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui
index c4de4e1dd..3654031bf 100644
--- a/chalk/ui/wdgpalettechooser.ui
+++ b/chalk/ui/wdgpalettechooser.ui
@@ -29,7 +29,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>255</width>
                             <height>20</height>
diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui
index 82deb5b96..c8e4404b4 100644
--- a/chalk/ui/wdgperformancesettings.ui
+++ b/chalk/ui/wdgperformancesettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="name">
                         <cstring>m_swappiness</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>600</width>
                             <height>32767</height>
@@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>139</height>
diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui
index 2a21e377a..90f59a336 100644
--- a/chalk/ui/wdgpressuresettings.ui
+++ b/chalk/ui/wdgpressuresettings.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>89</height>
diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui
index f6f02f39e..ca71ee011 100644
--- a/chalk/ui/wdgselectionoptions.ui
+++ b/chalk/ui/wdgselectionoptions.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui
index 2c485c4d7..563c7dbce 100644
--- a/chalk/ui/wdgshapeoptions.ui
+++ b/chalk/ui/wdgshapeoptions.ui
@@ -35,7 +35,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui
index 44a43e947..f9dfaac61 100644
--- a/chalk/ui/wdgtabletdevicesettings.ui
+++ b/chalk/ui/wdgtabletdevicesettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
@@ -49,7 +49,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -72,7 +72,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_4</cstring>
+                        <cstring>tqlayout4_4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_2</cstring>
+                        <cstring>tqlayout4_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -118,7 +118,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_3</cstring>
+                        <cstring>tqlayout4_3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -141,7 +141,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_6</cstring>
+                        <cstring>tqlayout4_6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4_5</cstring>
+                        <cstring>tqlayout4_5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui
index 41be6f398..29ff9dbb9 100644
--- a/chalk/ui/wdgtabletsettings.ui
+++ b/chalk/ui/wdgtabletsettings.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -91,7 +91,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index e51a4d6c7..5e5d5dac7 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -47,7 +47,7 @@
                             <property name="name">
                                 <cstring>lineEdit</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>120</width>
                                     <height>0</height>
@@ -65,7 +65,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 5bce37b21..2194831a1 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").arg(TQString(imgAttr -> key)), "", rawdata );
+            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(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").arg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp
index 2c49532ab..e56f53d2a 100644
--- a/filters/chalk/gmagick/magickexport.cpp
+++ b/filters/chalk/gmagick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h
index b1b73bb55..46a080f4f 100644
--- a/filters/chalk/gmagick/magickexport.h
+++ b/filters/chalk/gmagick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKEXPORT_H_
diff --git a/filters/chalk/gmagick/magickimport.cpp b/filters/chalk/gmagick/magickimport.cpp
index 9400c5bd5..dbfe6da8e 100644
--- a/filters/chalk/gmagick/magickimport.cpp
+++ b/filters/chalk/gmagick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using MagickImport!\n";
 
diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h
index 6ade3a208..22bf3002a 100644
--- a/filters/chalk/gmagick/magickimport.h
+++ b/filters/chalk/gmagick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKIMPORT_H_
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index c9772d9ae..5fa8e78ab 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").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
         return JCS_UNKNOWN;
     }
 
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc
index c0eef02d5..edfbbc021 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cc
+++ b/filters/chalk/jpeg/kis_jpeg_export.cc
@@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport()
 {
 }
 
-KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "JPEG export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h
index 918c44b57..ea55c12c7 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.h
+++ b/filters/chalk/jpeg/kis_jpeg_export.h
@@ -29,7 +29,7 @@ class KisJPEGExport : public KoFilter {
         KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cc
index bacec6794..2ca7c4c26 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.cc
+++ b/filters/chalk/jpeg/kis_jpeg_import.cc
@@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport()
 {
 }
 
-KoFilter::ConversionStatus KisJPEGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using JPEGImport!\n";
 
diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h
index 9db52292d..a32c367f7 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.h
+++ b/filters/chalk/jpeg/kis_jpeg_import.h
@@ -28,7 +28,7 @@ class KisJPEGImport : public KoFilter {
         KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 456fc67af..cb405324d 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,13 +34,13 @@
                     <property name="text">
                         <string>Quality:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -101,7 +101,7 @@
                                     <property name="text">
                                         <string>Best</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>61</height>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 880a52c66..dd16dd0e8 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").arg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp
index 8c1e33657..09f351c14 100644
--- a/filters/chalk/magick/magickexport.cpp
+++ b/filters/chalk/magick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h
index b1b73bb55..46a080f4f 100644
--- a/filters/chalk/magick/magickexport.h
+++ b/filters/chalk/magick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKEXPORT_H_
diff --git a/filters/chalk/magick/magickimport.cpp b/filters/chalk/magick/magickimport.cpp
index d3e5bbb90..b5f73d198 100644
--- a/filters/chalk/magick/magickimport.cpp
+++ b/filters/chalk/magick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using MagickImport!\n";
 
diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h
index 6ade3a208..22bf3002a 100644
--- a/filters/chalk/magick/magickimport.h
+++ b/filters/chalk/magick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKIMPORT_H_
diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp
index 062a072fb..4859f5d94 100644
--- a/filters/chalk/openexr/kis_openexr_export.cpp
+++ b/filters/chalk/openexr/kis_openexr_export.cpp
@@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport()
 {
 }
 
-KoFilter::ConversionStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to)
 {
     if (to != "image/x-exr" || from != "application/x-chalk") {
         return KoFilter::NotImplemented;
diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h
index ea62421cd..7f0c71f95 100644
--- a/filters/chalk/openexr/kis_openexr_export.h
+++ b/filters/chalk/openexr/kis_openexr_export.h
@@ -31,7 +31,7 @@ public:
     virtual ~KisOpenEXRExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // KIS_OPENEXR_EXPORT_H_
diff --git a/filters/chalk/openexr/kis_openexr_import.cpp b/filters/chalk/openexr/kis_openexr_import.cpp
index 8546edb2e..974d4a67e 100644
--- a/filters/chalk/openexr/kis_openexr_import.cpp
+++ b/filters/chalk/openexr/kis_openexr_import.cpp
@@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport()
 {
 }
 
-KoFilter::ConversionStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to)
 {
     if (from != "image/x-exr" || to != "application/x-chalk") {
         return KoFilter::NotImplemented;
diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h
index 8654df549..8bddb4f5d 100644
--- a/filters/chalk/openexr/kis_openexr_import.h
+++ b/filters/chalk/openexr/kis_openexr_import.h
@@ -31,7 +31,7 @@ public:
     virtual ~KisOpenEXRImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // KIS_OPENEXR_IMPORT_H_
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index ed504f679..2cef93e92 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport()
 {
 }
 
-KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& )
+KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& )
 {
     TQString filename = m_chain -> inputFile();
     kdDebug(41008) << "Importing using PDFImport!" << filename << endl;
@@ -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")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX);
+        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( 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/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h
index ffb9c79e9..06e22288d 100644
--- a/filters/chalk/pdf/kis_pdf_import.h
+++ b/filters/chalk/pdf/kis_pdf_import.h
@@ -29,7 +29,7 @@ class KisPDFImport : public KoFilter{
         KisPDFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPDFImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index 88d24dc62..697a3e304 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -65,7 +65,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -141,7 +141,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -160,7 +160,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -185,7 +185,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -235,7 +235,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index d5c4a080c..d3cce618a 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").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
         return -1;
 
     }
diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc
index ace659541..8154866aa 100644
--- a/filters/chalk/png/kis_png_export.cc
+++ b/filters/chalk/png/kis_png_export.cc
@@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport()
 {
 }
 
-KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "Png export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h
index 562628a97..433b68e34 100644
--- a/filters/chalk/png/kis_png_export.h
+++ b/filters/chalk/png/kis_png_export.h
@@ -29,7 +29,7 @@ class KisPNGExport : public KoFilter {
         KisPNGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cc
index dc2a63256..ccfe43885 100644
--- a/filters/chalk/png/kis_png_import.cc
+++ b/filters/chalk/png/kis_png_import.cc
@@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport()
 {
 }
 
-KoFilter::ConversionStatus KisPNGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using PNGImport!\n";
 
diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h
index 0412e7bd8..3487d24d3 100644
--- a/filters/chalk/png/kis_png_import.h
+++ b/filters/chalk/png/kis_png_import.h
@@ -28,7 +28,7 @@ class KisPNGImport : public KoFilter {
         KisPNGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index 5797c4072..ec5e0ba8f 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Compress:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -50,7 +50,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -113,7 +113,7 @@
                                     <property name="text">
                                         <string>Small</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>5</height>
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index 4ec8f0288..f006f913a 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -103,7 +103,7 @@ KisRawImport::~KisRawImport()
     delete m_process;
 }
 
-KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
 {
     if (from != "image/x-raw" || to != "application/x-chalk") {
         return KoFilter::NotImplemented;
@@ -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->resize(oldSize + buflen, TQGArray::SpeedOptim);
+    m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim);
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h
index e02caeede..17fd576cb 100644
--- a/filters/chalk/raw/kis_raw_import.h
+++ b/filters/chalk/raw/kis_raw_import.h
@@ -37,7 +37,7 @@ public:
     virtual ~KisRawImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 
 private slots:
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index 59d9642e1..26115762e 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -36,7 +36,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>150</height>
@@ -45,7 +45,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -304,7 +304,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>500</width>
                     <height>20</height>
@@ -321,7 +321,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>120</height>
@@ -330,7 +330,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -355,7 +355,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -408,7 +408,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 597840090..7a6ad9caf 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -39,7 +39,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name)
     connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) );
     setMainWidget(optionswdg);
     kapp->restoreOverrideCursor();
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
 }
 
 KisDlgOptionsTIFF::~KisDlgOptionsTIFF()
diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc
index 28495ff43..bcd3f22eb 100644
--- a/filters/chalk/tiff/kis_tiff_export.cc
+++ b/filters/chalk/tiff/kis_tiff_export.cc
@@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport()
 {
 }
 
-KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "Tiff export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h
index bb78fd4f2..9efeb9406 100644
--- a/filters/chalk/tiff/kis_tiff_export.h
+++ b/filters/chalk/tiff/kis_tiff_export.h
@@ -29,7 +29,7 @@ class KisTIFFExport : public KoFilter {
         KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cc
index 8c785ffec..89d1763f0 100644
--- a/filters/chalk/tiff/kis_tiff_import.cc
+++ b/filters/chalk/tiff/kis_tiff_import.cc
@@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport()
 {
 }
 
-KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using TIFFImport!\n";
 
diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h
index 77cfd0de5..b9e33d061 100644
--- a/filters/chalk/tiff/kis_tiff_import.h
+++ b/filters/chalk/tiff/kis_tiff_import.h
@@ -28,7 +28,7 @@ class KisTIFFImport : public KoFilter {
         KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index da399a53e..681e66b78 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").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(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 290388908..d840dc8dc 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -51,7 +51,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -119,7 +119,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -283,13 +283,13 @@ 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="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5</cstring>
+                                    <cstring>tqlayout5</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4_2</cstring>
+                                            <cstring>tqlayout4_2</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -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="alignment">
+                                                <property name="tqalignment">
                                                     <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="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5_2</cstring>
+                                    <cstring>tqlayout5_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4</cstring>
+                                            <cstring>tqlayout4</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -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="alignment">
+                                                <property name="tqalignment">
                                                     <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="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5_2_2</cstring>
+                                    <cstring>tqlayout5_2_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4_3</cstring>
+                                            <cstring>tqlayout4_3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -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="alignment">
+                                                <property name="tqalignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
@@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 3209e1811..90d61755a 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_children (gimage->layers));
+                                  gimp_container_num_tqchildren (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_children (gimage->vectors));
+                            gimp_container_num_tqchildren (gimage->vectors));
 
     return TRUE;
 }
@@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage)
     }
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_children (gimage->vectors));
+                            gimp_container_num_tqchildren (gimage->vectors));
 
     return TRUE;
 }
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index a0dbb9b5a..3544baf42 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_children (gimage->layers);
-    nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels);
+    nlayers   = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers);
+    nchannels = (TQ_UINT32) gimp_container_num_tqchildren (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_children (gimage->vectors) > 0)
+    if (gimp_container_num_tqchildren (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_children (gimage->vectors);
+    num_paths = gimp_container_num_tqchildren (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_children (gimage->vectors);
+    num_paths = gimp_container_num_tqchildren (gimage->vectors);
 
     xcf_write_int32_check_error (info, &version,      1);
     xcf_write_int32_check_error (info, &active_index, 1);
diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp
index 06bcf96fa..b26fdba88 100644
--- a/filters/chalk/xcf/xcfexport.cpp
+++ b/filters/chalk/xcf/xcfexport.cpp
@@ -41,7 +41,7 @@ XCFExport::~XCFExport()
 {
 }
 
-KoFilter::ConversionStatus XCFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "xcf export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h
index 34595b069..b8f260fbb 100644
--- a/filters/chalk/xcf/xcfexport.h
+++ b/filters/chalk/xcf/xcfexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // XCFEXPORT_H_
diff --git a/filters/chalk/xcf/xcfimport.cpp b/filters/chalk/xcf/xcfimport.cpp
index 6b81ec679..6f07ebcf2 100644
--- a/filters/chalk/xcf/xcfimport.cpp
+++ b/filters/chalk/xcf/xcfimport.cpp
@@ -39,7 +39,7 @@ XCFImport::~XCFImport()
 {
 }
 
-KoFilter::ConversionStatus XCFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using XCFImport!\n";
 
diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h
index 27f2cbfeb..434566bac 100644
--- a/filters/chalk/xcf/xcfimport.h
+++ b/filters/chalk/xcf/xcfimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // XCFIMPORT_H_
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index 4a1b1f088..f3ae2b13b 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <kdebug.h>
@@ -41,7 +41,7 @@ GenericFilter::GenericFilter(KoFilter *, const char *, const TQStringList&) :
     KoFilter() {
 }
 
-KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const TQCString &to )
+KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, const TQCString &to )
 {
 
     //find the right script to use
@@ -80,7 +80,7 @@ KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const
         return KoFilter::NotImplemented;
 }
 
-KoFilter::ConversionStatus GenericFilter::doImport()
+KoFilter::ConversiontqStatus GenericFilter::doImport()
 {
     KTempFile temp(TQString("genericfilter-"));
     temp.setAutoDelete(true);
@@ -119,7 +119,7 @@ KoFilter::ConversionStatus GenericFilter::doImport()
     return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus GenericFilter::doExport()
+KoFilter::ConversiontqStatus GenericFilter::doExport()
 {
     return KoFilter::NotImplemented;
 }
diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h
index 71448fce8..7b47406b6 100644
--- a/filters/generic_wrapper/generic_filter.h
+++ b/filters/generic_wrapper/generic_filter.h
@@ -36,11 +36,11 @@ public:
     GenericFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~GenericFilter() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from,
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from,
                                                 const TQCString& to );
 private:
-    KoFilter::ConversionStatus doImport();
-    KoFilter::ConversionStatus doExport();
+    KoFilter::ConversiontqStatus doImport();
+    KoFilter::ConversiontqStatus doExport();
     TQString m_to, m_from, m_exec;
     KoStore* m_out;
 };
diff --git a/filters/karbon/ai/aielement.cc b/filters/karbon/ai/aielement.cc
index 023943b9e..608bdf611 100644
--- a/filters/karbon/ai/aielement.cc
+++ b/filters/karbon/ai/aielement.cc
@@ -360,7 +360,7 @@ AIElement::Type AIElement::nameToType( const char* name )
 const TQString AIElement::toString() const
 {
   if ( d->typ == CString )
-	  return TQString::fromLatin1( toCString() );
+	  return TQString::tqfromLatin1( toCString() );
   if ( d->typ == Int )
 	  return TQString::number( toInt() );
   if ( d->typ == UInt )
diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cc
index 4e8549957..4a201ec52 100644
--- a/filters/karbon/ai/aiimport.cc
+++ b/filters/karbon/ai/aiimport.cc
@@ -56,7 +56,7 @@ AiImport::~AiImport()
 {
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 AiImport::convert( const TQCString& from, const TQCString& to )
 {
 	if ( from != "application/illustrator" || to != "application/x-karbon" )
diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h
index 3dd9a5601..c305b5365 100644
--- a/filters/karbon/ai/aiimport.h
+++ b/filters/karbon/ai/aiimport.h
@@ -36,7 +36,7 @@ public:
 	AiImport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~AiImport();
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 /* private:
    TQString m_result; */
 
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index 47c5f2b6c..b3df1581a 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqmessagebox.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
@@ -133,7 +133,7 @@ APPLIXGRAPHICImport::APPLIXGRAPHICImport (KoFilter *, const char *, const TQStri
  *                                                                            *
  *                                                                            *
  ******************************************************************************/
-KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to )
 {
 
     // Check MIME Types
@@ -156,7 +156,7 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
     str += "<!DOCTYPE karbon>\n";
     str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n";
 //      str += "  <head>\n";
-//      str += "   <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
+//      str += "   <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
 //      str += "   <grid dx=\"20\" dy=\"20\" align=\"0\">\n";
 //      str += "    <helplines align=\"0\"/>\n";
 //      str += "   </grid>\n";
@@ -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>").arg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
 				    "Comma");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
       return KoFilter::StupidError;
     }
 
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h
index e0eff76c6..3e42256ed 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.h
+++ b/filters/karbon/applixgraphics/applixgraphicimport.h
@@ -32,7 +32,7 @@ public:
     APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXGRAPHICImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 
diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cc
index 8696e6a39..e1bd06a52 100644
--- a/filters/karbon/eps/epsexport.cc
+++ b/filters/karbon/eps/epsexport.cc
@@ -87,7 +87,7 @@ EpsExport::EpsExport( KoFilter*, const char*, const TQStringList& )
 {
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 EpsExport::convert( const TQCString& from, const TQCString& to )
 {
 	if ( to != "image/x-eps" || from != "application/x-karbon" )
@@ -102,7 +102,7 @@ EpsExport::convert( const TQCString& from, const TQCString& to )
 		return KoFilter::StupidError;
 
 
-	KoFilter::ConversionStatus status = KoFilter::OK;
+	KoFilter::ConversiontqStatus status = KoFilter::OK;
 
 	// Ask questions about PS level etc.
 	EpsExportDlg* dialog = new EpsExportDlg();
@@ -194,7 +194,7 @@ EpsExport::visitVDocument( VDocument& document )
 			static_cast<KoDocumentInfoAuthor*>( docInfo.page( "author" ) );
 
 		// Get creation date/time = "now".
-		TQDateTime now( TQDateTime::currentDateTime() );
+		TQDateTime now( TQDateTime::tqcurrentDateTime() );
 
 		*m_stream <<
 			"%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n"
diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h
index f5867b430..1313294e8 100644
--- a/filters/karbon/eps/epsexport.h
+++ b/filters/karbon/eps/epsexport.h
@@ -46,7 +46,7 @@ public:
 	EpsExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~EpsExport() {}
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
 	virtual void visitVPath( VPath& composite );
diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc
index 77a650bb4..0fefb3e0d 100644
--- a/filters/karbon/eps/epsimport.cc
+++ b/filters/karbon/eps/epsimport.cc
@@ -57,7 +57,7 @@ EpsImport::~EpsImport()
 {
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 EpsImport::convert( const TQCString& from, const TQCString& to )
 {
 	if(
@@ -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\"").
-            arg(llx).arg(lly).arg(urx).arg(ury);
+            tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
 
 	// Build ghostscript call to convert ps/eps -> ai:
 	TQString command(
diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h
index c86be29d7..873dc169a 100644
--- a/filters/karbon/eps/epsimport.h
+++ b/filters/karbon/eps/epsimport.h
@@ -36,7 +36,7 @@ public:
 	EpsImport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~EpsImport();
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif
diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp
index 30b77ccf9..a260fd509 100644
--- a/filters/karbon/kontour/kontourimport.cpp
+++ b/filters/karbon/kontour/kontourimport.cpp
@@ -49,7 +49,7 @@ KontourImport::~KontourImport()
 
 }
 
-KoFilter::ConversionStatus KontourImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KontourImport::convert(const TQCString& from, const TQCString& to)
 {
 	// check for proper conversion
 	if ( to != "application/x-karbon" || ( from != "application/x-kontour" && from != "application/x-killustrator") )
@@ -198,8 +198,8 @@ KontourImport::convert()
 	if( docElem.attribute( "version" ).toInt() == 2 )
 	{
 		lay = docElem;
-		height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble();
-		width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble();
+		height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble();
+		width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble();
 	}
 	else
 	{
diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h
index 92e27a09f..e140f088c 100644
--- a/filters/karbon/kontour/kontourimport.h
+++ b/filters/karbon/kontour/kontourimport.h
@@ -33,7 +33,7 @@ public:
 	KontourImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~KontourImport();
 
-	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 protected:
 	TQDomDocument inpdoc;
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 8c4c27953..3e79e3ab9 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_shape.data = 0L;
-    m_shape.length = 0;
+    m_tqshape.data = 0L;
+    m_tqshape.length = 0;
 }
 
 Msod::~Msod()
 {
-    delete [] m_shape.data;
+    delete [] m_tqshape.data;
     delete m_opt;
 }
 
 void Msod::drawShape(
-    unsigned shapeType,
+    unsigned tqshapeType,
     TQ_UINT32 bytes,
     TQDataStream &operands)
 {
@@ -262,25 +262,25 @@ void Msod::drawShape(
     };
     struct
     {
-        TQ_UINT32 spid;                  // The shape id
+        TQ_UINT32 spid;                  // The tqshape id
         union
         {
             TQ_UINT32 info;
             struct
             {
-                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.
+                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.
                                         // Exactly one of these per drawing.
                 TQ_UINT32 fDeleted : 1;  // The shape.has been deleted
-                TQ_UINT32 fOleShape : 1; // The shape is an OLE object
+                TQ_UINT32 fOleShape : 1; // The tqshape 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 shape
+                TQ_UINT32 fConnector : 1; // Connector type of tqshape
                 TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind
-                TQ_UINT32 fBackground : 1; // Background shape
-                TQ_UINT32 fHaveSpt : 1;  // Shape has a shape type property
+                TQ_UINT32 fBackground : 1; // Background tqshape
+                TQ_UINT32 fHaveSpt : 1;  // Shape has a tqshape 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) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" <<
+	kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" <<
         (data.grfPersistent.fields.fGroup ? " group" : "") <<
         (data.grfPersistent.fields.fChild ? " child" : "") <<
         (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") <<
         (data.grfPersistent.fields.fDeleted ? " deleted" : "") <<
-        (data.grfPersistent.fields.fOleShape ? " oleshape" : "") <<
+        (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") <<
         (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 shape! Let's draw it...
+    // An active tqshape! Let's draw it...
 
-    switch (shapeType)
+    switch (tqshapeType)
     {
     case 0:
         if (m_opt->m_pVertices)
@@ -493,7 +493,7 @@ TQSize Msod::normaliseSize(
 }
 
 bool Msod::parse(
-    unsigned shapeId,
+    unsigned tqshapeId,
     const TQString &file,
     const char *delayStream)
 {
@@ -505,19 +505,19 @@ bool Msod::parse(
         return false;
     }
     TQDataStream stream(&in);
-    bool result = parse(shapeId, stream, in.size(), delayStream);
+    bool result = parse(tqshapeId, stream, in.size(), delayStream);
     in.close();
     return result;
 }
 
 bool Msod::parse(
-    unsigned shapeId,
+    unsigned tqshapeId,
     TQDataStream &stream,
     unsigned size,
     const char *delayStream)
 {
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    m_requestedShapeId = shapeId;
+    m_requestedShapeId = tqshapeId;
     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 shapes in this drawing.
-        TQ_UINT32 spidCur;    // The last shape ID given to an SP in this DG.
+        TQ_UINT32 csp;        // The number of tqshapes in this drawing.
+        TQ_UINT32 spidCur;    // The last tqshape 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 shape ID.
+        TQ_UINT32 spidMax;    // The current maximum tqshape ID.
         TQ_UINT32 cidcl;      // The number of ID clusters (FIDCLs).
-        TQ_UINT32 cspSaved;   // The total number of shapes saved.
-                        // (including deleted shapes, if undo
+        TQ_UINT32 cspSaved;   // The total number of tqshapes saved.
+                        // (including deleted tqshapes, 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 << " shapes in " <<
+    kdDebug(s_area) << data.cspSaved << " tqshapes 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 shape until we have seen any options
+    // We want to defer the act of drawing a tqshape 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_shape.type = op.opcode.fields.inst;
-    m_shape.length = bytes;
-    m_shape.data = new char [bytes];
-    operands.readRawBytes(m_shape.data, bytes);
+    m_tqshape.type = op.opcode.fields.inst;
+    m_tqshape.length = bytes;
+    m_tqshape.data = new char [bytes];
+    operands.readRawBytes(m_tqshape.data, bytes);
 }
 
 void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 {
     walk(bytes, operands);
 
-    // Having gathered all the information for this shape, we can now draw it.
+    // Having gathered all the information for this tqshape, we can now draw it.
 
     TQByteArray  a;
 
-    a.setRawData(m_shape.data, m_shape.length);
+    a.setRawData(m_tqshape.data, m_tqshape.length);
     TQDataStream s(a, IO_ReadOnly);
     s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    drawShape(m_shape.type, m_shape.length, s);
-    a.resetRawData(m_shape.data, m_shape.length);
-    delete [] m_shape.data;
-    m_shape.data = 0L;
+    drawShape(m_tqshape.type, m_tqshape.length, s);
+    a.resetRawData(m_tqshape.data, m_tqshape.length);
+    delete [] m_tqshape.data;
+    m_tqshape.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_shapePath = 1;
+    m_tqshapePath = 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_shapePath = op.value;
+            m_tqshapePath = 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 3db6fc2f3..f53146bfa 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 shapeId.
+    // Called to parse the given file. We extract a drawing by tqshapeId.
     // If the drawing is not found, the return value will be false.
 
     bool parse(
-        unsigned shapeId,
+        unsigned tqshapeId,
         const TQString &file,
         const char *delayStream = 0L);
     bool parse(
-        unsigned shapeId,
+        unsigned tqshapeId,
         TQDataStream &stream,
         unsigned size,
         const char *delayStream = 0L);
@@ -114,14 +114,14 @@ private:
         unsigned type;
         char *data;
         unsigned length;
-    } m_shape;
+    } m_tqshape;
 
     TQPoint normalisePoint(
         TQDataStream &operands);
     TQSize normaliseSize(
         TQDataStream &operands);
     void drawShape(
-        unsigned shapeType,
+        unsigned tqshapeType,
         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_shapePath;
+        TQ_UINT32 m_tqshapePath;
         TQPointArray *m_pVertices;
         bool m_fShadowOK;
         bool m_f3DOK;
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index e25889c0b..903d50a2b 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -46,18 +46,18 @@ MSODImport::~MSODImport()
 {
 }
 
-KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const TQCString& to )
 {
     if (to != "application/x-karbon" || from != "image/x-msod")
         return KoFilter::NotImplemented;
 
-    // Get configuration data: the shape id, and any delay stream that we were given.
-    unsigned shapeId;
-    emit commSignalShapeID( shapeId );
+    // Get configuration data: the tqshape id, and any delay stream that we were given.
+    unsigned tqshapeId;
+    emit commSignalShapeID( tqshapeId );
     const char *delayStream = 0L;
     emit commSignalDelayStream( delayStream );
     kdDebug( s_area ) << "##################################################################" << endl;
-    kdDebug( s_area ) << "shape id: " << shapeId << endl;
+    kdDebug( s_area ) << "tqshape id: " << tqshapeId << 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("shape-id="))
+        if (args[i].startsWith("tqshape-id="))
         {
-            shapeId = args[i].mid(9).toUInt();
+            tqshapeId = 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(shapeId, m_chain->inputFile(), delayStream))
+    if (!parse(tqshapeId, m_chain->inputFile(), delayStream))
         return KoFilter::WrongFormat;
 
     // close doc
@@ -175,7 +175,7 @@ void MSODImport::gotPicture(
                 kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl;
 
             TQCString destMime; // intentionally empty, the filter manager will do the rest
-            KoFilter::ConversionStatus status;
+            KoFilter::ConversiontqStatus status;
             partRef = embedPart( srcMime.latin1(), destMime, status, TQString::number( key ) );
 
             m_embeddeeData = 0;
diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h
index 9264b7d5a..162176de1 100644
--- a/filters/karbon/msod/msodimport.h
+++ b/filters/karbon/msod/msodimport.h
@@ -39,7 +39,7 @@ public:
         const TQStringList&);
     virtual ~MSODImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
 
@@ -68,7 +68,7 @@ protected:
 signals:
     // Communication signals to the parent filters
     void commSignalDelayStream( const char* delay );
-    void commSignalShapeID( unsigned int& shapeID );
+    void commSignalShapeID( unsigned int& tqshapeID );
 
 private:
     virtual void savePartContents( TQIODevice* file );
diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index fba488671..90320d7e0 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -62,7 +62,7 @@ OoDrawImport::~OoDrawImport()
 {
 }
 
-KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug() << "Entering Oodraw Import filter: " << from << " - " << to << endl;
 
@@ -81,13 +81,13 @@ KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCStr
         return KoFilter::FileNotFound;
     }
 
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-    if( preStatus != KoFilter::OK )
+    if( pretqStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return preStatus;
+        return pretqStatus;
     }
 /*TQDomDocument docinfo;
   createDocumentInfo( docinfo );
@@ -149,9 +149,9 @@ void OoDrawImport::createDocumentInfo( TQDomDocument &docinfo )
 
 
 // Very related to OoWriterImport::openFile()
-KoFilter::ConversionStatus OoDrawImport::openFile()
+KoFilter::ConversiontqStatus OoDrawImport::openFile()
 {
-    KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content );
+    KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content );
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -223,7 +223,7 @@ void OoDrawImport::convert()
 }
 
 
-KoFilter::ConversionStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
      return OoUtils::loadAndParse( filename, doc, m_zip);
 }
diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h
index 6e753d7de..2b395f48a 100644
--- a/filters/karbon/oodraw/oodrawimport.h
+++ b/filters/karbon/oodraw/oodrawimport.h
@@ -43,7 +43,7 @@ public:
     OoDrawImport( KoFilter *parent, const char *name, const TQStringList & );
     virtual ~OoDrawImport();
 
-    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 private:
 	void createDocumentInfo( TQDomDocument &docinfo );
@@ -63,8 +63,8 @@ private:
 	double ymirror( double y );
 	KoRect parseViewBox( const TQDomElement& object );
 
-	KoFilter::ConversionStatus openFile();
-	KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+	KoFilter::ConversiontqStatus openFile();
+	KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
 
 	VDocument			m_document;
 	TQDomDocument			m_content;
diff --git a/filters/karbon/png/pngexport.cc b/filters/karbon/png/pngexport.cc
index 89b43d03f..4de61a44b 100644
--- a/filters/karbon/png/pngexport.cc
+++ b/filters/karbon/png/pngexport.cc
@@ -48,7 +48,7 @@ PngExport::PngExport( KoFilter*, const char*, const TQStringList& )
 {
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 PngExport::convert( const TQCString& from, const TQCString& to )
 {
 	if ( to != "image/png" || from != "application/x-karbon" )
diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h
index df8939653..3758daa36 100644
--- a/filters/karbon/png/pngexport.h
+++ b/filters/karbon/png/pngexport.h
@@ -33,7 +33,7 @@ public:
 	PngExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~PngExport() {}
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif
diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index a5ed9b400..2e6610396 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -67,7 +67,7 @@ SvgExport::SvgExport( KoFilter*, const char*, const TQStringList& )
 	m_gc.setAutoDelete( true );
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 SvgExport::convert( const TQCString& from, const TQCString& to )
 {
 	if ( to != "image/svg+xml" || from != "application/x-karbon" )
@@ -171,7 +171,7 @@ TQString
 SvgExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " id=\"%1\"" ).arg( obj->name() );
+		return TQString( " id=\"%1\"" ).tqarg( 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.alignment() == VText::Center )
+	if( text.tqalignment() == VText::Center )
 		*m_body << " text-anchor=\"middle\"";
-	else if( text.alignment() == VText::Right )
+	else if( text.tqalignment() == VText::Right )
 		*m_body << " text-anchor=\"end\"";
 
 	*m_body << ">" << endl;
diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h
index c79d1fded..6bfe5d988 100644
--- a/filters/karbon/svg/svgexport.h
+++ b/filters/karbon/svg/svgexport.h
@@ -52,7 +52,7 @@ public:
 	SvgExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~SvgExport() {}
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
 	virtual void visitVPath( VPath& composite );
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index 9d323d3da..5a5e90aa1 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -54,7 +54,7 @@ SvgImport::~SvgImport()
 {
 }
 
-KoFilter::ConversionStatus SvgImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQCString& to)
 {
 	// check for proper conversion
 	if( to != "application/x-karbon" || from != "image/svg+xml" )
@@ -138,7 +138,7 @@ void SvgImport::convert()
 	m_outerRect = m_document.boundingBox();
 
 	// undo y-mirroring
-	//m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed()));
+	//m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(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%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
-					double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
+					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 );
 					gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					if(gc->fill.gradient().type() == VGradient::radial)
 					{
-						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 );
+						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 );
 						gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					}
-					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 );
+					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 );
 					gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					//kdDebug() << offsety << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
@@ -1263,9 +1263,9 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b )
 			text->setName( b.attribute("id") );
 
 		if( anchor == "middle" )
-			text->setAlignment( VText::Center );
+			text->tqsetAlignment( VText::Center );
 		else if( anchor == "end" )
-			text->setAlignment( VText::Right );
+			text->tqsetAlignment( VText::Right );
 		
 		if( offset > 0.0 )
 			text->setOffset( offset );
diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h
index 636077a17..e4e3f56a7 100644
--- a/filters/karbon/svg/svgimport.h
+++ b/filters/karbon/svg/svgimport.h
@@ -45,7 +45,7 @@ public:
 	SvgImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~SvgImport();
 
-	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 protected:
 	class GradientHelper
diff --git a/filters/karbon/wmf/wmfexport.cc b/filters/karbon/wmf/wmfexport.cc
index de929ca88..a04dfc11b 100644
--- a/filters/karbon/wmf/wmfexport.cc
+++ b/filters/karbon/wmf/wmfexport.cc
@@ -57,7 +57,7 @@ WmfExport::~WmfExport()
 {
 }
 
-KoFilter::ConversionStatus WmfExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WmfExport::convert( const TQCString& from, const TQCString& to )
 {
     if( to != "image/x-wmf" || from != "application/x-karbon" ) {
         return KoFilter::NotImplemented;
diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h
index 2c464f134..e0c9be57c 100644
--- a/filters/karbon/wmf/wmfexport.h
+++ b/filters/karbon/wmf/wmfexport.h
@@ -20,7 +20,7 @@
 #define WMFEXPORT_H
 
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqptrlist.h>
 #include <tqpointarray.h>
 #include <KoFilter.h>
@@ -41,7 +41,7 @@ public:
     WmfExport( KoFilter *parent, const char *name, const TQStringList&);
     virtual ~WmfExport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     void visitVPath( VPath& composite );
diff --git a/filters/karbon/wmf/wmfimport.cc b/filters/karbon/wmf/wmfimport.cc
index f7dcdcf3d..23eaaa121 100644
--- a/filters/karbon/wmf/wmfimport.cc
+++ b/filters/karbon/wmf/wmfimport.cc
@@ -45,7 +45,7 @@ WMFImport::~WMFImport()
 {
 }
 
-KoFilter::ConversionStatus WMFImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WMFImport::convert( const TQCString& from, const TQCString& to )
 {
     if( to != "application/x-karbon" || from != "image/x-wmf" )
     return KoFilter::NotImplemented;
diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h
index 34ee8140b..21bcee74b 100644
--- a/filters/karbon/wmf/wmfimport.h
+++ b/filters/karbon/wmf/wmfimport.h
@@ -36,7 +36,7 @@ public:
     WMFImport( KoFilter *parent, const char *name, const TQStringList&);
     virtual ~WMFImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 };
 
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc
index e1599a8cf..228024f3d 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cc
@@ -60,7 +60,7 @@ XAMLExport::XAMLExport( KoFilter*, const char*, const TQStringList& )
 	m_gc.setAutoDelete( true );
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 XAMLExport::convert( const TQCString& from, const TQCString& to )
 {
 	// TODO: ???
@@ -161,7 +161,7 @@ TQString
 XAMLExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " Name=\"%1\"" ).arg( obj->name() );
+		return TQString( " Name=\"%1\"" ).tqarg( obj->name() );
 	return TQString();
 }
 
diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h
index 124ea3fd1..b1a0f4fdc 100644
--- a/filters/karbon/xaml/xamlexport.h
+++ b/filters/karbon/xaml/xamlexport.h
@@ -50,7 +50,7 @@ public:
 	XAMLExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~XAMLExport() {}
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
 	virtual void visitVPath( VPath& composite );
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc
index 002001e27..3a7551813 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 <shapes/vellipse.h>
-#include <shapes/vrectangle.h>
-#include <shapes/vpolygon.h>
+#include <tqshapes/vellipse.h>
+#include <tqshapes/vrectangle.h>
+#include <tqshapes/vpolygon.h>
 #include <commands/vtransformcmd.h>
 #include <core/vsegment.h>
 #include <core/vtext.h>
@@ -52,7 +52,7 @@ XAMLImport::~XAMLImport()
 {
 }
 
-KoFilter::ConversionStatus XAMLImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQCString& to)
 {
 	// check for proper conversion
 	if( to != "application/x-karbon" || from != "image/wvg+xml" )
@@ -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%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
-				double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
+				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 );
 				gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				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 );
+				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 );
 				gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				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 );
+				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 );
 				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/xamlimport.h b/filters/karbon/xaml/xamlimport.h
index 001d1dc33..b61313b98 100644
--- a/filters/karbon/xaml/xamlimport.h
+++ b/filters/karbon/xaml/xamlimport.h
@@ -43,7 +43,7 @@ public:
 	XAMLImport(KoFilter *parent, const char *name, const TQStringList&);
 	virtual ~XAMLImport();
 
-	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 protected:
 	class GradientHelper
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index 215c4f018..3e9237fb4 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -52,7 +52,7 @@ XcfExport::XcfExport( KoFilter*, const char*, const TQStringList& )
 	m_zoomY = 1.0;
 }
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 XcfExport::convert( const TQCString& from, const TQCString& to )
 {
 	if( to != "image/x-xcf-gimp" || from != "application/x-karbon" )
@@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 	// Save current offset.
-	current = m_stream->device()->at();
+	current = m_stream->tqdevice()->at();
 
 	// Leave space for layer and channel offsets.
-	m_stream->device()->at(
+	m_stream->tqdevice()->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->device()->at();
+		start = m_stream->tqdevice()->at();
 
 
 		// Write layer.
@@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 		// Save end offset.
-		end = m_stream->device()->at();
+		end = m_stream->tqdevice()->at();
 
 		// Return to current offset.
-		m_stream->device()->at( current );
+		m_stream->tqdevice()->at( current );
 
 		// Save layer offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->device()->at();
+		current = m_stream->tqdevice()->at();
 
 		// Return to end offset.
-		m_stream->device()->at( end );
+		m_stream->tqdevice()->at( end );
 	}
 
 
 	// Return to current offset.
-	m_stream->device()->at( current );
+	m_stream->tqdevice()->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->device()->at( end );
+	m_stream->tqdevice()->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->device()->at();
+	current = m_stream->tqdevice()->at();
 
 	// Leave space for hierarchy offsets.
-	m_stream->device()->at( current + 8 );
+	m_stream->tqdevice()->at( current + 8 );
 
 	// Save start offset.
-	start = m_stream->device()->at();
+	start = m_stream->tqdevice()->at();
 
 
 	// Write hierarchy.
@@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer )
 
 
 	// Save end offset.
-	end = m_stream->device()->at();
+	end = m_stream->tqdevice()->at();
 
 	// Return to current offset.
-	m_stream->device()->at( current );
+	m_stream->tqdevice()->at( current );
 
 	// Save hierarchy offset.
 	*m_stream << start;
@@ -333,15 +333,15 @@ XcfExport::writeHierarchy()
 	int height = m_height;
 
 	// Save current offset.
-	current = m_stream->device()->at();
+	current = m_stream->tqdevice()->at();
 
 	// Leave space for level offsets.
-	m_stream->device()->at( current + ( levels + 1 ) * 4 );
+	m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 );
 
 	for( int i = 0; i < levels; ++i )
 	{
 		// Save start offset.
-		start = m_stream->device()->at();
+		start = m_stream->tqdevice()->at();
 
 		if( i == 0 )
 		{
@@ -360,23 +360,23 @@ XcfExport::writeHierarchy()
 		}
 
 		// Save end offset.
-		end = m_stream->device()->at();
+		end = m_stream->tqdevice()->at();
 
 		// Return to current offset.
-		m_stream->device()->at( current );
+		m_stream->tqdevice()->at( current );
 
 		// Save level offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->device()->at();
+		current = m_stream->tqdevice()->at();
 
 		// Return to end offset.
-		m_stream->device()->at( end );
+		m_stream->tqdevice()->at( end );
 	}
 
 	// Return to current offset.
-	m_stream->device()->at( current );
+	m_stream->tqdevice()->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->device()->at();
+	current = m_stream->tqdevice()->at();
 
 	// Leave space for tile offsets.
-	m_stream->device()->at( current + ( tiles + 1 ) * 4 );
+	m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 );
 
 	for( int i = 0; i < tiles; ++i )
 	{
 		// Save start offset.
-		start = m_stream->device()->at();
+		start = m_stream->tqdevice()->at();
 
 
 		// TODO: Save tile.
@@ -425,19 +425,19 @@ XcfExport::writeLevel()
 
 
 		// Save end offset.
-		end = m_stream->device()->at();
+		end = m_stream->tqdevice()->at();
 
 		// Return to current offset.
-		m_stream->device()->at( current );
+		m_stream->tqdevice()->at( current );
 
 		// Save tile offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->device()->at();
+		current = m_stream->tqdevice()->at();
 
 		// Return to end offset.
-		m_stream->device()->at( end );
+		m_stream->tqdevice()->at( end );
 	}
 }
 
diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h
index f6a7be702..82d868833 100644
--- a/filters/karbon/xcf/xcfexport.h
+++ b/filters/karbon/xcf/xcfexport.h
@@ -40,7 +40,7 @@ public:
 	XcfExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~XcfExport() {}
 
-	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 	virtual void visitVDocument( VDocument& document );
 	virtual void visitVLayer( VLayer& layer );
diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc
index c3d6ab6a9..015c40060 100644
--- a/filters/karbon/xfig/xfigimport.cc
+++ b/filters/karbon/xfig/xfigimport.cc
@@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
 
   char buf[255];
   int value;
-  KoPageLayout layout;
+  KoPageLayout tqlayout;
 
   ifstream fin( file.local8Bit() );
   if (! fin)
@@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
     GDocument *gdoc             = kidoc->gdoc();
     //GPage *activePage           = gdoc->activePage();
 
-  layout = gdoc->activePage()->pageLayout ();
+  tqlayout = gdoc->activePage()->pageLayout ();
 
   fin.getline (buf, 255);
   if (::strncmp (buf, "#FIG 3", 6)) {
@@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
   // orientation
   fin.getline (buf, 255);
   if (::strcmp (buf, "Landscape") == 0)
-      layout.orientation = PG_LANDSCAPE;
+      tqlayout.orientation = PG_LANDSCAPE;
   else if (::strcmp (buf, "Portrait") == 0)
-      layout.orientation = PG_PORTRAIT;
+      tqlayout.orientation = PG_PORTRAIT;
   else
       kdDebug() << "ERROR: invalid orientation" << endl;
 
@@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
   // units
   fin.getline (buf, 255);
   if (::strcmp (buf, "Metric") == 0)
-      layout.unit = PG_MM;
+      tqlayout.unit = PG_MM;
   else if (::strcmp (buf, "Inches") == 0)
-      layout.unit = PG_INCH;
+      tqlayout.unit = PG_INCH;
   else
       kdDebug() << "ERROR: invalid units" << endl;
 
diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp
index faff17ff2..5033762b4 100644
--- a/filters/kchart/libimageexport/imageexport.cpp
+++ b/filters/kchart/libimageexport/imageexport.cpp
@@ -40,7 +40,7 @@ ImageExport::~ImageExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 ImageExport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion.
diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h
index d1a73abe6..825b01567 100644
--- a/filters/kchart/libimageexport/imageexport.h
+++ b/filters/kchart/libimageexport/imageexport.h
@@ -32,7 +32,7 @@ public:
     ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
     virtual void extraImageAttribute() {};
     virtual bool saveImage( TQString fileName) = 0;
     virtual const char* exportFormat() = 0;
diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc
index 1507f5369..8d8ad52c0 100644
--- a/filters/kchart/svg/svgexport.cc
+++ b/filters/kchart/svg/svgexport.cc
@@ -45,7 +45,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion.
diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h
index 653aae9be..c04c0f22a 100644
--- a/filters/kchart/svg/svgexport.h
+++ b/filters/kchart/svg/svgexport.h
@@ -31,7 +31,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index 3f1846744..77488fa9d 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -46,7 +46,7 @@ LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQSt
 }
 
 
-KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "text/x-tex" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h
index 83672fae1..091ed125a 100644
--- a/filters/kformula/latex/latexexport.h
+++ b/filters/kformula/latex/latexexport.h
@@ -33,7 +33,7 @@ public:
     LATEXExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~LATEXExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // LATEXEXPORT_H
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index 6103da185..507c13a21 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -46,7 +46,7 @@ MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQ
 }
 
 
-KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus MathMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/mathml+xml" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h
index 2a442a22a..a49b837bb 100644
--- a/filters/kformula/mathml/mathmlexport.h
+++ b/filters/kformula/mathml/mathmlexport.h
@@ -33,7 +33,7 @@ public:
     MathMLExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~MathMLExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // MATHMLEXPORT_H
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 6900c61bf..87ce21829 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #include <KoFilterChain.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kformuladocument.h>
 #include <kformulacontainer.h>
@@ -44,7 +44,7 @@ MathMLImport::MathMLImport(KoFilter *, const char *, const TQStringList&)
 {
 }
 
-KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const TQCString& to )
 {
     kdDebug( KFormula::DEBUGID ) << "From: " << from << endl;
     kdDebug( KFormula::DEBUGID ) << "To:   " << to << endl;
@@ -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" ).arg( filename ), i18n( "MathML Import Error" ) );
+        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( 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" )
-                              .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) );
+                              .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) );
         return KoFilter::WrongFormat;
     }
     f.close();
diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h
index 4835b69ba..a4a28e180 100644
--- a/filters/kformula/mathml/mathmlimport.h
+++ b/filters/kformula/mathml/mathmlimport.h
@@ -21,7 +21,7 @@
 #define MATHMLIMPORT_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -36,7 +36,7 @@ public:
     MathMLImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MathMLImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* MATHMLIMPORT_H */
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index 764cfc2b1..c6d3611ef 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -46,7 +46,7 @@ PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQString
 }
 
 
-KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus PNGExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "image/png" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h
index eb71df946..8dd3de342 100644
--- a/filters/kformula/png/pngexport.h
+++ b/filters/kformula/png/pngexport.h
@@ -33,7 +33,7 @@ public:
     PNGExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~PNGExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // PNGEXPORT_H
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index 36741fa2a..fb0407e0f 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpaintdevice.h>
 #include <tqrect.h>
@@ -190,13 +190,13 @@ void PNGExportDia::setupGUI()
     width->setText( i18n( "Width" ) );
     heightEdit = new KIntNumInput( page, "heightEdit" );
 
-    TQGridLayout* layout1 = new TQGridLayout;
-    layout1->addWidget( height, 1, 0 );
-    layout1->addWidget( widthEdit, 0, 1 );
-    layout1->addWidget( width, 0, 0 );
-    layout1->addWidget( heightEdit, 1, 1 );
+    TQGridLayout* tqlayout1 = new TQGridLayout;
+    tqlayout1->addWidget( height, 1, 0 );
+    tqlayout1->addWidget( widthEdit, 0, 1 );
+    tqlayout1->addWidget( width, 0, 0 );
+    tqlayout1->addWidget( heightEdit, 1, 1 );
 
-    mainLayout->addLayout( layout1 );
+    mainLayout->addLayout( tqlayout1 );
 
     TQLabel* percentHeight = new TQLabel( page, "PercentHeight" );
     percentHeight->setText( i18n( "Height (%)" ) );
@@ -205,15 +205,15 @@ void PNGExportDia::setupGUI()
     percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" );
     percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" );
 
-    TQGridLayout* layout2 = new TQGridLayout;
-    layout2->addWidget( percWidthEdit, 0, 1 );
-    layout2->addWidget( percHeightEdit, 1, 1 );
-    layout2->addWidget( percentHeight, 1, 0 );
-    layout2->addWidget( percentWidth, 0, 0 );
+    TQGridLayout* tqlayout2 = new TQGridLayout;
+    tqlayout2->addWidget( percWidthEdit, 0, 1 );
+    tqlayout2->addWidget( percHeightEdit, 1, 1 );
+    tqlayout2->addWidget( percentHeight, 1, 0 );
+    tqlayout2->addWidget( percentWidth, 0, 0 );
 
-    mainLayout->addLayout( layout2 );
+    mainLayout->addLayout( tqlayout2 );
 
-    /* Display the main layout */
+    /* Display the main tqlayout */
     mainLayout->addStretch( 5 );
     mainLayout->activate();
 }
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc
index 328f1518e..25758e82f 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cc
@@ -48,7 +48,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion.
diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h
index 0296e574f..65a5cef14 100644
--- a/filters/kformula/svg/svgexport.h
+++ b/filters/kformula/svg/svgexport.h
@@ -32,7 +32,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__
diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp
index 2339dbf08..cd983fe66 100644
--- a/filters/kivio/imageexport/kivio_imageexport.cpp
+++ b/filters/kivio/imageexport/kivio_imageexport.cpp
@@ -55,7 +55,7 @@ ImageExport::ImageExport(KoFilter *, const char *, const TQStringList&)
   KGlobal::locale()->insertCatalogue("kofficefilters");
 }
 
-KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus ImageExport::convert(const TQCString& from, const TQCString& to)
 {
   if(from != "application/x-kivio") {
     return KoFilter::BadMimeType;
diff --git a/filters/kivio/imageexport/kivio_imageexport.h b/filters/kivio/imageexport/kivio_imageexport.h
index 498204faa..e1946f0f2 100644
--- a/filters/kivio/imageexport/kivio_imageexport.h
+++ b/filters/kivio/imageexport/kivio_imageexport.h
@@ -32,7 +32,7 @@ class ImageExport : public KoFilter
   public:
     ImageExport(KoFilter *, const char *, const TQStringList&);
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 }
diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui
index 34feba578..41d73a4cf 100644
--- a/filters/kivio/imageexport/kivio_imageexportwidget.ui
+++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -81,7 +81,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>60</width>
                     <height>21</height>
@@ -103,7 +103,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index 8dd96c5fa..d40cd6085 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) :
 // This filter can act as an import filter for KWord and as an export
 // filter for KPresenter (isn't our architecture really nice ? :)
 // This is why we use the file-to-file method, not a TQDomDoc one.
-KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="application/x-kword" || from!="application/x-kpresenter")
         return KoFilter::NotImplemented;
diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h
index 30932652b..f4141a097 100644
--- a/filters/kpresenter/kword/kprkword.h
+++ b/filters/kpresenter/kword/kprkword.h
@@ -33,7 +33,7 @@ public:
 
     virtual ~KprKword() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     void convert();
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index c4ceb2438..b87b8635e 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -42,7 +42,7 @@ ImageExport::~ImageExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 ImageExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h
index 5cb896229..23f45e28d 100644
--- a/filters/kpresenter/libimageexport/imageexport.h
+++ b/filters/kpresenter/libimageexport/imageexport.h
@@ -32,7 +32,7 @@ public:
     ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
     virtual bool extraImageAttribute() { return true;};
     virtual bool saveImage( TQString fileName) = 0;
     virtual const char* exportFormat() = 0;
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index 975274710..e2e5b50aa 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.alignment="1"       #text alignment, left
+    self.tqalignment="1"       #text tqalignment, 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.alignment="8"
+      self.tqalignment="8"
     elif (tokens[0]=='right'):
-      self.alignment="2"
+      self.tqalignment="2"
     elif (tokens[0]=='center'):
-      self.alignment="4"
+      self.tqalignment="4"
     else:
-      self.alignment="1" #left
-    #print self.alignment
+      self.tqalignment="1" #left
+    #print self.tqalignment
 
   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.alignment) 
+    pElem.setAttribute("align", self.tqalignment) 
 
     elem=self.document.createElement("NAME")        #style name
     elem.setAttribute("value", "Standard")          ###is this needed at all?
@@ -283,7 +283,7 @@ class MgpImporter:
     if (self.fontItalic!=0):
       elem.setAttribute("italic", "1")
     
-    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
+    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
     elem.appendChild(text)
     pElem.appendChild(elem)
     self.textElem.appendChild(pElem)
@@ -377,7 +377,7 @@ class MgpImporter:
             self.__setFontSize(command)
           elif (command.startswith('left') or
                 command.startswith('center') or
-                command.startswith('right')):             #text alignment
+                command.startswith('right')):             #text tqalignment
             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 47173cb9f..0e4771cf2 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport()
     delete m_storeinp;
 }
 
-KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
+KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from,
                                                      const TQCString & to )
 {
     kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl;
@@ -66,10 +66,10 @@ KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
     }
 
     // read in the KPresenter file
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-    if ( preStatus != KoFilter::OK )
-        return preStatus;
+    if ( pretqStatus != KoFilter::OK )
+        return pretqStatus;
 
     TQDomImplementation impl;
     TQDomDocument meta( impl.createDocumentType( "office:document-meta",
@@ -178,7 +178,7 @@ KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
     return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OoImpressExport::openFile()
+KoFilter::ConversiontqStatus OoImpressExport::openFile()
 {
     m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read );
 
@@ -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.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) );
+                m_helpLine+=str.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) );
             }
         }
     }
@@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
     TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
 
     //TODO : add draw:text-box size :
-    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
+    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
 
     TQStringList text = TQStringList::split( "\n", noteText );
     for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {
@@ -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 geometry
+    // set the tqgeometry
     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" ).arg( m_pictureIndex );
+    TQString pictureName = TQString( "Picture/Picture%1" ).tqarg( 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 geometry
+// set the tqgeometry
     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 geometry
+    // set the tqgeometry
     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 geometry
+    // set the tqgeometry
     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 geometry
+    // set the tqgeometry
     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 geometry
+    // set the tqgeometry
     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" ).arg( KoUnit::toCM( y ) ) );
+    target.setAttribute( "svg:y", TQString( "%1cm" ).tqarg( 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" ).arg( tmpX ).arg( tmpY );
+                        listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
                     else
-                        listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
+                        listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( 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" ).arg( maxX ).arg( maxY ) );
+            target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( 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)" ).arg( value );
+        str=TQString( "rotate (%1)" ).tqarg( 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" ).arg( KoUnit::toCM( x2 ) );
+    TQString xpos2 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x2 ) );
 
     if ( type == 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 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) );
     }
     else if ( type == 1 )
     {
-        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 ) );
+        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 ) );
         xpos2 = xpos1;
     }
     else if ( type == 3 ) // from left bottom to right top
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
     }
     else // from left top to right bottom
     {
-        target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) );
-        target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) );
+        target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) );
+        target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) );
     }
     target.setAttribute( "svg:x1", xpos1 );
     target.setAttribute( "svg:x2", xpos2 );
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h
index dec5ec4c3..ac3691928 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.h
+++ b/filters/kpresenter/ooimpress/ooimpressexport.h
@@ -37,11 +37,11 @@ public:
     OoImpressExport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressExport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString & from,
+    virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
                                                 const TQCString & to );
 
 private:
-    KoFilter::ConversionStatus openFile();
+    KoFilter::ConversiontqStatus openFile();
 
     void exportBody( TQDomDocument & doccontent, TQDomElement & body );
     void createDocumentMeta( TQDomDocument & docmeta );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index 77e1f38c9..1dab566df 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport()
     m_animations.clear();
 }
 
-KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl;
 
@@ -87,13 +87,13 @@ KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQC
         return KoFilter::FileNotFound;
     }
 
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-    if ( preStatus != KoFilter::OK )
+    if ( pretqStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return preStatus;
+        return pretqStatus;
     }
 
     TQDomDocument docinfo;
@@ -129,9 +129,9 @@ KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQC
 }
 
 // Very related to OoWriterImport::openFile()
-KoFilter::ConversionStatus OoImpressImport::openFile()
+KoFilter::ConversiontqStatus OoImpressImport::openFile()
 {
-    KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content );
+    KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content );
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -150,7 +150,7 @@ KoFilter::ConversionStatus OoImpressImport::openFile()
     return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
@@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::currentDate();
+    TQDate date = TQDate::tqcurrentDate();
 
     TQDomElement image = doc.createElement( "KEY" );
     image.setAttribute( "msec", time.msec() );
@@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::currentDate();
+    TQDate date = TQDate::tqcurrentDate();
 
     TQDomElement image = doc.createElement( "BACKPICTUREKEY" );
     image.setAttribute( "msec", time.msec() );
@@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme
     TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" );
     appendTextObjectMargin( doc, textObjectElement );
 
-    // vertical alignment
+    // vertical tqalignment
     if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) )
     {
-        TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
-        if ( alignment == "top" )
+        TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" );
+        if ( tqalignment == "top" )
             textObjectElement.setAttribute( "verticalAlign", "top" );
-        else if ( alignment == "middle" )
+        else if ( tqalignment == "middle" )
             textObjectElement.setAttribute( "verticalAlign", "center" );
-        else if ( alignment == "bottom" )
+        else if ( tqalignment == "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 alignment
+    // Paragraph tqalignment
     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" ).arg( m_numPicture++ ) + extension;
+    TQString fileName = TQString( "picture%1" ).tqarg( 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" ).arg( m_numSound++ ) + extension;
+    TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension;
     fileName = "sounds/" + fileName;
     KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write );
 
@@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
@@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
@@ -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-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) )
+        if ( ns == ooNS::presentation && localName == "show-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) )
         {
-            TQString name = e.attributeNS( ooNS::draw, "shape-id", TQString() );
+            TQString name = e.attributeNS( ooNS::draw, "tqshape-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:shape-id) :"<<e.attributeNS( ooNS::draw, "shape-id", TQString())<<endl;
-        if (e.tagName()=="presentation:show-shape" && e.attributeNS( ooNS::draw, "shape-id", TQString())==id)
+        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)
                 return e;
     }
 
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h
index b187d189c..596ca703b 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.h
+++ b/filters/kpresenter/ooimpress/ooimpressimport.h
@@ -46,7 +46,7 @@ public:
     OoImpressImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressImport();
 
-    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void createDocumentInfo( TQDomDocument &docinfo );
@@ -96,8 +96,8 @@ private:
     bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement );
     void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text );
 
-    KoFilter::ConversionStatus openFile();
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversiontqStatus openFile();
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
 
     int m_numPicture;
     int m_numSound;
diff --git a/filters/kpresenter/ooimpress/status.html b/filters/kpresenter/ooimpress/status.html
index 8c34c4d17..f64a38b0b 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 alignment for text<br>
+      -Qt::Vertical tqalignment 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 alignment for text<br>
+	  -Qt::Vertical tqalignment 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 e50b652e2..a25ba52aa 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" ).arg( index );
+    m_name = TQString( "Gradient %1" ).tqarg( 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%" ).arg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).tqarg( 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%" ).arg( cx / 4 + 50 );
-                m_cy = TQString( "%1%" ).arg( cy / 4 + 50 );
+                m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 );
+                m_cy = TQString( "%1%" ).tqarg( 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" ).arg( index );
-    m_style = TQString( "Default%1" ).arg( index );
+    m_name = TQString( "PM%1" ).tqarg( index );
+    m_style = TQString( "Default%1" ).tqarg( 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" ).arg( index );
+    m_name = TQString( "dp%1" ).tqarg( 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" ).arg( hours ).arg( ms ).arg( sec );
+        m_page_duration = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( 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" ).arg( index );
+    m_name = TQString( "T%1" ).tqarg( index );
     if ( e.hasAttribute( "family" ) )
         m_font_family = e.attribute( "family" );
     if ( e.hasAttribute( "pointSize" ) )
-        m_font_size = TQString( "%1pt" ).arg( e.attribute( "pointSize" ) );
+        m_font_size = TQString( "%1pt" ).tqarg( 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" ).arg( textObjectElement.attribute( "bleftpt" ) );
+            m_textMarginLeft = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bleftpt" ) );
         }
         if ( textObjectElement.hasAttribute( "bbottompt" ) )
         {
-            m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) );
+            m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) );
         }
         if ( textObjectElement.hasAttribute( "btoppt" ) )
         {
-            m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) );
+            m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) );
         }
         if ( textObjectElement.hasAttribute( "brightpt" ) )
         {
-            m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) );
+            m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) );
         }
 
     }
-    kdDebug(30518)<<" alignment :"<<m_textAlignment<<endl;
+    kdDebug(30518)<<" tqalignment :"<<m_textAlignment<<endl;
 
-    m_name = TQString( "gr%1" ).arg( index );
+    m_name = TQString( "gr%1" ).tqarg( 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" ).arg( index );
+    m_name = TQString( "P%1" ).tqarg( 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" ).arg( s.attribute( "distance" ) );
+        TQString distance = TQString( "%1pt" ).tqarg( 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%" ).arg( l.attribute( "spacingvalue" ).toInt() * 100 );
+            m_line_height = TQString( "%1%" ).tqarg( 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" ).arg( width ).arg( style ).arg( color.name() );
+    return TQString( "%1 %2 %3" ).tqarg( width ).tqarg( style ).tqarg( 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" ).arg( index );
+    m_name = TQString( "L%1" ).tqarg( 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" ).arg( m_min_label_width ) );
+                                     TQString( "%1cm" ).tqarg( m_min_label_width ) );
             properties.setAttribute( "text:space-before",
-                                     TQString( "%1cm" ).arg( m_min_label_width * ( level - 1 ) ) );
+                                     TQString( "%1cm" ).tqarg( 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 31d2b4a1c..4f41aac7e 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -30,7 +30,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport()
   delete d;
 }
 
-KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/mspowerpoint" )
     return KoFilter::NotImplemented; 
@@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles()
   TQByteArray stylesData;
   TQBuffer stylesBuffer( stylesData );
 
-  TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() );
-  TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() );
+  TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() );
+  TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() );
   
   stylesBuffer.open( IO_WriteOnly );
   stylesWriter = new KoXmlWriter( &stylesBuffer );
@@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles()
 
   // office:automatic-styles
   stylesWriter->startElement( "office:automatic-styles" );
-  stylesWriter->startElement( "style:page-layout" );
+  stylesWriter->startElement( "style:page-tqlayout" );
   stylesWriter->addAttribute( "style:name","pm1" );
   stylesWriter->addAttribute( "style:page-usage","all" );
-  stylesWriter->startElement( "style:page-layout-properties" );
+  stylesWriter->startElement( "style:page-tqlayout-properties" );
   stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); 
   stylesWriter->addAttribute( "fo:margin-left","0pt" );   
   stylesWriter->addAttribute( "fo:margin-right","0pt" );  
@@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->addAttribute( "fo:page-height", pageHeight );
   stylesWriter->addAttribute( "fo:page-width", pageWidth );
   stylesWriter->addAttribute( "style:print-orientation","landscape" );
-  stylesWriter->endElement(); // style:page-layout-properties
-  stylesWriter->endElement(); // style:page-layout
+  stylesWriter->endElement(); // style:page-tqlayout-properties
+  stylesWriter->endElement(); // style:page-tqlayout
 
   stylesWriter->startElement( "style:style" );
   stylesWriter->addAttribute( "style:name","dp1" );
@@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles()
   stylesWriter->startElement( "office:master-styles" );
   stylesWriter->startElement( "style:master-page" );
   stylesWriter->addAttribute( "style:name", "Standard" );
-  stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
+  stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
   stylesWriter->addAttribute( "draw:style-name", "dp1" );
   stylesWriter->endElement();
   stylesWriter->endElement();
@@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
   xmlWriter->startElement( "draw:ellipse" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
   xmlWriter->addAttribute( "svg:y", yStr );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); // draw:ellipse
 }
 
@@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
   if( !drawObject ) return;
   if( !xmlWriter ) return;
 
-  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 );
+  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 );
 
   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)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
+     TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
      xmlWriter->addAttribute( "draw:transform", rot );        
   }
   else 
@@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
   }
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); // draw:rect
 }
 
@@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(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)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); 
+        TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); 
         xmlWriter->addAttribute( "draw:transform", rot );                
      } 
      
@@ -463,8 +463,8 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
  // xmlWriter->addAttribute( "svg:x", xStr );
  // xmlWriter->addAttribute( "svg:y", yStr );
   
-  xmlWriter->addAttribute( "draw:layer", "layout" );
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     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-geometry
-  xmlWriter->endElement(); // draw:custom-shape
+    xmlWriter->endElement(); // draw:enhanced-tqgeometry
+  xmlWriter->endElement(); // draw:custom-tqshape
 }
 
 void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   xmlWriter->addAttribute( "draw:style-name", styleName );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
@@ -522,10 +522,10 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
     xmlWriter->addAttribute( "svg:x", 10 );
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     xmlWriter->addAttribute( "draw:type", "diamond");
     xmlWriter->endElement();    
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->endElement(); 
 }
 
@@ -533,20 +533,20 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
   /* draw IsocelesTriangle or RightTriangle */
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
     xmlWriter->startElement( "draw:glue-point" );
     xmlWriter->addAttribute( "svg:x", 5 );
     xmlWriter->addAttribute( "svg:y", 0 );
@@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:y", 5 );
     xmlWriter->endElement();
 
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
        
     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)").arg(rotAngle).arg(xMid).arg(yMid); 
+     TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); 
      xmlWriter->addAttribute( "draw:transform", rot );   
     }
-    if (drawObject->shape() == DrawObject::RightTriangle)
+    if (drawObject->tqshape() == DrawObject::RightTriangle)
     {
     xmlWriter->addAttribute( "draw:type", "right-triangle");
     }
-    else if (drawObject->shape() == DrawObject::IsoscelesTriangle)
+    else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle)
     {    
     xmlWriter->addAttribute( "draw:type", "isosceles-triangle");
           xmlWriter->startElement( "draw:equation" );
@@ -637,27 +637,27 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
           xmlWriter->endElement();    
     }
    
-    xmlWriter->endElement();    // enhanced-geometry  
-  xmlWriter->endElement(); // custom-shape
+    xmlWriter->endElement();    // enhanced-tqgeometry  
+  xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
         if ( drawObject->hasProperty("draw:mirror-vertical") ) 
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -718,27 +718,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
         xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 6.25 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
         if  (drawObject->hasProperty("draw:mirror-vertical"))
         { 
           xmlWriter->addAttribute("draw:mirror-vertical","true");         
@@ -834,27 +834,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "hexagon" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0 " );
@@ -898,27 +898,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   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-geometry
-    xmlWriter->endElement(); // custom-shape  
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape  
 }
 
 void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-  xmlWriter->startElement( "draw:custom-shape" );
+  xmlWriter->startElement( "draw:custom-tqshape" );
   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", "layout" );
-    xmlWriter->startElement( "draw:enhanced-geometry" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
+    xmlWriter->startElement( "draw:enhanced-tqgeometry" );
     
-                if (drawObject->shape() == DrawObject::RightArrow)
+                if (drawObject->tqshape() == DrawObject::RightArrow)
                 xmlWriter->addAttribute( "draw:type", "right-arrow" );
-      else if (drawObject->shape() == DrawObject::LeftArrow)
+      else if (drawObject->tqshape() == DrawObject::LeftArrow)
       xmlWriter->addAttribute( "draw:type", "left-arrow" );
-    else if (drawObject->shape() == DrawObject::UpArrow)
+    else if (drawObject->tqshape() == DrawObject::UpArrow)
       xmlWriter->addAttribute( "draw:type", "up-arrow" );
-    else if (drawObject->shape() == DrawObject::DownArrow)
+    else if (drawObject->tqshape() == 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->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) 
+                if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == 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->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow )
+    else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == 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-geometry  
-    xmlWriter->endElement(); // draw:custom-shape
+      xmlWriter->endElement(); // draw:enhanced-tqgeometry  
+    xmlWriter->endElement(); // draw:custom-tqshape
 }
 
 void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter) return;
 
-  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 );
+  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 );
 
   if ( drawObject->hasProperty("draw:mirror-vertical") )
     { TQString temp = y1Str; 
@@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
   xmlWriter->addAttribute( "svg:y2", y2Str );
   xmlWriter->addAttribute( "svg:x1", x1Str );
   xmlWriter->addAttribute( "svg:x2", x2Str );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
  
  xmlWriter->endElement(); 
 }
@@ -1099,19 +1099,19 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  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 );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -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-geometry" );
+        xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "smiley" );
           xmlWriter->startElement( "draw:equation" );
           xmlWriter->addAttribute( "draw:formula", "$0-15510 " );
@@ -1156,27 +1156,27 @@ 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-geometry
-    xmlWriter->endElement(); // custom-shape
+  xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter )
 {
   if( !drawObject || !xmlWriter ) return;
 
-  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 );
+  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 );
 
-    xmlWriter->startElement( "draw:custom-shape" );
+    xmlWriter->startElement( "draw:custom-tqshape" );
     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", "layout" );
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->startElement( "draw:glue-point" );
   xmlWriter->addAttribute( "svg:x", 5 );
   xmlWriter->addAttribute( "svg:y", 1 );
@@ -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-geometry" );
+  xmlWriter->startElement( "draw:enhanced-tqgeometry" );
   xmlWriter->addAttribute( "draw:type", "heart" );
         
-        xmlWriter->endElement(); // enhanced-geometry
-    xmlWriter->endElement(); // custom-shape
+        xmlWriter->endElement(); // enhanced-tqgeometry
+    xmlWriter->endElement(); // custom-tqshape
 }
 
 void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter)
 {
   if( !drawObject ||!xmlWriter ) return;
 
-  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 );
+  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 );
 
     xmlWriter->startElement( "draw:path" );
     xmlWriter->addAttribute( "draw:style-name", styleName );
@@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
     xmlWriter->addAttribute( "svg:height", heightStr );
     xmlWriter->addAttribute( "svg:x", xStr );
     xmlWriter->addAttribute( "svg:y", yStr );
-    xmlWriter->addAttribute( "draw:layer", "layout" );  
+    xmlWriter->addAttribute( "draw:layer", "tqlayout" );  
     xmlWriter->endElement(); // path
 }
 
@@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm
   drawingObjectCounter++;
   
    
-  if (drawObject->shape() == DrawObject::Ellipse)
+  if (drawObject->tqshape() == DrawObject::Ellipse)
   { 
     processEllipse (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Rectangle)
+  else if (drawObject->tqshape() == DrawObject::Rectangle)
   { 
     processRectangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::RoundRectangle)
+  else if (drawObject->tqshape() == DrawObject::RoundRectangle)
   { 
     processRoundRectangle (drawObject, xmlWriter );
   }
-  else  if (drawObject->shape() == DrawObject::Diamond)
+  else  if (drawObject->tqshape() == DrawObject::Diamond)
   {  
     processDiamond (drawObject, xmlWriter ); 
   } 
-  else  if (drawObject->shape() == DrawObject::IsoscelesTriangle |                
-            drawObject->shape() == DrawObject::RightTriangle)
+  else  if (drawObject->tqshape() == DrawObject::IsoscelesTriangle |                
+            drawObject->tqshape() == DrawObject::RightTriangle)
   {  
     processTriangle (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Trapezoid)
+  else if (drawObject->tqshape() == DrawObject::Trapezoid)
   {  
     processTrapezoid (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Parallelogram)
+  else if (drawObject->tqshape() == DrawObject::Parallelogram)
   {  
     processParallelogram( drawObject, xmlWriter); 
   }
-  else if (drawObject->shape() == DrawObject::Hexagon)
+  else if (drawObject->tqshape() == DrawObject::Hexagon)
   {  
     processHexagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Octagon)
+  else if (drawObject->tqshape() == DrawObject::Octagon)
   {  
     processOctagon ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::RightArrow | 
-     drawObject->shape() == DrawObject::LeftArrow | 
-     drawObject->shape() == DrawObject::UpArrow | 
-     drawObject->shape() == DrawObject::DownArrow )
+  else if (drawObject->tqshape() == DrawObject::RightArrow | 
+     drawObject->tqshape() == DrawObject::LeftArrow | 
+     drawObject->tqshape() == DrawObject::UpArrow | 
+     drawObject->tqshape() == DrawObject::DownArrow )
   { 
     processArrow ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Line)
+  else if (drawObject->tqshape() == DrawObject::Line)
   {  
     processLine ( drawObject, xmlWriter );
   }
-  else if (drawObject->shape() == DrawObject::Smiley)
+  else if (drawObject->tqshape() == DrawObject::Smiley)
   { 
     processSmiley (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::Heart)
+  else if (drawObject->tqshape() == DrawObject::Heart)
   { 
     processHeart (drawObject, xmlWriter ); 
   }
-  else if (drawObject->shape() == DrawObject::FreeLine)
+  else if (drawObject->tqshape() == DrawObject::FreeLine)
   { 
     processFreeLine (drawObject, xmlWriter ); 
   }
@@ -1317,14 +1317,14 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
 //  TQString pStr = string( textObject->text() ).string();
   TQString pStr;
  
-  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() );
+  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() );
 
   xmlWriter->startElement( "draw:frame" );
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
-  xmlWriter->addAttribute( "draw:layer", "layout" );
+  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
   xmlWriter->addAttribute( "svg:width", widthStr );
   xmlWriter->addAttribute( "svg:height", heightStr );
   xmlWriter->addAttribute( "svg:x", xStr );
@@ -1381,15 +1381,15 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
 
   TQString nameStr = Libppt::string( slide->title() ).string();
   if( nameStr.isEmpty() )
-    nameStr = TQString("page%1").arg(slideNo+1);
+    nameStr = TQString("page%1").tqarg(slideNo+1);
 
-  TQString styleNameStr = TQString("dp%1").arg(slideNo+1);
+  TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1);
 
   xmlWriter->startElement( "draw:page" );
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
   xmlWriter->addAttribute( "draw:name", nameStr );
   xmlWriter->addAttribute( "draw:style-name", styleNameStr );
-  xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
+  xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
 
   GroupObject* root = slide->rootObject();
   if( root )
@@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX
   if( !drawObject || !xmlWriter) return;
 
   drawingObjectCounter++;
-  TQString styleName = TQString("gr%1").arg( drawingObjectCounter );
+  TQString styleName = TQString("gr%1").tqarg( 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").arg( strokeWidth ) );
+      xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( 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").arg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( 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").arg( arrowWidth ) );
+      xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( 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%").arg( opacity ) );
+      xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-x" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ;
-      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) );
     }
 
     if( drawObject->hasProperty( "draw:shadow-offset-y" ) )
     {      
       double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); 
-      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) );
+      xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) );
     }
     
    
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h
index 6b75cfb30..ca3e7365d 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.h
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.h
@@ -39,7 +39,7 @@ Q_OBJECT
 public:
   PowerPointImport ( TQObject *parent, const char* name, const TQStringList& );
   virtual ~PowerPointImport();
-  virtual KoFilter::ConversionStatus convert( const TQCString& from, 
+  virtual KoFilter::ConversiontqStatus convert( const TQCString& from, 
         const TQCString& to );
 
 private:
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index 29870cbdc..d0343b43a 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 shape;
+  unsigned tqshape;
   bool isVerFlip; 
   bool isHorFlip;
 };
@@ -387,7 +387,7 @@ public:
 DrawObject::DrawObject()
 {
   d = new Private;
-  d->shape = None;
+  d->tqshape = None;
 }
 
 DrawObject::~DrawObject()
@@ -395,14 +395,14 @@ DrawObject::~DrawObject()
   delete d;
 }
 
-unsigned DrawObject::shape() const
+unsigned DrawObject::tqshape() const
 {
-  return d->shape;
+  return d->tqshape;
 }
 
 void DrawObject::setShape( unsigned s )
 {
-  d->shape = s;
+  d->tqshape = s;
 }
 
 bool DrawObject::isVerFlip() const
diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h
index 823e2a759..a91608974 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 shape
+    Other       = 4,  // text in a tqshape
     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 shape() const;
+  unsigned tqshape() 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 2a78b79fc..b905539d4 100644
--- a/filters/kpresenter/powerpoint/libppt/pole.cpp
+++ b/filters/kpresenter/powerpoint/libppt/pole.cpp
@@ -94,7 +94,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in unicode anymore 
+    std::string name;      // the name, not in tqunicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -115,7 +115,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( 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 children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( 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 children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( 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 children
+       // not found among tqchildren
        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::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( 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> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
   
   return result;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index af035c697..bf3fc51fa 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 shapeId;
+  unsigned long tqshapeId;
   unsigned long persistentFlag;
   bool background;
   bool hFlip; 
@@ -4115,7 +4115,7 @@ public:
 msofbtSpAtom ::msofbtSpAtom ()
 {
   d = new Private;
-  d->shapeId = 0;
+  d->tqshapeId = 0;
   d->persistentFlag = 0;
   d->background = false;
   d->hFlip = false; 
@@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom ()
   delete d;
 }
 
-unsigned long msofbtSpAtom::shapeId() const
+unsigned long msofbtSpAtom::tqshapeId() const
 {
-  return d->shapeId;
+  return d->tqshapeId;
 }
 
 void msofbtSpAtom::setShapeId( unsigned long id )
 {
-  d->shapeId = id;
+  d->tqshapeId = id;
 }
 
-const char* msofbtSpAtom::shapeTypeAsString() const
+const char* msofbtSpAtom::tqshapeTypeAsString() const
 {
   switch( instance() )
   {
@@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom )
 
   // set rect bound of current group
 
-  // this is shape for the group, no need to 
+  // this is tqshape 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 b2a0f6490..6eec1564e 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -1901,9 +1901,9 @@ public:
   msofbtSpAtom ();
   ~msofbtSpAtom ();
 
-  unsigned long shapeId() const;
+  unsigned long tqshapeId() const;
   void setShapeId( unsigned long id );
-  const char* shapeTypeAsString() const;
+  const char* tqshapeTypeAsString() 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 shape
+   FillPicture,           // Center a picture in the tqshape
    FillShade,             // Shade from start to end points
    FillShadeCenter,       // Shade from bounding rectangle to end point
-   FillShadeShape,        // Shade from shape outline to end point
+   FillShadeShape,        // Shade from tqshape 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 );// alignment
+  void setAlign( int align );// tqalignment
   int cProxies() const;
-  void setCProxies( int cProxies );// number of shapes governed by rule
+  void setCProxies( int cProxies );// number of tqshapes governed by rule
     
   void setData( unsigned size, const unsigned char* data );
   const char* name(){ return "msofbtAlignRuleAtom "; }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index b0a44e562..23b61d30a 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.cpp
+++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp
@@ -216,13 +216,13 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
+    : uc( c.tqunicode() )
 {
 }
 
 UChar UChar::toLower() const
 {
-  // ### properly support unicode tolower
+  // ### properly support tqunicode tolower
   if (uc >= 256 || islower(uc))
     return *this;
 
@@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->tqunicode() < c2->tqunicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h
index 52a43afe2..c0e34cf4b 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -71,7 +71,7 @@ namespace Libppt {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short unicode() const { return uc; }
+    unsigned short tqunicode() const { return uc; }
   public:
     /**
      * @return The character converted to lower case.
@@ -128,7 +128,7 @@ namespace Libppt {
     /**
      * @return Unicode value.
      */
-    unsigned short unicode() const { return ref().unicode(); }
+    unsigned short tqunicode() const { return ref().tqunicode(); }
     /**
      * @return Lower byte.
      */
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 9eae5cd8e..990d12cd1 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -48,7 +48,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h
index 17e3d79ff..eafdd792b 100644
--- a/filters/kpresenter/svg/svgexport.h
+++ b/filters/kpresenter/svg/svgexport.h
@@ -32,7 +32,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index 5b88d11c1..a75cccacc 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -55,7 +55,7 @@ TQString APPLIXSPREADImport::nextLine( TQTextStream & stream )
     return s;
 }
 
-KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to != "application/x-kspread" || from != "application/x-applixspread")
@@ -390,7 +390,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               //kdDebug()<< "   Type (%2d)   >%s< ",
               //    nn, (*it).latin1() );
             nn++;
-            // Grep horizontal alignment
+            // Grep horizontal tqalignment
             if      ( (*it) == "1")
             {
                 kdDebug()<< " = left align\n";
@@ -407,7 +407,7 @@ KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, c
               align = 2; // center
 	    }
 
-            // Grep verticale alignment
+            // Grep verticale tqalignment
             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>").arg(mystr.latin1()),
+                       "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
 			"Okay");
 
 
diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h
index 15decadc6..78deb2ca6 100644
--- a/filters/kspread/applixspread/applixspreadimport.h
+++ b/filters/kspread/applixspread/applixspreadimport.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqptrlist.h>
 
 #include <KoFilter.h>
@@ -57,7 +57,7 @@ public:
     APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~APPLIXSPREADImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQString nextLine           (TQTextStream &);
diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html
index c944ef5c0..968bf333e 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 alignment, bold, italic, underline<br>
+       - converts fontsize, fontcolor, horizontal and vertical tqalignment, 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 alignment format for vertical, horizontal alignment<BR>
+         <spacer size="30">This is the tqalignment format for vertical, horizontal tqalignment<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 alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>left</TD>
           </TR>
           <TR>
            <TD>6.1.1.2&nbsp;&nbsp;</TD>
            <TD><B>2</B></TD>
-           <TD>horizontal alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>right</TD>
           </TR>
           <TR>
            <TD>6.1.1.3&nbsp;&nbsp;</TD>
            <TD><B>3</B></TD>
-           <TD>horizontal alignment</TD>
+           <TD>horizontal tqalignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.4&nbsp;&nbsp;</TD>
            <TD><B>VT</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</TD>
            <TD>top</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VC</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</TD>
            <TD>center</TD>
           </TR>
           <TR>
            <TD>6.1.1.5&nbsp;&nbsp;</TD>
            <TD><B>VB</B></TD>
-           <TD>vertical alignment</TD>
+           <TD>vertical tqalignment</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 alignment format for the text<BR>
+         <spacer size="30">This is the tqalignment 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 alignment format for the text<BR>
+         <spacer size="30">This is the tqalignment 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 3ea3f967b..17e9cc65a 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -27,11 +27,11 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
     kapp->restoreOverrideCursor();
     
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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.arg("Apple Roman"); // Apple
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
 
     fillTable();
 
-    //resize(sizeHint());
+    //resize(tqsizeHint());
     resize( 600, 400 ); // Try to show as much as possible of the table view
     setMainWidget(m_dialog);
 
@@ -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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index b37d1c8f0..9961d2182 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -21,7 +21,7 @@
 #include <csvexport.h>
 
 #include <tqfile.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -118,7 +118,7 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row,
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus CSVExport::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to )
 {
   kdDebug(30501) << "CSVExport::convert" << endl;
   KoDocument* document = m_chain->inputDocument();
diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h
index ebc8a861f..decdb81cf 100644
--- a/filters/kspread/csv/csvexport.h
+++ b/filters/kspread/csv/csvexport.h
@@ -38,7 +38,7 @@ class CSVExport : public KoFilter
   CSVExport(KoFilter * parent, const char * name, const TQStringList &);
   virtual ~CSVExport() {}
 
-  virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to );
+  virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to );
 
   private:
   TQString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, TQChar const & textQuote, TQChar delimiter );
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index e0a4db8cf..a4ef13472 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -33,9 +33,9 @@
 #include <tqlistview.h>
 #include <tqptrlist.h>
 #include <tqradiobutton.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtabwidget.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvalidator.h>
 
 #include <kapplication.h>
@@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
   kapp->restoreOverrideCursor();
 
   TQStringList encodings;
-  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+  encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+  encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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.arg("Apple Roman"); // Apple
-  encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-  encodings << description.arg("CP 1258"); // Windows
+  encodings << description.tqarg("Apple Roman"); // Apple
+  encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+  encodings << description.tqarg("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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index e9852c61f..cd93017b9 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -57,7 +57,7 @@ CSVFilter::CSVFilter(KoFilter *, const char*, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus CSVFilter::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to )
 {
     TQString file( m_chain->inputFile() );
     KoDocument* document = m_chain->outputDocument();
diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h
index c68ecffb1..df14a7564 100644
--- a/filters/kspread/csv/csvimport.h
+++ b/filters/kspread/csv/csvimport.h
@@ -31,6 +31,6 @@ public:
     CSVFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~CSVFilter() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // CSVFILTER_H
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index f8960f4b7..8c3a72cfa 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -66,7 +66,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -104,7 +104,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -123,7 +123,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>60</height>
@@ -223,7 +223,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -313,7 +313,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -330,7 +330,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>51</width>
                                 <height>21</height>
@@ -379,7 +379,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -428,7 +428,7 @@
                                 <property name="textFormat">
                                     <enum>AutoText</enum>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -472,7 +472,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -489,7 +489,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>468</width>
                                         <height>20</height>
@@ -506,7 +506,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>611</width>
                                         <height>20</height>
@@ -523,7 +523,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>71</width>
                                         <height>20</height>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index f6a552e12..45eb69144 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -47,7 +47,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -85,7 +85,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>96</height>
@@ -254,7 +254,7 @@
                                 <property name="text">
                                     <string>&lt;SHEETNAME&gt; gets replaced by the name of the next sheet.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -375,7 +375,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>32767</height>
@@ -469,7 +469,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>81</height>
diff --git a/filters/kspread/csv/xmltree.h b/filters/kspread/csv/xmltree.h
index 1eede0dc3..247af4e5e 100644
--- a/filters/kspread/csv/xmltree.h
+++ b/filters/kspread/csv/xmltree.h
@@ -22,7 +22,7 @@
 
 #include <tqdom.h>
 #include <tqmemarray.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 class XMLTree
 {
diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp
index 2c8ba3b87..acc1e27d6 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.device()->at( m_headerLength );
+  m_stream.tqdevice()->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.device()->at( filepos );
+  m_stream.tqdevice()->at( filepos );
 
   // first char == '*' means the record is deleted
   // so we just skip it
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index 6121baaff..bcbc98b8b 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cc
@@ -48,7 +48,7 @@ DBaseImport::DBaseImport ( TQObject*, const char*, const TQStringList& )
 {
 }
 
-KoFilter::ConversionStatus DBaseImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to )
 {
   if (to != "application/x-kspread" || from != "application/x-dbase")
     return KoFilter::NotImplemented;
diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h
index 293bda212..39a0ac0e9 100644
--- a/filters/kspread/dbase/dbaseimport.h
+++ b/filters/kspread/dbase/dbaseimport.h
@@ -33,7 +33,7 @@ public:
     DBaseImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~DBaseImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __DBASEIMPORT_H
diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc
index 0ecf41f7b..2e2c50e7d 100644
--- a/filters/kspread/excel/excelexport.cc
+++ b/filters/kspread/excel/excelexport.cc
@@ -13,7 +13,7 @@ ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilt
 }
 
 
-KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
+KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
 	// Double check that's we really what we want to do
 	if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") {
 		kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl;
@@ -28,37 +28,37 @@ KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQC
 
 
 /*
-KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 */
diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h
index e4b6b499e..029cdac15 100644
--- a/filters/kspread/excel/excelexport.h
+++ b/filters/kspread/excel/excelexport.h
@@ -16,20 +16,20 @@ public:
 	ExcelExport(KoFilter *parent, const char*name, const TQStringList&);
 	virtual ~ExcelExport() {}
 
-	virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 
 class ExcelWorker : public KSpreadBaseWorker {
 public:
 	// Implement those
-	//KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property);
 };
 
 #endif
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index 75ee412af..f1bade9e8 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -33,7 +33,7 @@
 #include <tqfile.h>
 #include <tqmap.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -107,7 +107,7 @@ ExcelImport::~ExcelImport()
   delete d;
 }
 
-KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/msexcel" )
     return KoFilter::NotImplemented; 
@@ -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").arg(sheetFormatIndex));
+  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(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").arg(sheetFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(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").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(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").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) );  
   columnFormatIndex++;
   
   xmlWriter->startElement( "style:table-column-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) );
+  xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(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").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(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").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) );  
   rowFormatIndex++;
   
   xmlWriter->startElement( "style:table-row-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) );
+  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(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").arg(cell->formatIndex());
+      refName = TQString("N%1").tqarg(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").arg( cell->formatIndex() ) );  
+    xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( 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->alignment();
+  const FormatAlignment& align = format->tqalignment();
   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").arg(font.fontSize()) );  
+    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) );  
     
     xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) );
     
diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h
index 84729b4dd..5b7337330 100644
--- a/filters/kspread/excel/import/excelimport.h
+++ b/filters/kspread/excel/import/excelimport.h
@@ -35,7 +35,7 @@ public:
     ExcelImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~ExcelImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
   class Private;
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 2a3a62476..8155bca54 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
 class EString::Private
 {
 public:
-  bool unicode;
+  bool tqunicode;
   bool richText;
   UString str;
   unsigned size;
@@ -194,7 +194,7 @@ public:
 EString::EString()
 {
   d = new EString::Private();
-  d->unicode  = false;
+  d->tqunicode  = false;
   d->richText = false;
   d->str      = UString::null;
   d->size     = 0;
@@ -208,7 +208,7 @@ EString::EString( const EString& es )
 
 EString& EString::operator=( const EString& es )
 {
-  d->unicode  = es.d->unicode;
+  d->tqunicode  = es.d->tqunicode;
   d->richText = es.d->richText;
   d->size     = es.d->size;
   d->str      = es.d->str;
@@ -220,14 +220,14 @@ EString::~EString()
   delete d;
 }
 
-bool EString::unicode() const
+bool EString::tqunicode() const
 {
-  return d->unicode;
+  return d->tqunicode;
 }
 
 void EString::setUnicode( bool u )
 {
-  d->unicode = u;
+  d->tqunicode = u;
 }
 
 bool EString::richText() const
@@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   unsigned char flag = data[ offset ];
   offset++; // for flag (1 byte)
   
-  bool unicode = flag & 0x01;
+  bool tqunicode = flag & 0x01;
   bool richText = flag & 0x08;
   unsigned formatRuns = 0;
   
@@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   
   // find out total bytes used in this string
   unsigned size = offset + len; // string data
-  if( unicode ) size += len; // because unicode takes 2-bytes char
+  if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
   if( richText ) size += (formatRuns*4);
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( size );
   result.setStr( str );
@@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   
   unsigned len = data[0];
   unsigned flag = data[1];
-  bool unicode = flag & 1;
+  bool tqunicode = flag & 1;
   
   if( len > datasize-2 ) len = datasize-2;
   if( len == 0 ) return EString();
   
   unsigned offset = 2;
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( datasize );
   result.setStr( str );
@@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
   d->visibility = data[4];
   d->type = data[5];
   
-  /* FIXME: it turned out that sheet name is not normal unicode string
+  /* FIXME: it turned out that sheet name is not normal tqunicode string
      where the first two bytes specifies string length, but instead
      only the first specifies it.
      the next byte could be correctly interpreted as flag.
@@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       
     format.setFont( convertFont( xf.fontIndex() ) );
     
-    FormatAlignment alignment;
+    FormatAlignment tqalignment;
     switch( xf.horizontalAlignment() )
     {
       case XFRecord::Left:     
-        alignment.setAlignX( Format::Left ); break;
+        tqalignment.setAlignX( Format::Left ); break;
       case XFRecord::Right:    
-        alignment.setAlignX( Format::Right ); break;
+        tqalignment.setAlignX( Format::Right ); break;
       case XFRecord::Centered: 
-        alignment.setAlignX( Format::Center ); break;
+        tqalignment.setAlignX( Format::Center ); break;
       default: break;
       // FIXME still unsupported: Repeat, Justified, Filled, Distributed
     };
     switch( xf.verticalAlignment() )
     {
       case XFRecord::Top:
-        alignment.setAlignY( Format::Top ); break;
+        tqalignment.setAlignY( Format::Top ); break;
       case XFRecord::VCentered:
-        alignment.setAlignY( Format::Middle ); break;
+        tqalignment.setAlignY( Format::Middle ); break;
       case XFRecord::Bottom:
-        alignment.setAlignY( Format::Bottom ); break;
+        tqalignment.setAlignY( Format::Bottom ); break;
       default: break;
       // FIXME still unsupported: Justified, Distributed
     }
-    alignment.setWrap( xf.textWrap() );
-    format.setAlignment( alignment );
+    tqalignment.setWrap( xf.textWrap() );
+    format.tqsetAlignment( tqalignment );
   
     FormatBorders borders;
       
@@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     
   format.setFont( convertFont( xf.fontIndex() ) );
   
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   switch( xf.horizontalAlignment() )
   {
     case XFRecord::Left:     
-      alignment.setAlignX( Format::Left ); break;
+      tqalignment.setAlignX( Format::Left ); break;
     case XFRecord::Right:    
-      alignment.setAlignX( Format::Right ); break;
+      tqalignment.setAlignX( Format::Right ); break;
     case XFRecord::Centered: 
-      alignment.setAlignX( Format::Center ); break;
+      tqalignment.setAlignX( Format::Center ); break;
     default: break;
     // FIXME still unsupported: Repeat, Justified, Filled, Distributed
   };
   switch( xf.verticalAlignment() )
   {
     case XFRecord::Top:
-      alignment.setAlignY( Format::Top ); break;
+      tqalignment.setAlignY( Format::Top ); break;
     case XFRecord::VCentered:
-      alignment.setAlignY( Format::Middle ); break;
+      tqalignment.setAlignY( Format::Middle ); break;
     case XFRecord::Bottom:
-      alignment.setAlignY( Format::Bottom ); break;
+      tqalignment.setAlignY( Format::Bottom ); break;
     default: break;
     // FIXME still unsupported: Justified, Distributed
   }
-  alignment.setWrap( xf.textWrap() );
-  format.setAlignment( alignment );
+  tqalignment.setWrap( xf.textWrap() );
+  format.tqsetAlignment( tqalignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 5221b518c..8cbdfd538 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
 
 class Record;
 
-// rich-text, unicode, far-east support Excel string
+// rich-text, tqunicode, far-east support Excel string
 
 class EString
 {
@@ -50,7 +50,7 @@ public:
   
   ~EString();
   
-  bool unicode() const;
+  bool tqunicode() const;
   
   void setUnicode( bool u );
   
@@ -2805,17 +2805,17 @@ public:
     Distributed };
   
   /**
-   * Gets the horizontal alignment, e.g Left.
+   * Gets the horizontal tqalignment, e.g Left.
    */
   unsigned horizontalAlignment() const;
   
   /**
-   * Sets the horizontal alignment, e.g Left.
+   * Sets the horizontal tqalignment, e.g Left.
    */
   void setHorizontalAlignment( unsigned ha );
   
   /**
-   * Returns human-readable string representation of the horizontal alignment.
+   * Returns human-readable string representation of the horizontal tqalignment.
      For example, XFRecord::Left will return "Left".
    */
   const char* horizontalAlignmentAsString() const; 
@@ -2828,21 +2828,21 @@ public:
     VDistributed = 4 };
   
   /**
-   * Gets the vertical alignment, e.g Bottom.
+   * Gets the vertical tqalignment, e.g Bottom.
    *
    * \sa setVerticalAlignment
    */
   unsigned verticalAlignment() const;
   
   /**
-   * Sets the vertical alignment, e.g Top.
+   * Sets the vertical tqalignment, e.g Top.
    *
    * \sa verticalAlignment
    */
   void setVerticalAlignment( unsigned va );
   
   /**
-   * Returns human-readable string representation of the vertical alignment.
+   * Returns human-readable string representation of the vertical tqalignment.
      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 8ce69f248..29481fd00 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 alignment
+// assign from another tqalignment
 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 alignment
+// assign from another tqalignment
 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 alignment
+// assign from another tqalignment
 FormatBorders& FormatBorders::assign( const FormatBorders& border )
 {
   d->null         = border.isNull();
@@ -581,7 +581,7 @@ class Format::Private
 {
 public:
   FormatFont font;
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   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->alignment = f.alignment();
+  d->tqalignment = f.tqalignment();
   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->alignment.isNull() && d->borders.isNull();
+  return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull();
 }
 
 FormatFont& Format::font() const
@@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font )
   d->font = font;
 }
 
-FormatAlignment& Format::alignment() const
+FormatAlignment& Format::tqalignment() const
 {
-  return d->alignment;
+  return d->tqalignment;
 }
 
-void Format::setAlignment( const FormatAlignment& alignment )
+void Format::tqsetAlignment( const FormatAlignment& tqalignment )
 {
-  d->alignment = alignment;
+  d->tqalignment = tqalignment;
 }
 
 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.alignment().isNull() )
-    alignment() = f.alignment();
+  if( !f.tqalignment().isNull() )
+    tqalignment() = f.tqalignment();
   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->alignment == format.d->alignment &&
+    d->tqalignment == format.d->tqalignment &&
     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->alignment != format.d->alignment ||
+    d->tqalignment != format.d->tqalignment ||
     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 acb566a51..dcadc1c2e 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -266,9 +266,9 @@ private:
 
 
 /**
- * Defines alignment information for cell format.
+ * Defines tqalignment information for cell format.
  *
- * Class FormatAlignment defines the horizontal and vertical alignment
+ * Class FormatAlignment defines the horizontal and vertical tqalignment
  * for the text inside a cell.
  * 
  */
@@ -278,37 +278,37 @@ class FormatAlignment
 public:
 
   /**
-   * Creates a default alignment information.
+   * Creates a default tqalignment information.
    */
   FormatAlignment();
   
   /**
-   * Destroys the alignment information
+   * Destroys the tqalignment information
    */
   ~FormatAlignment();
   
   /**
-   * Creates a copy of alignment information.
+   * Creates a copy of tqalignment information.
    */
   FormatAlignment( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
   
   /**
-   * Returns true if it is a default alignment information.
+   * Returns true if it is a default tqalignment information.
    */
   bool isNull() const;
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
    *
    * \sa setAlignX
@@ -316,14 +316,14 @@ public:
   unsigned alignX() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
@@ -331,7 +331,7 @@ public:
   unsigned alignY() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignY
    */
@@ -380,12 +380,12 @@ public:
    void setRotationAngle( unsigned r );
        
   /**
-   * Returns true if this alignment is equal to f; otherwise returns false.
+   * Returns true if this tqalignment is equal to f; otherwise returns false.
    */
   bool operator==(const FormatAlignment& f) const;
 
   /**
-   * Returns true if this alignment is not equal to f; otherwise returns false.
+   * Returns true if this tqalignment 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 alignment information of this format.
+   * Returns a constant reference to the tqalignment information of this format.
    */
-  FormatAlignment& alignment() const;
+  FormatAlignment& tqalignment() const;
   
   /** 
-   * Sets new alignment information for this format.
+   * Sets new tqalignment information for this format.
    */
-  void setAlignment( const FormatAlignment& alignment );
+  void tqsetAlignment( const FormatAlignment& tqalignment );
   
   /** 
    * 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 e4090cd90..38fe8cb55 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -95,7 +95,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in unicode anymore
+    std::string name;      // the name, not in tqunicode anymore
     bool dir;              // true if directory
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -116,7 +116,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( 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 children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( 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 children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( 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 children
+       // not found among tqchildren
        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::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( 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> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
 
   return result;
diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp
index 304fed18d..b26ee1969 100644
--- a/filters/kspread/excel/sidewinder/ustring.cpp
+++ b/filters/kspread/excel/sidewinder/ustring.cpp
@@ -39,7 +39,7 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
+    : uc( c.tqunicode() )
 {
 }
 
@@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->tqunicode() < c2->tqunicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h
index 3f41867b4..1c4f2bc53 100644
--- a/filters/kspread/excel/sidewinder/ustring.h
+++ b/filters/kspread/excel/sidewinder/ustring.h
@@ -68,7 +68,7 @@ namespace Swinder {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short unicode() const { return uc; }
+    unsigned short tqunicode() const { return uc; }
   public:
     /**
      * A static instance of UChar(0).
@@ -120,7 +120,7 @@ namespace Swinder {
     /**
      * @return Unicode value.
      */
-    unsigned short unicode() const { return ref().uc; }
+    unsigned short tqunicode() const { return ref().uc; }
     /**
      * @return Lower byte.
      */
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index 7150f7e45..049490838 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_alignment"/>
-        <xsd:attribute name="VAlign"       type="gmr:vertical_alignment"  />
+        <xsd:attribute name="HAlign"       type="gmr:horizontal_tqalignment"/>
+        <xsd:attribute name="VAlign"       type="gmr:vertical_tqalignment"  />
         <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_alignment">
+    <xsd:simpleType name="horizontal_tqalignment">
         <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_alignment">
+    <xsd:simpleType name="vertical_tqalignment">
         <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 shape attributes are only used if the type is
+                    <!-- the arrow tqshape 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 f7416cc70..cccfcc9fc 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -31,7 +31,7 @@
 #include <tqptrlist.h>
 #include <tqsortedlist.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kspread_map.h>
 #include <kspread_sheet.h>
@@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc)
 
 TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow)
 {
-    TQColorGroup defaultColorGroup = TQApplication::palette().active();
+    TQColorGroup defaultColorGroup = TQApplication::tqpalette().active();
 
 	TQDomElement cell_style;
 
@@ -938,7 +938,7 @@ void GNUMERICExport::addSummaryItem(TQDomDocument gnumeric_doc, TQDomElement sum
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to )
 {
     kdDebug(30521) << "Exporting GNUmeric" << endl;
 
@@ -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" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow );
+                        TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow );
 
                         cellComment.setAttribute("ObjectBound", sCell );
                         objects.appendChild(cellComment);
diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h
index 0b2b03243..392f0f723 100644
--- a/filters/kspread/gnumeric/gnumericexport.h
+++ b/filters/kspread/gnumeric/gnumericexport.h
@@ -37,7 +37,7 @@ public:
     GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&);
     virtual ~GNUMERICExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     TQDomElement GetCellStyle(TQDomDocument gnumeric_doc, KSpread::Cell* cell, int currentcolumn, int currentrow);
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index b0833e87e..249258b3d 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -1822,7 +1822,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table)
   */
 
 
-KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to )
+KoFilter::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to )
 {
     dateInit();
     bool bSuccess=true;
diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h
index c449a5997..b7fbd4bd1 100644
--- a/filters/kspread/gnumeric/gnumericimport.h
+++ b/filters/kspread/gnumeric/gnumericimport.h
@@ -39,7 +39,7 @@ class GNUMERICFilter : public KoFilter
     GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~GNUMERICFilter() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal};
  private:
diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html
index a25cdf4b6..7bd198cc7 100644
--- a/filters/kspread/gnumeric/status.html
+++ b/filters/kspread/gnumeric/status.html
@@ -211,7 +211,7 @@ Bold
 <br>Cell Size:Qt::Horizontal &amp;Qt::Vertical
 <br>Hidden columns/rows&nbsp;
 <br>Selected Tab
-<br>Paper layout
+<br>Paper tqlayout
 <br>area name
 <br>Cell comment
 <br>Text Rotation
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index aa9366bff..72dd68755 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -22,7 +22,7 @@
 #include <tqlistbox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kglobal.h>
@@ -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)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) );
+  m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) );
 
   m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly );
 
diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui
index 1b6ad59b5..df5dcc902 100644
--- a/filters/kspread/html/exportwidget.ui
+++ b/filters/kspread/html/exportwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -124,7 +124,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>330</width>
                                     <height>20</height>
@@ -222,7 +222,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -271,7 +271,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -292,7 +292,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index 93991ad05..54711d8d6 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -23,7 +23,7 @@
 #include <exportdialog.h>
 
 #include <tqfile.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -76,7 +76,7 @@ const TQString strGt  ("&gt;");
 
 // The reason why we use the KoDocument* approach and not the TQDomDocument
 // approach is because we don't want to export formulas but values !
-KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="text/html" || from!="application/x-kspread")
     {
@@ -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").arg( m_dialog->encoding()->mimeName() );
+  str += TQString("content=\"text/html; charset=%1\">\n").tqarg( 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").arg(
+  str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").tqarg(
       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.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) +
-           TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr");
+    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");
 
     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\" ").arg(text.isRightToLeft()?"rtl":"ltr");
+                line += TQString(" dir=\"%1\" ").tqarg(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/html/htmlexport.h b/filters/kspread/html/htmlexport.h
index c7007157b..09f904d38 100644
--- a/filters/kspread/html/htmlexport.h
+++ b/filters/kspread/html/htmlexport.h
@@ -39,7 +39,7 @@ public:
     HTMLExport(KoFilter *parent, const char*name, const TQStringList&);
     virtual ~HTMLExport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
   private:
     /** Writes the top of the page in HTML to @par str */
     void openPage( KSpread::Sheet *sheet,KoDocument *document, TQString &str);
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index ac7259820..15e8ee2ab 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport()
 
 //=============================================================================
 
-KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to )
 {
     TQPtrList<TQListViewItem> objects;
     TQString file( m_chain->inputFile() );
diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h
index 4de3e7045..aec658899 100644
--- a/filters/kspread/kexi/kspread_kexiimport.h
+++ b/filters/kspread/kexi/kspread_kexiimport.h
@@ -76,7 +76,7 @@ class KSpreadKexiImport : public KoFilter
      */
       virtual ~KSpreadKexiImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
     
     private:
         KSpread::Doc *ksdoc;
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index f99b76a3f..9ddf240ff 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -35,7 +35,7 @@
 #include <klistview.h>
 #include <kcombobox.h>
 #include <tqradiobutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 
diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
index fad0e0be6..d9d28d559 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
+++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
@@ -35,7 +35,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>tqlayout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -110,7 +110,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout8</cstring>
+                    <cstring>tqlayout8</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -180,7 +180,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -196,7 +196,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>145</width>
                             <height>0</height>
diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h
index 969d021df..6e35bd1c1 100644
--- a/filters/kspread/latex/export/config.h
+++ b/filters/kspread/latex/export/config.h
@@ -22,7 +22,7 @@
 #ifndef __LATEX_CONFIG_H__
 #define __LATEX_CONFIG_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 
 /***********************************************************************/
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "unicode"); }
-		bool mustUseLatin1() const { return (_encoding != "unicode"); }
+		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
+		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kspread/latex/export/document.h b/filters/kspread/latex/export/document.h
index 733310bc8..b8f0296c3 100644
--- a/filters/kspread/latex/export/document.h
+++ b/filters/kspread/latex/export/document.h
@@ -24,7 +24,7 @@
 #define __KSPREAD_LATEX_DOCUMENT_H__
 
 #include <tqfile.h>			/* for TQFile class */
-#include <textstream.h>	/* for TQTextStream class */
+#include <tqtextstream.h>	/* for TQTextStream class */
 #include <tqstring.h>		/* for TQString class */
 
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc
index 07b1fbe4e..8ee9eee0e 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 children markups --> PAPERBORDERS
+	// Analyse tqchildren 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]{geometry}" << endl;
+		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kspread/latex/export/fileheader.h b/filters/kspread/latex/export/fileheader.h
index 1d9b60250..5c4e77748 100644
--- a/filters/kspread/latex/export/fileheader.h
+++ b/filters/kspread/latex/export/fileheader.h
@@ -22,7 +22,7 @@
 #ifndef __KSPREAD_LATEX_FILEHEADER_H__
 #define __KSPREAD_LATEX_FILEHEADER_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "xmlparser.h"
 
diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h
index 9b03a258d..7025c3712 100644
--- a/filters/kspread/latex/export/format.h
+++ b/filters/kspread/latex/export/format.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_FORMAT_H__
 #define __KSPREAD_LATEX_FORMAT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/formula.h b/filters/kspread/latex/export/formula.h
index b023cdf67..03ba4bd68 100644
--- a/filters/kspread/latex/export/formula.h
+++ b/filters/kspread/latex/export/formula.h
@@ -25,7 +25,7 @@
 
 #include "element.h"
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 /***********************************************************************/
 /* Class: Formula                                                      */
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 7a0585500..a7f03f60a 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").arg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("unicode");
+	encodingComboBox->insertItem("tqunicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index c1cdd389d..66927728e 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "kspreadlatexexportdiaImpl.h"
 
 typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
@@ -35,7 +35,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h
index 4d34e0f05..e7c0312be 100644
--- a/filters/kspread/latex/export/latexexport.h
+++ b/filters/kspread/latex/export/latexexport.h
@@ -21,7 +21,7 @@
 #define __LATEXEXPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXExport : public KoFilter
 		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXExport_H__ */
diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 741a9c7ea..8c3835edf 100644
--- a/filters/kspread/latex/export/latexexportdia.ui
+++ b/filters/kspread/latex/export/latexexportdia.ui
@@ -593,7 +593,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc
index 886f6c115..a2256d5ec 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 children markups */
+	/* Analyse of the tqchildren markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		// Only tables
diff --git a/filters/kspread/latex/export/pen.h b/filters/kspread/latex/export/pen.h
index 547922055..49da17e0e 100644
--- a/filters/kspread/latex/export/pen.h
+++ b/filters/kspread/latex/export/pen.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_PEN_H__
 #define __KSPREAD_LATEX_PEN_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/spreadsheet.h b/filters/kspread/latex/export/spreadsheet.h
index dfc2f092c..039841059 100644
--- a/filters/kspread/latex/export/spreadsheet.h
+++ b/filters/kspread/latex/export/spreadsheet.h
@@ -23,7 +23,7 @@
 #define __KSPREAD_LATEX_SPREADSHEET_H__
 
 #include <tqptrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "map.h"
 #include "config.h"
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc
index fb2c8e1f2..6b85f243c 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 children = balise.toElement().elementsByTagName(name);
-		if ( children.count() )
-			return children.item(index);
+		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
+		if ( tqchildren.count() )
+			return tqchildren.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList children = balise.childNodes();
-	if ( children.count() )
-		return children.item(index);
+	TQDomNodeList tqchildren = balise.childNodes();
+	if ( tqchildren.count() )
+		return tqchildren.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
index cc7b2b462..ba56c2294 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
@@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() {
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startDocument: " << it.key() << "->" << it.data() << endl;
@@ -40,7 +40,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterPropert
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoLog: " << it.key() << "->" << it.data() << endl;
@@ -49,7 +49,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoAuthor: " << it.key() << "->" << it.data() << endl;
@@ -58,7 +58,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPrope
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startInfoAbout: " << it.key() << "->" << it.data() << endl;
@@ -67,7 +67,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProper
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadBook: " << it.key() << "->" << it.data() << endl;
@@ -76,7 +76,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPrope
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadSheet: " << it.key() << "->" << it.data() << endl;
@@ -85,7 +85,7 @@ KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProp
 }
 
 
-KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) {
 	KSpreadFilterProperty::Iterator it;
 	for (it = property.begin(); it != property.end(); ++it) {
 		kdDebug(30508) << "startSpreadCell: " << it.key() << "->" << it.data() << endl;
diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
index 13b3d380e..4ba82383e 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h
@@ -33,13 +33,13 @@ public:
 	KSpreadBaseWorker();
 	virtual ~KSpreadBaseWorker();
 
-	virtual KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property);
-	virtual KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property);
+	virtual KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property);
 };
 
 #endif /* KSPREAD_BASE_WORKER_H */
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc
index b1b9a0aa3..9ba2d8743 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.cc
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc
@@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) {
 }
 
 
-KoFilter::ConversionStatus Leader::convert() {
-	KoFilter::ConversionStatus status;
+KoFilter::ConversiontqStatus Leader::convert() {
+	KoFilter::ConversiontqStatus status;
 
 	// Validate the filter chain and the worker
 	if (!m_filterChain) {
@@ -122,8 +122,8 @@ KoFilter::ConversionStatus Leader::convert() {
 }
 
 
-KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) {
-	KoFilter::ConversionStatus status;
+KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) {
+	KoFilter::ConversiontqStatus status;
 
 #if 0 // this was never used, it's been removed now
 	// Gather data about the document log
@@ -164,7 +164,7 @@ KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
+KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) {
 	KSpreadFilterProperty docSpreadBookProperty;
 	docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count());
 	docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol();
@@ -216,7 +216,7 @@ KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
+KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 	KSpreadFilterProperty docSpreadSheetProperty;
 	docSpreadSheetProperty["name"] = spreadSheet->tableName();
 	docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX());
@@ -257,7 +257,7 @@ KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) {
 }
 
 
-KoFilter::ConversionStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) {
+KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) {
 	KSpreadFilterProperty docSpreadCellProperty;
 	docSpreadCellProperty["column"] = TQString::number(column);
 	docSpreadCellProperty["row"] = TQString::number(row);
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.h b/filters/kspread/libkspreadexport/KSpreadLeader.h
index eee950b92..7e9abfede 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.h
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.h
@@ -78,10 +78,10 @@ private:
 
 protected:
 	KSpreadBaseWorker *getWorker() const;
-	KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row);
-	KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet);
-	KoFilter::ConversionStatus doSpreadBook(Doc *document);
-	KoFilter::ConversionStatus doInfo(KoDocumentInfo *info);
+	KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row);
+	KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet);
+	KoFilter::ConversiontqStatus doSpreadBook(Doc *document);
+	KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info);
 
 public:
 	/**
@@ -97,7 +97,7 @@ public:
 	*
 	* @return status of the conversion.
 	*/
-	KoFilter::ConversionStatus convert();
+	KoFilter::ConversiontqStatus convert();
 };
 
 } // namespace KSpread
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index ce1a55ad6..9e37597cb 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & )
 {
 }
 
-KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
+KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
                                                     const TQCString & to )
 {
   /* later...
@@ -91,7 +91,7 @@ KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
      OpenCalcWorker * worker = new OpenCalcWorker();
      leader->setWorker( worker );
 
-     KoFilter::ConversionStatus status = leader->convert();
+     KoFilter::ConversiontqStatus status = leader->convert();
 
      delete worker;
      delete leader;
@@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc )
   data.appendChild( meta.createTextNode( aboutPage->subject() ) );
   officeMeta.appendChild( data );
 
-  const TQDateTime dt ( TQDateTime::currentDateTime() );
+  const TQDateTime dt ( TQDateTime::tqcurrentDateTime() );
   if ( dt.isValid() )
   {
     data = meta.createElement( "dc:date" );
@@ -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" ).arg( font.pointSize() ) );
+  style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( 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" ).arg( width  );
-  TQString sHeight = TQString( "%1cm" ).arg( height );
+  TQString sWidth  = TQString( "%1cm" ).tqarg( width  );
+  TQString sHeight = TQString( "%1cm" ).tqarg( height );
 
   TQDomElement pageMaster = doc.createElement( "style:page-master" );
   pageMaster.setAttribute( "style:name", "pm1" );
@@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
           TQDomElement t = doc.createElement( "text:date" );
           t.setAttribute( "text:date-value", "0-00-00" );
           // todo: "style:data-style-name", "N2"
-          t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) );
+          t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) );
           parent.appendChild( t );
         }
         else if ( var == "<time>" )
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 03cfa245b..97832a9a5 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter
   OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcExport() {}
 
-  virtual KoFilter::ConversionStatus convert( const TQCString & from,
+  virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
                                               const TQCString & to );
 
  private:
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 60412181d..376a8f776 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -168,7 +168,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
 
   double height = -1.0;
   bool insertPageBreak = false;
-  Format layout( table, table->doc()->styleManager()->defaultStyle() );
+  Format tqlayout( table, table->doc()->styleManager()->defaultStyle() );
 
   while( !node.isNull() )
   {
@@ -190,7 +190,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
         }
       }
 
-      loadStyleProperties( &layout, property );
+      loadStyleProperties( &tqlayout, property );
     }
 
     node = node.nextSibling();
@@ -219,7 +219,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt
   for ( int i = 0; i < number; ++i )
   {
     RowFormat * rowL = table->nonDefaultRowFormat( row );
-    rowL->copy( layout );
+    rowL->copy( tqlayout );
 
     if ( height != -1 )
     {
@@ -480,10 +480,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
         psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
 
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * layout = m_defaultStyles[psName];
+      Format * tqlayout = m_defaultStyles[psName];
 
-      if ( layout )
-        cell->format()->copy( *layout );
+      if ( tqlayout )
+        cell->format()->copy( *tqlayout );
 
       TQDomElement * st = 0;
       if ( e.hasAttributeNS( ooNS::table, "style-name" ) )
@@ -548,10 +548,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet  * table, int row,
 
       TQString psName( "Default" );
       kdDebug(30518) << "Default style: " << psName << endl;
-      Format * layout = m_defaultStyles[psName];
+      Format * tqlayout = m_defaultStyles[psName];
 
-      if ( layout )
-        cell->format()->copy( *layout );
+      if ( tqlayout )
+        cell->format()->copy( *tqlayout );
     }
     if ( e.hasAttributeNS( ooNS::table, "formula" ) )
     {
@@ -959,16 +959,16 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table )
       return false;
 
     RowFormat * srcLayout = table->nonDefaultRowFormat( backupRow );
-    RowFormat * layout = 0;
+    RowFormat * tqlayout = 0;
 
     if ( collapsed )
       srcLayout->setHide( true );
 
     for ( i = 1; i < number; ++i )
     {
-      layout = table->nonDefaultRowFormat( backupRow + i );
+      tqlayout = table->nonDefaultRowFormat( backupRow + i );
 
-      layout->copy( *srcLayout );
+      tqlayout->copy( *srcLayout );
 
       /*
        * TODO: Test: do we need to copy the cells, too?
@@ -1047,14 +1047,14 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table )
 
         if ( st && !st->isNull() )
         {
-          Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+          Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-          readInStyle( layout, *st );
+          readInStyle( tqlayout, *st );
 
-          m_defaultStyles.insert( name, layout );
+          m_defaultStyles.insert( name, tqlayout );
           kdDebug(30518) << "Insert default cell style: " << name << endl;
 
-          defaultStyle = layout;
+          defaultStyle = tqlayout;
         }
       }
 
@@ -1281,7 +1281,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
     TQString orientation = "Portrait";
     TQString format;
 
-    // Laurent : Why we stored layout information as Millimeter ?!!!!!
+    // Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
     // kspread used point for all other attribute
     // I don't understand :(
     if ( styleStack.hasAttributeNS( ooNS::fo, "page-width" ) )
@@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
             kdDebug(30518)<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).arg( width ).arg( height );
+    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
     kdDebug(30518)<<" format : "<<format<<endl;
     table->print()->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -1962,32 +1962,32 @@ TQString * OpenCalcImport::loadFormat( TQDomElement * element,
   return format;
 }
 
-void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font ) const
+void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font ) const
 {
-  if ( !font || !layout )
+  if ( !font || !tqlayout )
     return;
 
-  kdDebug(30518) << "Copy font style from the layout " << font->tagName() << ", " << font->nodeName() << endl;
+  kdDebug(30518) << "Copy font style from the tqlayout " << font->tagName() << ", " << font->nodeName() << endl;
 
   if ( font->hasAttributeNS( ooNS::fo, "font-family" ) )
-    layout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
+    tqlayout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) );
   if ( font->hasAttributeNS( ooNS::fo, "color" ) )
-    layout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
+    tqlayout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) );
   if ( font->hasAttributeNS( ooNS::fo, "font-size" ) )
-      layout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
+      tqlayout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) );
   else
-    layout->setTextFontSize( 10 );
+    tqlayout->setTextFontSize( 10 );
   if ( font->hasAttributeNS( ooNS::fo, "font-style" ) )
   {
     kdDebug(30518) << "italic" << endl;
-    layout->setTextFontItalic( true ); // only thing we support
+    tqlayout->setTextFontItalic( true ); // only thing we support
   }
   if ( font->hasAttributeNS( ooNS::fo, "font-weight" ) )
-    layout->setTextFontBold( true ); // only thing we support
+    tqlayout->setTextFontBold( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::fo, "text-underline" ) || font->hasAttributeNS( ooNS::style, "text-underline" ) )
-    layout->setTextFontUnderline( true ); // only thing we support
+    tqlayout->setTextFontUnderline( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "text-crossing-out" ) )
-    layout->setTextFontStrike( true ); // only thing we support
+    tqlayout->setTextFontStrike( true ); // only thing we support
   if ( font->hasAttributeNS( ooNS::style, "font-pitch" ) )
   {
     // TODO: possible values: fixed, variable
@@ -1996,7 +1996,7 @@ void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font )
   // text-underline-color
 }
 
-void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bPos pos ) const
+void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, bPos pos ) const
 {
   if ( borderDef == "none" )
     return;
@@ -2038,24 +2038,24 @@ void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bP
   pen.setColor( TQColor( borderDef.right( p - p2 ) ) );
 
   if ( pos == Left )
-    layout->setLeftBorderPen( pen );
+    tqlayout->setLeftBorderPen( pen );
   else if ( pos == Top )
-    layout->setTopBorderPen( pen );
+    tqlayout->setTopBorderPen( pen );
   else if ( pos == Right )
-    layout->setRightBorderPen( pen );
+    tqlayout->setRightBorderPen( pen );
   else if ( pos == Bottom )
-    layout->setBottomBorderPen( pen );
+    tqlayout->setBottomBorderPen( pen );
   else if ( pos == Border )
   {
-    layout->setLeftBorderPen( pen );
-    layout->setTopBorderPen( pen );
-    layout->setRightBorderPen( pen );
-    layout->setBottomBorderPen( pen );
+    tqlayout->setLeftBorderPen( pen );
+    tqlayout->setTopBorderPen( pen );
+    tqlayout->setRightBorderPen( pen );
+    tqlayout->setBottomBorderPen( pen );
   }
   // TODO Diagonals not supported by oocalc
 }
 
-void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const & property ) const
+void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const & property ) const
 {
   kdDebug(30518) << "*** Loading style properties *****" << endl;
 
@@ -2064,16 +2064,16 @@ void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const &
     bool ok = false;
     int p = property.attributeNS( ooNS::style, "decimal-places", TQString() ).toInt( &ok );
     if (ok )
-      layout->setPrecision( p );
+      tqlayout->setPrecision( p );
   }
 
   if ( property.hasAttributeNS( ooNS::style, "font-name" ) )
   {
     TQDomElement * font = m_styles[ property.attributeNS( ooNS::style, "font-name", TQString() ) ];
-    loadFontStyle( layout, font ); // generell font style
+    loadFontStyle( tqlayout, font ); // generell font style
   }
 
-  loadFontStyle( layout, &property ); // specific font style
+  loadFontStyle( tqlayout, &property ); // specific font style
 
   // TODO:
   //   diagonal: fall + goup
@@ -2090,133 +2090,133 @@ void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const &
     bool ok = false;
     int a = property.attributeNS( ooNS::style, "rotation-angle", TQString() ).toInt( &ok );
     if ( ok )
-      layout->setAngle( -a + 1 );
+      tqlayout->setAngle( -a + 1 );
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "direction" ) )
   {
-      layout->setVerticalText( true );
+      tqlayout->setVerticalText( true );
   }
   if ( property.hasAttributeNS( ooNS::fo, "text-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "text-align", TQString() );
     if ( s == "center" )
-      layout->setAlign( Format::Center );
+      tqlayout->setAlign( Format::Center );
     else if ( s == "end" )
-      layout->setAlign( Format::Right );
+      tqlayout->setAlign( Format::Right );
     else if ( s == "start" )
-      layout->setAlign( Format::Left );
+      tqlayout->setAlign( Format::Left );
     else if ( s == "justify" ) // TODO in KSpread!
-      layout->setAlign( Format::Center );
+      tqlayout->setAlign( Format::Center );
   }
   if (  property.hasAttributeNS( ooNS::fo, "margin-left" ) )
   {
       kdDebug(30518)<<"margin-left :"<<KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 )<<endl;
-      layout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
+      tqlayout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) );
   }
   if ( property.hasAttributeNS( ooNS::fo, "background-color" ) )
-    layout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
+    tqlayout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::style, "print-content" ) )
   {
     if ( property.attributeNS( ooNS::style, "print-content", TQString() ) == "false" )
-      layout->setDontPrintText( false );
+      tqlayout->setDontPrintText( false );
   }
   if ( property.hasAttributeNS( ooNS::style, "cell-protect" ) )
   {
     TQString prot( property.attributeNS( ooNS::style, "cell-protect", TQString() ) );
     if ( prot == "none" )
     {
-      layout->setNotProtected( true );
-      layout->setHideFormula( false );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( true );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "formula-hidden" )
     {
-      layout->setNotProtected( true );
-      layout->setHideFormula( true );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( true );
+      tqlayout->setHideFormula( true );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "protected formula-hidden" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( true );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( true );
+      tqlayout->setHideAll( false );
     }
     else if ( prot == "hidden-and-protected" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( false );
-      layout->setHideAll( true );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( true );
     }
     else if ( prot == "protected" )
     {
-      layout->setNotProtected( false );
-      layout->setHideFormula( false );
-      layout->setHideAll( false );
+      tqlayout->setNotProtected( false );
+      tqlayout->setHideFormula( false );
+      tqlayout->setHideAll( false );
     }
     kdDebug(30518) << "Cell " << prot << endl;
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "padding-left" ) )
-    layout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
+    tqlayout->setIndent(  KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) );
 
   if ( property.hasAttributeNS( ooNS::fo, "vertical-align" ) )
   {
     TQString s = property.attributeNS( ooNS::fo, "vertical-align", TQString() );
     if ( s == "middle" )
-      layout->setAlignY( Format::Middle );
+      tqlayout->setAlignY( Format::Middle );
     else if ( s == "bottom" )
-      layout->setAlignY( Format::Bottom );
+      tqlayout->setAlignY( Format::Bottom );
     else
-      layout->setAlignY( Format::Top );
+      tqlayout->setAlignY( Format::Top );
   }
   else
-      layout->setAlignY( Format::Bottom );
+      tqlayout->setAlignY( Format::Bottom );
 
   if ( property.hasAttributeNS( ooNS::fo, "wrap-option" ) )
   {
-    layout->setMultiRow( true );
+    tqlayout->setMultiRow( true );
 
     /* we do not support anything else yet
       TQString s = property.attributeNS( ooNS::fo, "wrap-option", TQString() );
       if ( s == "wrap" )
-      layout->setMultiRow( true );
+      tqlayout->setMultiRow( true );
     */
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-bottom" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom );
     // TODO: style:border-line-width-bottom if double!
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-right" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right );
     // TODO: style:border-line-width-right
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-top" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top );
     // TODO: style:border-line-width-top
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border-left" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left );
     // TODO: style:border-line-width-left
   }
 
   if ( property.hasAttributeNS( ooNS::fo, "border" ) )
   {
-    loadBorder( layout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
+    loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border", TQString() ), Border );
     // TODO: style:border-line-width-left
   }
 }
 
-void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
+void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style )
 {
   kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl;
   if ( style.localName() == "style" && style.namespaceURI()==ooNS::style)
@@ -2225,20 +2225,20 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
     {
       Format * cp
         = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
-      kdDebug(30518) << "Copying layout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
+      kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
 
       if ( cp != 0 )
-        layout->copy( *cp );
+        tqlayout->copy( *cp );
     }
     else if ( style.hasAttributeNS( ooNS::style, "family") )
     {
       TQString name = style.attribute( "style-family" ) + "default";
       Format * cp = m_defaultStyles.find( name );
 
-      kdDebug(30518) << "Copying layout from " << name << ", " << !cp << endl;
+      kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl;
 
       if ( cp != 0 )
-        layout->copy( *cp );
+        tqlayout->copy( *cp );
     }
 
     if ( style.hasAttributeNS( ooNS::style, "data-style-name" ) )
@@ -2255,8 +2255,8 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
 
       if ( format )
       {
-        layout->setFormatString( *format );
-        layout->setFormatType( formatType );
+        tqlayout->setFormatString( *format );
+        tqlayout->setFormatType( formatType );
       }
 
       // <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol>
@@ -2267,9 +2267,9 @@ void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style )
   forEachElement( property, style )
   {
     if ( property.localName() == "properties" && property.namespaceURI() == ooNS::style )
-      loadStyleProperties( layout, property );
+      loadStyleProperties( tqlayout, property );
 
-    kdDebug(30518) << layout->textFontFamily( 0, 0 ) << endl;
+    kdDebug(30518) << tqlayout->textFontFamily( 0, 0 ) << endl;
   }
 }
 
@@ -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.arg( content.attributeNS( ooNS::office, "version", TQString() ) );
+        message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -2358,13 +2358,13 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
 
     if ( !e.isNull() )
     {
-      Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+      Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
 
-      readInStyle( layout, e );
+      readInStyle( tqlayout, e );
       kdDebug(30518) << "Default style " << e.attributeNS( ooNS::style, "family", TQString() ) << "default" << " loaded " << endl;
 
-      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", layout );
-      //      TQFont font = layout->font();
+      m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", tqlayout );
+      //      TQFont font = tqlayout->font();
       //      kdDebug(30518) << "Font: " << font.family() << ", " << font.toString() << endl;
     }
 
@@ -2384,12 +2384,12 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles )
       continue;
     }
 
-    Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() );
-    readInStyle( layout, defs );
+    Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() );
+    readInStyle( tqlayout, defs );
     kdDebug(30518) << "Default style " << defs.attributeNS( ooNS::style, "name", TQString() ) << " loaded " << endl;
 
-    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), layout );
-    //    kdDebug(30518) << "Font: " << layout->font().family() << ", " << layout->font().toString() << endl;
+    m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), tqlayout );
+    //    kdDebug(30518) << "Font: " << tqlayout->font().family() << ", " << tqlayout->font().toString() << endl;
 
     defs = defs.nextSibling().toElement();
   }
@@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData()
   return result;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
 {
   kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl;
 
@@ -2765,10 +2765,10 @@ KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCS
 
   kdDebug(30518) << "Opening file " << endl;
 
-  KoFilter::ConversionStatus preStatus = openFile();
+  KoFilter::ConversiontqStatus pretqStatus = openFile();
 
-  if ( preStatus != KoFilter::OK )
-    return preStatus;
+  if ( pretqStatus != KoFilter::OK )
+    return pretqStatus;
 
   emit sigProgress( 13 );
   int tables = readMetaData();
@@ -2782,7 +2782,7 @@ KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCS
   return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::openFile()
+KoFilter::ConversiontqStatus OpenCalcImport::openFile()
 {
   KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read);
 
@@ -2817,7 +2817,7 @@ KoFilter::ConversionStatus OpenCalcImport::openFile()
   return KoFilter::OK;
 }
 
-KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
+KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
 {
     return OoUtils::loadAndParse( fileName, doc, m_store);
 }
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index 8965dae50..cd1f23b63 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter
   OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcImport();
 
-  virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+  virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 
  private:
@@ -90,10 +90,10 @@ class OpenCalcImport : public KoFilter
   bool readRowsAndCells( TQDomElement & content, KSpread::Sheet * table );
   bool readCells( TQDomElement & rowNode, KSpread::Sheet  * table, int row, int & columns );
   void convertFormula( TQString & text, TQString const & f ) const;
-  void loadFontStyle( KSpread::Format * layout, TQDomElement const * font ) const;
-  void readInStyle( KSpread::Format * layout, TQDomElement const & style );
-  void loadStyleProperties( KSpread::Format * layout, TQDomElement const & property ) const;
-  void loadBorder( KSpread::Format * layout, TQString const & borderDef, bPos pos ) const;
+  void loadFontStyle( KSpread::Format * tqlayout, TQDomElement const * font ) const;
+  void readInStyle( KSpread::Format * tqlayout, TQDomElement const & style );
+  void loadStyleProperties( KSpread::Format * tqlayout, TQDomElement const & property ) const;
+  void loadBorder( KSpread::Format * tqlayout, TQString const & borderDef, bPos pos ) const;
   void loadTableMasterStyle( KSpread::Sheet * table, TQString const & stylename );
   TQString * loadFormat( TQDomElement * element,
                         KSpread::FormatType & formatType,
@@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter
     void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition );
     void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition );
     void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition );
-    KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
+    KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
 
-  KoFilter::ConversionStatus openFile();
+  KoFilter::ConversiontqStatus openFile();
 };
 
 #endif // OpenCalc_IMPORT_H__
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index 9585ae139..f075713a6 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" ).arg( m_cellStyles.count() );
+  t->name = TQString( "ce%1" ).tqarg( 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" ).arg( m_columnStyles.count() );
+  t->name = TQString( "co%1" ).tqarg( 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" ).arg( m_rowStyles.count() );
+  t->name = TQString( "ro%1" ).tqarg( 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" ).arg( m_sheetStyles.count() );
+  t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() );
 
   return t->name;
 }
 
 TQString convertPenToString( TQPen const & pen )
 {
-  TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) );
+  TQString s( TQString( "%1cm solid " ).tqarg( 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" ).arg( t->font.pointSize() ) );
+        prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( 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" ).arg( t->indent ) );
+            prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( 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" ).arg( t->size ) );
+    prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( 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" ).arg( t->size ) );
+    prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( 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 b23f6ae90..dfaed8a4b 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -51,7 +51,7 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Borders, background colors<br>
     column width, row width<br>
     column layouts, row layouts<br>
-    page layout (size, border)<br>
+    page tqlayout (size, border)<br>
     OpenCalc style import, default style<br>
     format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br>
     header, footer (including macros)<br>
@@ -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 alignment, angle, vertical text, text wrap and indents<br>
+    Text tqalignment, angle, vertical text, text wrap and indents<br>
     Merged Cells<br>
     DontPrint flag<br>
     Comments<br>
@@ -169,10 +169,10 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
 
 <td>
  Jan 12, 2003 - Initial Revision<br>
- Jan 18, 2003 - page layout, header, footer<br>
+ 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 alignment, indents, comments, NoPrint, Merged Cells<br>
+ Jan 19, 2003 - text tqalignment, 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/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index 920d20a70..9a0db4fa1 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult)
    }
 }
 
-KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to )
 {
     bool bSuccess=true;
 
diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h
index e69d2a65e..1c3c7d851 100644
--- a/filters/kspread/qpro/qproimport.h
+++ b/filters/kspread/qpro/qproimport.h
@@ -37,7 +37,7 @@ public:
     QpImport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~QpImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
     void InitTableName(int pIdx, TQString& pResult);
 };
 
diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp
index f3b132db8..f8ad242c8 100644
--- a/filters/kugar/kugarnop/kugarnopimport.cpp
+++ b/filters/kugar/kugarnop/kugarnopimport.cpp
@@ -31,7 +31,7 @@ KugarNOPImport::KugarNOPImport( KoFilter *, const char *, const TQStringList& )
 {
 }
 
-KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ )
+KoFilter::ConversiontqStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ )
 {
 
 	TQFile in( m_chain->inputFile());
diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h
index a7099bc4a..030854107 100644
--- a/filters/kugar/kugarnop/kugarnopimport.h
+++ b/filters/kugar/kugarnop/kugarnopimport.h
@@ -28,7 +28,7 @@ class KugarNOPImport : public KoFilter
 public:
     KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& );
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 };
 
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index 5e875ecd0..dfba826d3 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").arg(id);
+    return i18n("Frameset name","Footnote %1").tqarg(id);
 }
 
 static void InsertTimeVariable(TQDomDocument& mainDocument,
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc
index 7c45f07a0..1687e9588 100644
--- a/filters/kword/abiword/ImportFormatting.cc
+++ b/filters/kword/abiword/ImportFormatting.cc
@@ -208,7 +208,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement,
             followingElement.setAttribute("name","Normal");
             layoutElement.appendChild(followingElement);
         }
-        // Else: we are a layout, so we leave the work to KWord (from the style)
+        // Else: we are a tqlayout, so we leave the work to KWord (from the style)
     }
     else
     {
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 5a08cf0d6..4f84a8e48 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")
-        .arg(fixedInfo.family()); // TODO: should be "Courier New"
+        .tqarg(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 d52fa1c82..717611cda 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -32,7 +32,7 @@
 
 #include <tqmap.h>
 #include <tqiodevice.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 #include <kdebug.h>
@@ -84,7 +84,7 @@ public:
     virtual bool doCloseFile(void); // Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doOpenTextFrameSet(void); // AbiWord's <section>
     virtual bool doCloseTextFrameSet(void); // AbiWord's </section>
@@ -95,7 +95,7 @@ public:
     virtual bool doCloseHead(void); // Write <papersize>
     virtual bool doOpenStyles(void); // AbiWord's <styles>
     virtual bool doCloseStyles(void); // AbiWord's </styles>
-    virtual bool doFullDefineStyle(LayoutData& layout); // AbiWord's <s></s>
+    virtual bool doFullDefineStyle(LayoutData& tqlayout); // AbiWord's <s></s>
     virtual bool doOpenSpellCheckIgnoreList (void); // AbiWord's <ignorewords>
     virtual bool doCloseSpellCheckIgnoreList (void); // AbiWord's </ignorewords>
     virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); // AbiWord's <iw>
@@ -116,7 +116,7 @@ private:
     TQString textFormatToAbiProps(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force) const;
     TQString layoutToCss(const LayoutData& layoutOrigin,
-        const LayoutData& layout, const bool force) const;
+        const LayoutData& tqlayout, const bool force) const;
     TQString escapeAbiWordText(const TQString& strText) const;
     bool makeTable(const FrameAnchor& anchor);
     bool makePicture(const FrameAnchor& anchor);
@@ -649,7 +649,7 @@ void AbiWordWorker::processVariable ( const TQString&,
                         TQString fstr;
                         TQValueList<ParaData>::ConstIterator it;
                         for (it=paraList->begin();it!=paraList->end();it++)
-                            fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
                         str += "{\\super ";
                         str += automatic ? "\\chftn " : value;
                         str += "{\\footnote ";
@@ -719,50 +719,50 @@ void AbiWordWorker::processParagraphData ( const TQString &paraText,
 }
 
 TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force) const
+    const LayoutData& tqlayout, const bool force) const
 {
     TQString props;
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        // Check if the current alignment is a valid one for AbiWord.
-        if ((layout.alignment == "left") || (layout.alignment == "right")
-            || (layout.alignment == "center")  || (layout.alignment == "justify"))
+        // Check if the current tqalignment is a valid one for AbiWord.
+        if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right")
+            || (tqlayout.tqalignment == "center")  || (tqlayout.tqalignment == "justify"))
         {
             props += "text-align:";
-            props += layout.alignment;
+            props += tqlayout.tqalignment;
             props += "; ";
         }
-        else if (layout.alignment == "auto")
+        else if (tqlayout.tqalignment == "auto")
         {
-            // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.)
+            // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.)
             props += "text-align:left; ";
         }
         else
         {
-            kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
     // TODO/FIXME: what if all tabulators must be erased?
 #if 0
     // DEPRECATED!
-    if (!layout.tabulator.isEmpty()
-        && (force || (layoutOrigin.tabulator!=layout.tabulator)))
+    if (!tqlayout.tabulator.isEmpty()
+        && (force || (layoutOrigin.tabulator!=tqlayout.tabulator)))
     {
         props += "tabstops:";
-        props += layout.tabulator;
+        props += tqlayout.tabulator;
         props += "; ";
     }
 #endif
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "tabstops:";
         bool first=true;
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(layout.tabulatorList.end());
-        for (it=layout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
+        for (it=tqlayout.tabulatorList.begin();it!=end;++it)
         {
             if (first)
             {
@@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
         props += "; ";
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
+        props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("margin-right:%1pt; ").arg(layout.indentRight);
+        props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "text-indent: ";
-        props += TQString::number(layout.indentFirst);
+        props += TQString::number(tqlayout.indentFirst);
         props += "pt; ";
     }
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
+       props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("margin-top:%1pt; ").arg(layout.marginTop);
+       props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             {
                 // We have a custom line spacing (in points). However AbiWord cannot do it, so transform in "at-least"
                 props += "line-height=:";
-                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
                 props += "pt+; ";
                 break;
             }
@@ -852,7 +852,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
         case LayoutData::LS_MULTIPLE:
             {
                 props += "line-height:";
-                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
                 props += "; ";
                 break;
             }
@@ -860,7 +860,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
             {
                 // We have a fixed line height (in points)
                 props += "line-height:";
-                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
                 props += "pt; ";
                 break;
             }
@@ -868,32 +868,32 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
             {
                 // We have an "at-least" line height (in points)
                 props += "line-height=:";
-                props += TQString::number( layout.lineSpacing ); // ### TODO: rounding?
+                props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding?
                 props += "pt+; "; // The + makes the difference
                 break;
             }
         default:
             {
-                kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
     }
 
     // Add all AbiWord properties collected in the <FORMAT> element
-    props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force);
+    props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force);
 
     return props;
 }
 
-bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
+bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
-    TQString style=layout.styleName;
+    TQString style=tqlayout.styleName;
 
     const LayoutData& styleLayout=m_styleMap[style];
 
-    TQString props=layoutToCss(styleLayout,layout,false);
+    TQString props=layoutToCss(styleLayout,tqlayout,false);
 
     *m_streamOut << "<p";
     if (!style.isEmpty())
@@ -916,16 +916,16 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
     *m_streamOut << ">";  //Warning: No trailing white space or else it's in the text!!!
 
     // Before processing the text, test if we have a page break
-    if (layout.pageBreakBefore)
+    if (tqlayout.pageBreakBefore)
     {
         // We have a page break before the paragraph
         *m_streamOut << "<pbr/>";
     }
 
-    processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
 
     // Before closing the paragraph, test if we have a page break
-    if (layout.pageBreakAfter)
+    if (tqlayout.pageBreakAfter)
     {
         // We have a page break after the paragraph
         *m_streamOut << "<pbr/>";
@@ -935,26 +935,26 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
     return true;
 }
 
-bool AbiWordWorker::doFullDefineStyle(LayoutData& layout)
+bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     *m_streamOut << "<s";
 
     // TODO: cook the style name to the standard style names in AbiWord
-    *m_streamOut << " name=\"" << EscapeXmlText(layout.styleName,true,true) << "\"";
-    *m_streamOut << " followedby=\"" << EscapeXmlText(layout.styleFollowing,true,true) << "\"";
+    *m_streamOut << " name=\"" << EscapeXmlText(tqlayout.styleName,true,true) << "\"";
+    *m_streamOut << " followedby=\"" << EscapeXmlText(tqlayout.styleFollowing,true,true) << "\"";
 
-    if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (layout.counter.depth<10) )
+    if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (tqlayout.counter.depth<10) )
     {
         *m_streamOut << " level=\"";
-        *m_streamOut << TQString::number(layout.counter.depth+1,10);
+        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
         *m_streamOut << "\"";
     }
 
-    TQString abiprops=layoutToCss(layout,layout,true);
+    TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
 
     const int result=abiprops.findRev(";");
     if (result>=0)
@@ -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\" ").arg(width/72.0).arg(height/72.0);
+                outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0);
             }
             break;
         }
@@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo)
 
     *m_streamOut << "</m>\n";
 
-    TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC
+    TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC
     *m_streamOut << "<m key=\"abiword.date_last_changed\">"
          << escapeAbiWordText(transformToTextDate(now))
          << "</m>\n";
@@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/x-abiword" || from != "application/x-kword" )
     {
@@ -1252,7 +1252,7 @@ KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h
index 656283f85..550b7682f 100644
--- a/filters/kword/abiword/abiwordexport.h
+++ b/filters/kword/abiword/abiwordexport.h
@@ -47,6 +47,6 @@ public:
     ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~ABIWORDExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDEXPORT_H
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2c7e4d3f3..4815d02cf 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler
 public:
     StructureParser(KoFilterChain* chain)
         :  m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0),
-        m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false)
+        m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false)
     {
         createDocument();
         structureStack.setAutoDelete(true);
@@ -363,7 +363,7 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent,
     stackItem->stackElementFormatsPlural=formatsPluralElementOut; // <FORMATS>
     stackItem->pos=0; // No text characters yet
 
-    // Now we populate the layout
+    // Now we populate the tqlayout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
@@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu
         kdDebug(30506) << "Image: " << strDataId << endl;
     }
 
-    TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber));
+    TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber));
 
     // Create the frame set of the image
 
@@ -817,7 +817,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent,
     TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS");
     paragraphElementOut.appendChild(formatsPluralElementOut);
 
-    // We must now copy/clone the layout of elementText.
+    // We must now copy/clone the tqlayout of elementText.
 
     TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT");
 
@@ -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").arg(tableNumber));
+    const TQString tableName(i18n("Table %1").tqarg(tableNumber));
 
     TQDomElement elementText=stackCurrent->stackElementText;
     TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH");
@@ -1159,7 +1159,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     stackItem->strTemp2=TQString::number(tableNumber); // needed as I18N does not allow adding phrases
     stackItem->pos=1; // Just #
 
-    // Now we populate the layout
+    // Now we populate the tqlayout
     TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
     paragraphElementOut.appendChild(layoutElement);
 
@@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur
     }
 
     const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2")
-        .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last!
+        .tqarg(row).tqarg(col).tqarg(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")
-        .arg(exception.lineNumber()).arg(exception.columnNumber())
-        .arg( i18n( "TQXml", exception.message().utf8() ) ),
+        .tqarg(exception.lineNumber()).tqarg(exception.columnNumber())
+        .tqarg( i18n( "TQXml", exception.message().utf8() ) ),
         i18n("AbiWord Import Filter"),0);
     return false; // Stop parsing now, we do not need further errors.
 }
@@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to )
 {
     if ((to != "application/x-kword") || (from != "application/x-abiword"))
         return KoFilter::NotImplemented;
@@ -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").arg(from.data()),
+            KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()),
                 i18n("AbiWord Import Filter"),0);
         }
         return KoFilter::ParsingError;
diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h
index 8b8349b71..9ff4d764c 100644
--- a/filters/kword/abiword/abiwordimport.h
+++ b/filters/kword/abiword/abiwordimport.h
@@ -50,6 +50,6 @@ public:
     ABIWORDImport();
     virtual ~ABIWORDImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // ABIWORDIMPORT_H
diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt
index 15f200372..f795b56cb 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 alignment
-  <+A> right alignment
-  <+B> center alignment
+  <+@> left tqalignment
+  <+A> right tqalignment
+  <+B> center tqalignment
   <+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          alignment flag (see below)
+         4          tqalignment flag (see below)
          1
          216        indent, 216/20 = 10.8 pt 
          144        first line indent, 144/20 = 7.2 pt
@@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph.
 
 5  Page Layout
 -------------
-Page layout is defined in section [lay]. Here is the format,
+Page tqlayout is defined in section [lay]. Here is the format,
 along with an example:
 
   [lay]
diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc
index 22bc741e0..dd4550b80 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -50,7 +50,7 @@ class AmiProWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
@@ -116,7 +116,7 @@ static TQString AmiProEscape( const TQString& text )
   for( unsigned i=0; i<text.length(); i++ )
   {
     TQChar ch = text[i];
-    switch( ch.unicode() )
+    switch( ch.tqunicode() )
     {
       case '<': result += "<<"; break;
       case '>': result += "<;>"; break;
@@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text )
 }
 
 bool AmiProWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
 {
   TQString amiproText = "";
   TQString text = paraText;
@@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus 
+KoFilter::ConversiontqStatus 
 AmiProExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from,
   AmiProWorker* worker = new AmiProWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h
index bffb4362d..c9e1f5d96 100644
--- a/filters/kword/amipro/amiproexport.h
+++ b/filters/kword/amipro/amiproexport.h
@@ -35,7 +35,7 @@ class AmiProExport : public KoFilter
 
     virtual ~AmiProExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROEXPORT_H
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc
index fe45ca18e..7f37746cc 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cc
@@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList )
   return result;
 }
 
-// helper function to convert AmiPro paragraph layout to KWord's LAYOUT
-static TQString AmiProLayoutAsXML( const AmiProLayout& layout )
+// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT
+static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout )
 {
   TQString result;
 
-  TQString referredStyle = layout.name;
+  TQString referredStyle = tqlayout.name;
   if( referredStyle.isEmpty() ) referredStyle = "Standard";
 
-  TQString fontname = layout.fontFamily;
+  TQString fontname = tqlayout.fontFamily;
   if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family();
-  TQString fontsize = TQString::number( layout.fontSize );
-  TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) +
-    "\"  green=\"" +  TQString::number( layout.fontColor.green() ) +
-    "\"  blue=\"" + TQString::number( layout.fontColor.blue() ) + "\"";
-  TQString boldness = layout.bold ? "75" : "50";
-  TQString italic = layout.italic ? "1" : "0";
-  TQString strikeout = layout.strikethrough ? "1" : "0";
-  TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0";
-  TQString underline = layout.double_underline ? "double" :
-    layout.underline|layout.word_underline ? "1" : "0";
+  TQString fontsize = TQString::number( tqlayout.fontSize );
+  TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) +
+    "\"  green=\"" +  TQString::number( tqlayout.fontColor.green() ) +
+    "\"  blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\"";
+  TQString boldness = tqlayout.bold ? "75" : "50";
+  TQString italic = tqlayout.italic ? "1" : "0";
+  TQString strikeout = tqlayout.strikethrough ? "1" : "0";
+  TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0";
+  TQString underline = tqlayout.double_underline ? "double" :
+    tqlayout.underline|tqlayout.word_underline ? "1" : "0";
 
   TQString align;
-  align = layout.align==TQt::AlignLeft ? "left" :
-          layout.align==TQt::AlignRight ? "right" :
-          layout.align==TQt::AlignCenter ? "center" :
-          layout.align==TQt::AlignJustify ? "justify" :
+  align = tqlayout.align==TQt::AlignLeft ? "left" :
+          tqlayout.align==TQt::AlignRight ? "right" :
+          tqlayout.align==TQt::AlignCenter ? "center" :
+          tqlayout.align==TQt::AlignJustify ? "justify" :
           "left";
 
   TQString offsets;
-  offsets = "before=\"" + TQString::number(layout.spaceBefore) +
-            "\" after=\"" + TQString::number(layout.spaceAfter) + "\"";
+  offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) +
+            "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\"";
 
   TQString linespacing;
-  linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
-                layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
-                layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
-                  TQString::number( layout.linespace );
+  linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
+                tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
+                tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
+                  TQString::number( tqlayout.linespace );
 
   result.append( "<LAYOUT>\n" );
   result.append( "  <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" );
@@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style )
           "left";
 
   TQString linespacing;
-  linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) :
-                style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) :
-                style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) :
+  linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) :
+                style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) :
+                style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) :
                   TQString::number( style.linespace );
 
   TQString offsets;
@@ -308,18 +308,18 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style )
 }
 
 bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList,
-  AmiProLayout& layout )
+  AmiProLayout& tqlayout )
 {
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" );
   root.append( AmiProFormatListAsXML( formatList ) );
-  root.append( AmiProLayoutAsXML( layout ) );
+  root.append( AmiProLayoutAsXML( tqlayout ) );
   root.append( "</PARAGRAPH>\n" );
 
   return true;
 }
 
-KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/x-amipro" )
diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h
index 45c8cc2ba..ad0785437 100644
--- a/filters/kword/amipro/amiproimport.h
+++ b/filters/kword/amipro/amiproimport.h
@@ -37,7 +37,7 @@ class AmiProImport : public KoFilter
 
     virtual ~AmiProImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __AMIPROIMPORT_H
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index 14a0084bf..fdae97e69 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 const float AmiPro::LS_Single = -1;
 const float AmiPro::LS_OneAndHalf = -1.5;
@@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str )
         else
         {
           result.truncate( result.length() - 1 ); // remove the '<'
-          result.append( TQChar(str[i+2].unicode() + 0x40 ) );
+          result.append( TQChar(str[i+2].tqunicode() + 0x40 ) );
           i += 3;
         }
       }
@@ -92,7 +92,7 @@ static TQString AmiProUnescape( const TQString& str )
       if( str[i+1] == '\\' )
       {
         result.truncate( result.length() - 1 ); // remove the '<'
-        result.append( TQChar(str[i+2].unicode() | 0x80 ) );
+        result.append( TQChar(str[i+2].tqunicode() | 0x80 ) );
         i += 3;
       }
 
@@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines )
   style.word_underline = flag & 8;
   style.double_underline = flag & 64;
 
-  // alignment
+  // tqalignment
   if( lines[7].stripWhiteSpace() != "[algn]" ) return true;
   unsigned align_flag = lines[8].stripWhiteSpace().toUInt();
   if( align_flag & 1 ) style.align = TQt::AlignLeft;
@@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style )
   strikethrough = style.strikethrough;
 }
 
-// paragraph layout
+// paragraph tqlayout
 AmiProLayout::AmiProLayout()
 {
   name = "";
diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h
index b6f077530..40a8f82be 100644
--- a/filters/kword/amipro/amiproparser.h
+++ b/filters/kword/amipro/amiproparser.h
@@ -104,7 +104,7 @@ class AmiProListener
     virtual bool doCloseDocument();   
     virtual bool doDefineStyle( const AmiProStyle& style );
     virtual bool doParagraph( const TQString& text, AmiProFormatList formatList, 
-      AmiProLayout& layout );
+      AmiProLayout& tqlayout );
 };
 
 class AmiProParser
@@ -144,7 +144,7 @@ class AmiProParser
     bool processOpenDocument();
     bool processCloseDocument();
     bool processParagraph( const TQString& text, AmiProFormatList formatList,
-      AmiProLayout& layout );
+      AmiProLayout& tqlayout );
 
 };
 
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index 89bf55411..d7acc7ed8 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream)
  *                                                                            *
  *                                                                            *
  ******************************************************************************/
-KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to )
 {
 
     if (to!="application/x-kword" || from!="application/x-applixword")
@@ -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>").arg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
 				    "Okay");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
       return false;
     }
     else return true;
diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h
index 957e40587..ccd80df73 100644
--- a/filters/kword/applixword/applixwordimport.h
+++ b/filters/kword/applixword/applixwordimport.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <KoFilter.h>
 #include <KoStore.h>
@@ -50,7 +50,7 @@ public:
     APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~APPLIXWORDImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     TQChar   specCharfind     (TQChar , TQChar );
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index f4bddc036..138618b2e 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
@@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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.arg("Apple Roman"); // Apple 
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple 
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui
index 9345a64cc..8f66942ce 100644
--- a/filters/kword/ascii/ExportDialogUI.ui
+++ b/filters/kword/ascii/ExportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index c11753bcf..adb345b1e 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
@@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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.arg("Apple Roman"); // Apple 
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple 
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui
index 4b32a4411..fd124062c 100644
--- a/filters/kword/ascii/ImportDialogUI.ui
+++ b/filters/kword/ascii/ImportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index 3748e8e7f..4f4fbb061 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -28,8 +28,8 @@
 #include <tqfile.h>
 #include <tqiodevice.h>
 #include <tqstring.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -86,7 +86,7 @@ public:
     virtual bool doFullParagraphList(const TQValueList<ParaData>& paraList);
     virtual bool doFullParagraph(const ParaData& para);
     virtual bool doFullParagraph(const TQString& paraText,
-        const LayoutData& layout,
+        const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
 
 public:
@@ -204,10 +204,10 @@ bool ASCIIWorker::doFullParagraphList(const TQValueList<ParaData>& paraList)
 
 bool ASCIIWorker::doFullParagraph(const ParaData& para)
 {
-    return doFullParagraph(para.text, para.layout, para.formattingList);
+    return doFullParagraph(para.text, para.tqlayout, para.formattingList);
 }
 
-bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
+bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl;
@@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
     // As KWord has only one depth of lists, we can process lists very simply.
     // --
     // Not anymore - Clarence
-    if ( layout.counter.numbering == CounterData::NUM_LIST )
+    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
     {
         // Are we still in a list of the right type?
-        if (!m_inList || (layout.counter.style!=m_typeList))
+        if (!m_inList || (tqlayout.counter.style!=m_typeList))
         {
             // We are not yet part of a list
             m_inList=true;
             m_counterList=1; // Start numbering
-            m_typeList=layout.counter.style;
+            m_typeList=tqlayout.counter.style;
         }
 
         switch (m_typeList)
@@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
     else
     {
         m_inList=false; // Close an eventual list
-        if ( layout.counter.numbering == CounterData::NUM_CHAPTER )
+        if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER )
         {
-            if (!layout.counter.depth)
+            if (!tqlayout.counter.depth)
             {   // HEAD 1
                 *m_streamOut << "###################################" << m_eol;
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
                 *m_streamOut << "###################################" << m_eol;
             }
-            else if (layout.counter.depth==1)
+            else if (tqlayout.counter.depth==1)
             {   // HEAD 2
                 *m_streamOut << "#### ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (layout.counter.depth==2)
+            else if (tqlayout.counter.depth==2)
             {   // HEAD 3
                 *m_streamOut << "## ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
             }
-            else if (layout.counter.depth==3)
+            else if (tqlayout.counter.depth==3)
             {   // HEAD 4
                 *m_streamOut << "# ";
                 ProcessParagraphData ( paraText, paraFormatDataList);
@@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& la
         }
     }
 #else
-    if (!layout.counter.text.isEmpty())
-        *m_streamOut << layout.counter.text << " ";
+    if (!tqlayout.counter.text.isEmpty())
+        *m_streamOut << tqlayout.counter.text << " ";
 
     if (!ProcessParagraphData(paraText, paraFormatDataList)) return false;
 #endif
@@ -357,7 +357,7 @@ bool ASCIIWorker::ProcessTable(const Table& table)
 {
     kdDebug(30502) << "processTable CALLED!" << endl;
 
-    // just dump the table out (no layout for now)
+    // just dump the table out (no tqlayout for now)
     for (TQValueList<TableCell>::ConstIterator it = table.cellList.begin();
          it != table.cellList.end();
          it++)
@@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&)
 {
 }
 
-KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to)
 {
     if (to != "text/plain" || from != "application/x-kword")
     {
@@ -534,7 +534,7 @@ KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQC
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result = leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h
index 429ad6c89..af1e2e04c 100644
--- a/filters/kword/ascii/asciiexport.h
+++ b/filters/kword/ascii/asciiexport.h
@@ -31,7 +31,7 @@ public:
     ASCIIExport(KoFilter* parent, const char* name, const TQStringList&);
     virtual ~ASCIIExport() {}
 
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // ASCIIEXPORT_H
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index 52c5c4d94..f2a6e039b 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -28,9 +28,9 @@
 #include <tqobject.h>
 #include <tqstring.h>
 // #include <tqregexp.h> // Currently not needed (due to disabled code)
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 #include <tqfontinfo.h>
 
@@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai
 
 }
 
-KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to )
 {
     if (to!="application/x-kword" || from!="text/plain")
         return KoFilter::NotImplemented;
@@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen
             }
 
             const int length = strLine.length();
-            if (strLine.at(length-1) == '-')
+            if (strLine.tqat(length-1) == '-')
                 // replace the hard hyphen - at line end by a soft hyphen
-                strLine.at(length-1)=TQChar(173);
+                strLine.tqat(length-1)=TQChar(173);
             else
                 strLine += ' '; // add space to end of line
 
diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h
index b2cfcbdd4..4d332776b 100644
--- a/filters/kword/ascii/asciiimport.h
+++ b/filters/kword/ascii/asciiimport.h
@@ -65,7 +65,7 @@ public:
     ASCIIImport();
     virtual ~ASCIIImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 private: // not yet changed
 #if 0
     void WriteOutTableCell( int table_no, int row, int col, Position *pos,
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc
index f54bec6b1..db9c754ac 100644
--- a/filters/kword/docbook/docbookexport.cc
+++ b/filters/kword/docbook/docbookexport.cc
@@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
                         fixedFont = true;
                     }
 
-                    if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
                     {
                         outputText += "<EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
                     {
                         outputText += "<EMPHASIS ROLE=bold>";
                     }
@@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData &para,
                         outputText += "</LITERAL>";
                     }
 
-                    if ( (*formattingIt).text.weight > para.layout.formatData.text.weight )
+                    if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight )
                     {
                         outputText += "</EMPHASIS>";
                     }
 
-                    if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic )
+                    if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic )
                     {
                         outputText += "</EMPHASIS>";
                     }
@@ -516,10 +516,10 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
 	TQValueList<ParaData>::ConstIterator end(paraList.end ());
     for ( paraIt = paraList.begin (); paraIt != end ; ++paraIt )
     {
-        switch ( (*paraIt).layout.counter.numbering )
+        switch ( (*paraIt).tqlayout.counter.numbering )
         {
             case CounterData::NUM_LIST:
-                switch ( (*paraIt).layout.counter.style )
+                switch ( (*paraIt).tqlayout.counter.style )
                 {
                     case CounterData::STYLE_CUSTOMBULLET:
                     case CounterData::STYLE_CIRCLEBULLET:
@@ -581,7 +581,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                         break;
 
                     default:
-                        kdError (30507) << "Unknown counter style " << (*paraIt).layout.counter.style << "!" << endl;
+                        kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.counter.style << "!" << endl;
                         CloseLists ();
                         OpenArticleUnlessHead1 ();
                         ProcessParagraphData (*paraIt, "PARA" );
@@ -590,7 +590,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                 break;
 
             case CounterData::NUM_CHAPTER:
-                switch ( (*paraIt).layout.counter.depth )
+                switch ( (*paraIt).tqlayout.counter.depth )
                 {
                     case 0:
                         CloseHead1AndArticle ();
@@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> &paraList )
                         break;
 
                     default:
-                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl;
+                        kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl;
                         CloseLists ();
                         OpenArticleUnlessHead1 ();
                         ProcessParagraphData (*paraIt, "PARA" );
@@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo )
 }
 
 
-KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to )
 {
 #if 0
     kdError (30507) << "to = " << to << ", from = " << from << endl;
diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h
index 29362aaa4..cf7ec8041 100644
--- a/filters/kword/docbook/docbookexport.h
+++ b/filters/kword/docbook/docbookexport.h
@@ -38,6 +38,6 @@ public:
     DocBookExport (KoFilter *parent, const char *name, const TQStringList & );
     virtual ~DocBookExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // DOCBOOKEXPORT_H
diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp
index 47191bc75..6fc353e5b 100644
--- a/filters/kword/hancomword/hancomwordimport.cpp
+++ b/filters/kword/hancomword/hancomwordimport.cpp
@@ -31,7 +31,7 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p )
 
 }
 
-KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/x-hancomword" )
     return KoFilter::NotImplemented; 
diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h
index f78c3a47c..64d279a88 100644
--- a/filters/kword/hancomword/hancomwordimport.h
+++ b/filters/kword/hancomword/hancomwordimport.h
@@ -35,7 +35,7 @@ public:
     HancomWordImport ( TQObject *parent, const char* name, const TQStringList& );
     virtual ~HancomWordImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
   class Private;
diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp
index cb3771f52..f712f0e11 100644
--- a/filters/kword/hancomword/pole.cpp
+++ b/filters/kword/hancomword/pole.cpp
@@ -96,7 +96,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in unicode anymore 
+    std::string name;      // the name, not in tqunicode anymore 
     bool dir;              // true if directory   
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -117,7 +117,7 @@ class DirTree
     int indexOf( DirEntry* e );
     int parent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( 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 children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( 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 children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( 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 children
+       // not found among tqchildren
        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::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( 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> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    std::vector<unsigned> tqchildren = dt->tqchildren( parent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
   
   return result;
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 673b035ad..13864d7a4 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlBasicWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout, TQChar::Direction direction)
+    const LayoutData& tqlayout, TQChar::Direction direction)
 {
     *m_streamOut << '<' << strTag;
 
-    if ( (layout.alignment=="left") || (layout.alignment== "right")
-        || (layout.alignment=="center") || (layout.alignment=="justify"))
+    if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
+        || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
     {
-        *m_streamOut << " align=\"" << layout.alignment << "\"";
+        *m_streamOut << " align=\"" << tqlayout.tqalignment << "\"";
         if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) )
           *m_streamOut << " dir=\"rtl\"";
     }
-    else if ( layout.alignment=="auto")
+    else if ( tqlayout.tqalignment=="auto")
     {
         // Do nothing, the user-agent should be more intelligent than us.
     }
     else
     {
-        kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
+        kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
     }
 
     *m_streamOut << ">";
 
     // Allow bold only if tag is not a heading!
-    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlBasicWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
      // Allow bold only if tag is not a heading!
-    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
 
     *m_streamOut << "</" << strTag << ">\n";
 }
diff --git a/filters/kword/html/export/ExportBasic.h b/filters/kword/html/export/ExportBasic.h
index c8f2864c1..a6de00828 100644
--- a/filters/kword/html/export/ExportBasic.h
+++ b/filters/kword/html/export/ExportBasic.h
@@ -33,9 +33,9 @@ public:
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout);
+        const LayoutData& tqlayout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual bool doOpenBody(void); ///< HTML's \<body\>
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 58f2860e6..49abcf79a 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -52,7 +52,7 @@ TQString HtmlCssWorker::escapeCssIdentifier(const TQString& strText) const
     for (uint i=0; i<strText.length(); i++)
     {
         const TQChar qch(strText.at(i));
-        const ushort ch=qch.unicode();
+        const ushort ch=qch.tqunicode();
 
         if (((ch>='a') && (ch<='z'))
             || ((ch>='A') && (ch<='Z'))
@@ -309,68 +309,68 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi
 }
 
 TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force) const
+    const LayoutData& tqlayout, const bool force) const
 {
     TQString strLayout;
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        if ( (layout.alignment=="left") || (layout.alignment== "right")
-            || (layout.alignment=="center") || (layout.alignment=="justify"))
+        if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
+            || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
         {
-            strLayout += TQString("text-align:%1; ").arg(layout.alignment);
+            strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment);
         }
-        else if ( layout.alignment=="auto")
+        else if ( tqlayout.tqalignment=="auto")
         {
             // Do nothing, the user-agent should be more intelligent than us.
         }
         else
         {
-            kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-            strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft);
+            strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight);
+        strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
-        strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst);
+        strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
     }
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom);
+       strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop);
+       strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             { 
                 // ### TODO: CSS 2 does not known "at-least".
 #if 0
                 // We have a custom line spacing (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "style:line-spacing:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -394,7 +394,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
             }
         case LayoutData::LS_MULTIPLE:
             {
-                const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
                 strLayout += "line-height:";
                 strLayout += mult;
                 strLayout += "%; ";
@@ -403,7 +403,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         case LayoutData::LS_FIXED:
             {
                 // We have a fixed line height (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "line-height:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -414,7 +414,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
                 // ### TODO: CSS 2 does not known "at-least".
                 // ### TODO:  however draft CCS3 (module 'line') has 'line-stacking-strategy' to tweak this behaviour
                 // We have a at-least line height (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 strLayout += "line-height:";
                 strLayout += height;
                 strLayout += "pt; ";
@@ -422,7 +422,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
             }
         default:
             {
-                kdWarning(30503) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
@@ -430,12 +430,12 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 
     // TODO: Konqueror/KHTML does not support "text-shadow"
     if (!force
-        && ( layoutOrigin.shadowDirection == layout.shadowDirection )
-        && ( layoutOrigin.shadowDistance == layout.shadowDistance ) )
+        && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
+        && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
     {
         // Do nothing!
     }
-    else if ((!layout.shadowDirection) || (!layout.shadowDistance))
+    else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance))
     {
         strLayout += "text-shadow:";
         strLayout+="none; ";
@@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
     else
     {
         double xDistance,yDistance;
-        const double distance=layout.shadowDistance;
-        switch (layout.shadowDirection)
+        const double distance=tqlayout.shadowDistance;
+        switch (tqlayout.shadowDirection)
         {
         case 1: // SD_LEFT_UP
             {
@@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
         else
         {
             strLayout += "text-shadow:";
-            strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name())
-                .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0);
+            strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name())
+                .tqarg(xDistance,0,'f',0).tqarg(yDistance,0,'f',0);
                 // We do not want any scientific notation or any decimal
         }
     }
@@ -519,60 +519,60 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
 
     // This must remain last, as the last property does not have a semi-colon
     strLayout+=textFormatToCss(layoutOrigin.formatData.text,
-        layout.formatData.text,force);
+        tqlayout.formatData.text,force);
 
     return strLayout;
 }
 
 void HtmlCssWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout, TQChar::Direction direction)
+    const LayoutData& tqlayout, TQChar::Direction direction)
 {
-    const LayoutData& styleLayout=m_styleMap[layout.styleName];
+    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
 
     *m_streamOut << '<' << strTag;
 
     // Opening elements
-    *m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName);
+    *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
     *m_streamOut << "\"";
 
-    TQString strStyle=layoutToCss(styleLayout,layout,false);
+    TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
     if (!strStyle.isEmpty())
     {
         *m_streamOut << " style=\"" << strStyle;
         if (direction == TQChar::DirRLE) {
-            *m_streamOut << "direction: rtl; unicode-bidi: embed; ";
+            *m_streamOut << "direction: rtl; tqunicode-bidi: embed; ";
         } else if (direction == TQChar::DirRLO) {
-            *m_streamOut << "direction: rtl; unicode-bidi: override; ";
+            *m_streamOut << "direction: rtl; tqunicode-bidi: override; ";
         }
         *m_streamOut<< "\"";
     }
 
     *m_streamOut << ">";
 
-    if ( 1==layout.formatData.text.verticalAlignment )
+    if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sub>"; //Subscript
     }
-    else if ( 2==layout.formatData.text.verticalAlignment )
+    else if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "<sup>"; //Superscript
     }
-    if ( layout.alignment == "center" ) *m_streamOut << "<center>";
+    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "<center>";
 }
 
 void HtmlCssWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
-    if ( 2==layout.formatData.text.verticalAlignment )
+    if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sup>"; //Superscript
     }
-    else if ( 1==layout.formatData.text.verticalAlignment )
+    else if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         *m_streamOut << "</sub>"; //Subscript
     }
 
-    if ( layout.alignment == "center" ) *m_streamOut << "</center>";
+    if ( tqlayout.tqalignment == "center" ) *m_streamOut << "</center>";
     *m_streamOut << "</" << strTag << ">\n";
 }
 
@@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void)
     return true;
 }
 
-bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout)
+bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     // We do not limit (anymore) any style to <h1> ... <h6>, because
-    //   the style could be forced on <p> by the layout.
+    //   the style could be forced on <p> by the tqlayout.
 
-    *m_streamOut << "." << escapeCssIdentifier(layout.styleName);
-    *m_streamOut << "\n{\n  " << layoutToCss(layout,layout,true) << "\n}\n";
+    *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
+    *m_streamOut << "\n{\n  " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
 
     return true;
 }
diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h
index a33a00491..358ea6882 100644
--- a/filters/kword/html/export/ExportCss.h
+++ b/filters/kword/html/export/ExportCss.h
@@ -41,20 +41,20 @@ public:
 public:
     virtual bool doOpenStyles(void); ///< HTML's \<style\>
     virtual bool doCloseStyles(void); ///< HTML's \</style\>
-    virtual bool doFullDefineStyle(LayoutData& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     virtual bool doFullPaperFormat(const int format,
         const double width, const double height, const int orientation);
     virtual bool doFullPaperBorders (const double top, const double left,
         const double bottom, const double right); ///< Like KWord's \<PAPERBORDERS\>
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
-    virtual void openParagraph(const TQString& strTag, const LayoutData& layout,
+    virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout,
                                TQChar::Direction direction=TQChar::DirL);
-    virtual void closeParagraph(const TQString& strTag, const LayoutData& layout);
+    virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
 private:
-    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& layout,
+    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout,
         const bool force) const;
     TQString escapeCssIdentifier(const TQString& strText) const;
     TQString textFormatToCss(const TextFormatting& formatOrigin,
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 7e0055387..20c7069bf 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <klocale.h>
 #include <kcharsets.h>
@@ -28,7 +28,7 @@
 #include <kcombobox.h>
 #include <kmessagebox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqcheckbox.h>
@@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
 
     TQStringList encodingList;
 
-    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui
index a6683c049..cbdc4fc20 100644
--- a/filters/kword/html/export/ExportDialogUI.ui
+++ b/filters/kword/html/export/ExportDialogUI.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>106</width>
                             <height>20</height>
@@ -196,7 +196,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -212,7 +212,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -221,7 +221,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -262,7 +262,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index 0cb6339e7..f0e4b3aa1 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 
 #include <klocale.h>
@@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin,
 }
 
 void HtmlDocStructWorker::openParagraph(const TQString& strTag,
-    const LayoutData& layout,TQChar::Direction /*direction*/)
+    const LayoutData& tqlayout,TQChar::Direction /*direction*/)
 {
     *m_streamOut << '<' << strTag << ">";
-    openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
 }
 
 void HtmlDocStructWorker::closeParagraph(const TQString& strTag,
-    const LayoutData& layout)
+    const LayoutData& tqlayout)
 {
-    closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h'));
+    closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h'));
     *m_streamOut << "</" << strTag << ">\n";
 }
 
diff --git a/filters/kword/html/export/ExportDocStruct.h b/filters/kword/html/export/ExportDocStruct.h
index 6e9631830..43b1e76a0 100644
--- a/filters/kword/html/export/ExportDocStruct.h
+++ b/filters/kword/html/export/ExportDocStruct.h
@@ -33,9 +33,9 @@ public:
 protected:
     virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered);
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& layout,TQChar::Direction direction=TQChar::DirL);
+        const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL);
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout);
+        const LayoutData& tqlayout);
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
 private:
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index ecaba65ca..aa1b18175 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
@@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText,
 }
 
 void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &paraText,
-    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
 {
     if (paraText.isEmpty() && paraFormatDataList.first().id != 6)
     {
-        openParagraph(strTag,layout);
+        openParagraph(strTag,tqlayout);
         *m_streamOut << "&nbsp;" ; // A paragraph can never be empty in HTML
-        closeParagraph(strTag,layout);
+        closeParagraph(strTag,tqlayout);
     }
     else
     {
@@ -302,17 +302,17 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                 // For normal text, we need an opened paragraph
                 if (paragraphNotOpened)
                 {
-                    openParagraph(strTag,layout,partialText.ref(0).direction());
+                    openParagraph(strTag,tqlayout,partialText.ref(0).direction());
                     paragraphNotOpened=false;
                 }
-                formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt);
+                formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt);
             }
             else if (4==(*paraFormatDataIt).id)
             {
                 // For variables, we need an opened paragraph
                 if (paragraphNotOpened)
                 {
-                    openParagraph(strTag,layout);
+                    openParagraph(strTag,tqlayout);
                     paragraphNotOpened=false;
                 }
                 if (9==(*paraFormatDataIt).variable.m_type)
@@ -341,7 +341,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                     if (!paragraphNotOpened)
                     {
                         // The paragraph was opened, so close it.
-                        closeParagraph(strTag,layout);
+                        closeParagraph(strTag,tqlayout);
                     }
                     makeTable((*paraFormatDataIt).frameAnchor);
                     // The paragraph will need to be opened again
@@ -355,7 +355,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
                     // <img> and <object> need to be in a paragraph
                     if (paragraphNotOpened)
                     {
-                        openParagraph( strTag, layout,partialText.ref(0). direction() );
+                        openParagraph( strTag, tqlayout,partialText.ref(0). direction() );
                         paragraphNotOpened=false;
                     }
                     makeImage((*paraFormatDataIt).frameAnchor);
@@ -370,30 +370,30 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p
         if (!paragraphNotOpened)
         {
             // The paragraph was opened, so close it.
-            closeParagraph(strTag,layout);
+            closeParagraph(strTag,tqlayout);
         }
     }
 }
 
 bool HtmlWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl;
     TQString strParaText=paraText;
     TQString strTag; // Tag that will be written.
 
-    if ( layout.counter.numbering == CounterData::NUM_LIST )
+    if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
     {
-        const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0!
+        const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0!
         const uint listDepth=m_listStack.size();
         // We are in a list, but has it the right depth?
         if (layoutDepth>listDepth)
         {
             ListInfo newList;
-            newList.m_typeList=layout.counter.style;
+            newList.m_typeList=tqlayout.counter.style;
             for (uint i=listDepth; i<layoutDepth; i++)
             {
-                *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
+                *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
                 m_listStack.push(newList);
             }
         }
@@ -414,7 +414,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         }
 
         // We have a list but does it have the right type?
-        if ( layout.counter.style!=m_listStack.top().m_typeList)
+        if ( tqlayout.counter.style!=m_listStack.top().m_typeList)
         {
             // No, then close the previous list
             ListInfo oldList=m_listStack.pop();
@@ -427,8 +427,8 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
                 *m_streamOut << "</ul>\n";
             }
             ListInfo newList;
-            *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList);
-            newList.m_typeList=layout.counter.style;
+            *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
+            newList.m_typeList=tqlayout.counter.style;
             m_listStack.push(newList);
         }
 
@@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
                 }
             }
         }
-        if ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-            && (layout.counter.depth<6) )
+        if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+            && (tqlayout.counter.depth<6) )
         {
-            strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6
+            strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6
         }
         else
         {
@@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
         }
     }
 
-    ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList);
+    ProcessParagraphData(strTag, strParaText, tqlayout, paraFormatDataList);
 
     kdDebug(30503) << "Quiting HtmlWorker::doFullParagraph" << endl;
     return true;
diff --git a/filters/kword/html/export/ExportFilter.h b/filters/kword/html/export/ExportFilter.h
index 04d3129ff..f8446c1b6 100644
--- a/filters/kword/html/export/ExportFilter.h
+++ b/filters/kword/html/export/ExportFilter.h
@@ -42,7 +42,7 @@ public:
     virtual bool doCloseFile(void); // Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doOpenTextFrameSet(void);
@@ -58,9 +58,9 @@ protected:
      * be detected from the actual string data
      */
     virtual void openParagraph(const TQString& strTag,
-        const LayoutData& layout, TQChar::Direction direction=TQChar::DirL)=0;
+        const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0;
     virtual void closeParagraph(const TQString& strTag,
-        const LayoutData& layout)=0;
+        const LayoutData& tqlayout)=0;
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format)=0;
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format)=0;
     virtual void writeDocType(void);
@@ -84,7 +84,7 @@ protected:
     TQString getAdditionalFileName(const TQString& additionalName);
 private:
     void ProcessParagraphData ( const TQString& strTag, const TQString &paraText,
-        const LayoutData& layout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList);
     void formatTextParagraph(const TQString& strText,
         const FormatData& formatOrigin, const FormatData& format);
     bool makeTable(const FrameAnchor& anchor);
diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc
index 013fb7ffc..f8af8e3ee 100644
--- a/filters/kword/html/export/htmlexport.cc
+++ b/filters/kword/html/export/htmlexport.cc
@@ -31,7 +31,7 @@
    License version 2.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/html"))
     {
@@ -118,7 +118,7 @@ KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQC
         delete worker;
         return KoFilter::StupidError;
     }
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h
index 5b62781a0..5de5ef6a9 100644
--- a/filters/kword/html/export/htmlexport.h
+++ b/filters/kword/html/export/htmlexport.h
@@ -22,7 +22,7 @@
 #define HTMLEXPORT_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -39,7 +39,7 @@ public:
     HTMLExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLEXPORT_H
diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp
index 9b29320d1..2c403b2f8 100644
--- a/filters/kword/html/import/htmlimport.cpp
+++ b/filters/kword/html/import/htmlimport.cpp
@@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) :
 // 123
 }
 
-KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to )
 {
 	if(to!="application/x-kword" || from!="text/html")
 		return KoFilter::NotImplemented;
diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h
index ab2a293c7..f7c61a413 100644
--- a/filters/kword/html/import/htmlimport.h
+++ b/filters/kword/html/import/htmlimport.h
@@ -37,7 +37,7 @@ public:
     HTMLImport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~HTMLImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // HTMLIMPORT_H
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 8545fb0dc..6e134e381 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -80,7 +80,7 @@ HTMLReader_state *KHTMLReader::state()
 		s->frameset=_writer->mainFrameset();
 		s->paragraph = _writer->addParagraph(s->frameset);
 		s->format=_writer->currentFormat(s->paragraph,true);
-		s->layout=_writer->currentLayout(s->paragraph);
+		s->tqlayout=_writer->currentLayout(s->paragraph);
 		s->in_pre_mode = false;
 		_state.push(s);
 	}
@@ -93,7 +93,7 @@ HTMLReader_state *KHTMLReader::pushNewState()
         s->frameset=state()->frameset;
         s->paragraph=state()->paragraph;
         s->format=state()->format;
-        s->layout=state()->layout;
+        s->tqlayout=state()->tqlayout;
 	s->in_pre_mode=state()->in_pre_mode;
         _writer->cleanUpParagraph(s->paragraph);
         _state.push(s);
@@ -118,9 +118,9 @@ void KHTMLReader::popState()
 	if (s->frameset == state()->frameset)
 	{
 		state()->paragraph=s->paragraph;
-		if ((state()->layout != s->layout)) 
+		if ((state()->tqlayout != s->tqlayout)) 
                 {
-                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
+                  if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout);
 		}
 		state()->format=_writer->startFormat(state()->paragraph, state()->format);
 	}
@@ -129,15 +129,15 @@ void KHTMLReader::popState()
 
 void KHTMLReader::startNewLayout(bool startNewFormat) 
 {
-	TQDomElement layout;
-	startNewLayout(startNewFormat,layout);
+	TQDomElement tqlayout;
+	startNewLayout(startNewFormat,tqlayout);
 }
 
-void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) 
+void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout) 
 {
         kdDebug() << "entering startNewLayout" << endl;
 	startNewParagraph(startNewFormat,true);
-	state()->layout=_writer->setLayout(state()->paragraph,layout);
+	state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout);
 }
 
 void KHTMLReader::completed() 
@@ -178,12 +178,12 @@ void KHTMLReader::parseNode(DOM::Node node)
 	if (!t.isNull()) 
         {
 	   _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode);
-	   return; // no children anymore...
+	   return; // no tqchildren anymore...
 	}
 
 	// is this really needed ? it can't do harm anyway.
 	state()->format=_writer->currentFormat(state()->paragraph,true);
-	state()->layout=_writer->currentLayout(state()->paragraph);
+	state()->tqlayout=_writer->currentLayout(state()->paragraph);
 	pushNewState();
 
 	DOM::Element e=node;
@@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e)
 		} \
 	}
 
-// the state->layout=_writer->setLayout is meant to tell popState something changed in the layout, and a new
-// layout should probably be started after closing.
+// the state->tqlayout=_writer->setLayout is meant to tell popState something changed in the tqlayout, and a new
+// tqlayout should probably be started after closing.
 
 #define _PL(x,a,b,c) { \
 		if (e.tagName().lower() == #x) \
 			{ \
-				state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\
+				state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
 				if (!(_writer->getText(state()->paragraph).isEmpty())) \
 					startNewParagraph(false,false); \
 				_writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
@@ -283,20 +283,20 @@ bool KHTMLReader::parseTag(DOM::Element e)
   return true;
 }
 
-void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) 
+void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) 
 {
         kdDebug() << "Entering startNewParagraph" << endl;
 
 	TQDomElement qf=state()->format;
-	TQDomElement ql=state()->layout;
+	TQDomElement ql=state()->tqlayout;
 
 	_writer->cleanUpParagraph(state()->paragraph);
 
-        if ((startnewlayout==true) || ql.isNull())
+        if ((startnewtqlayout==true) || ql.isNull())
         	{state()->paragraph=_writer->addParagraph(state()->frameset);}
         else
 	        {state()->paragraph=
-	        	_writer->addParagraph(state()->frameset,state()->layout);}
+	        	_writer->addParagraph(state()->frameset,state()->tqlayout);}
 
 
 
@@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout)
 		_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").arg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
 	}
 }
 
@@ -403,7 +403,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/)
 
 bool KHTMLReader::parse_br(DOM::Element /*e*/) 
 {
-	startNewParagraph(false,false); //keep the current format and layout
+	startNewParagraph(false,false); //keep the current format and tqlayout
 	return false; // a BR tag has no childs.
 }
 
@@ -508,7 +508,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
   // process e.g. <style="text-align: center">this is in the center</style>
     if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
     {
-      state()->layout=_writer->setLayout(state()->paragraph,state()->layout);
+      state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
       _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
     }
   // done
@@ -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").arg(s1.item(i).string()).arg(s1.getPropertyValue(s1.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").tqarg(s1.item(i).string()).tqarg(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").arg(s2.item(i).string()).arg(s2.getPropertyValue(s2.item(i)).string()) << endl;
+        kdDebug(30503) << TQString("%1: %2").tqarg(s2.item(i).string()).tqarg(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; // children are already handled.
+	return false; // tqchildren 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; // children are already handled.
+	return false; // tqchildren 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").arg(isize));
+    _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize));
 
-  _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()));
+  _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()));
   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").arg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_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").arg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     }
     parseNode(items);
   }
diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h
index db93531aa..9987a5895 100644
--- a/filters/kword/html/import/khtmlreader.h
+++ b/filters/kword/html/import/khtmlreader.h
@@ -39,7 +39,7 @@ struct HTMLReader_state {
   TQDomElement format;
   TQDomElement frameset;
   TQDomElement paragraph;
-  TQDomElement layout;
+  TQDomElement tqlayout;
   bool in_pre_mode; // keep formatting as is.
 };
 
@@ -77,8 +77,8 @@ private:
         KWDWriter *_writer;
 
 	void startNewLayout(bool startNewFormat=false);
-	void startNewLayout(bool startNewFormat, TQDomElement layout);
-        void startNewParagraph(bool startnewformat=true, bool startnewlayout=true);
+	void startNewLayout(bool startNewFormat, TQDomElement tqlayout);
+        void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true);
         bool _it_worked;
 // -----------------------------------------------------
         int _list_depth;
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index a194b219a..56568be9d 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").arg(tableno).arg(nrow).arg(ncol),
+			TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol),
 			1);
-	fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno));
+	fs.setAttribute("grpMgr",TQString("Table %1").tqarg(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").arg(tableno))
-		     if (k.attribute("row") == TQString("%1").arg(rowno))
-		     	if (k.attribute("col") == TQString("%1").arg(colno))
+	     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))
 		     		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").arg(width));
+	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(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").arg(tableno)) {
+	    	if (k.attribute("grpMgr") == TQString("Table %1").tqarg(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").arg(currow).arg(curcol).latin1() << endl;
+	              kdDebug(30503) << TQString("creating %1 %2").tqarg(currow).tqarg(curcol).latin1() << endl;
 	              createTableCell(tableno,currow,curcol,1,
 		      			TQRect(x+step_x*curcol,y+step_y*currow,step_x,step_y)
 				);
@@ -328,12 +328,12 @@ TQDomElement KWDWriter::createLink(TQDomElement paragraph, TQString linkName, TQ
 }
 
 
-TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement layout) {
+TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement tqlayout) {
 	TQDomElement theLayout;
-	if (layout.isNull())
+	if (tqlayout.isNull())
 		theLayout=_doc->createElement("LAYOUT");
 	else
-		theLayout=layout.cloneNode().toElement();
+		theLayout=tqlayout.cloneNode().toElement();
 	TQDomElement oldLayout=currentLayout(paragraph);
 	paragraph.removeChild(oldLayout);
 	paragraph.appendChild(theLayout);
@@ -357,12 +357,12 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
 
 	TQDomElement paragraph=_doc->createElement("PARAGRAPH");
 	TQDomElement formats=_doc->createElement("FORMATS");
-	TQDomElement layout;
+	TQDomElement tqlayout;
 	if (layoutToClone.isNull()) {
-		layout=_doc->createElement("LAYOUT");
+		tqlayout=_doc->createElement("LAYOUT");
 	}
 	else {
-		layout=layoutToClone.cloneNode().toElement();
+		tqlayout=layoutToClone.cloneNode().toElement();
 	}
 	TQDomElement text=_doc->createElement("TEXT");
 	TQDomText t=_doc->createTextNode(TQString(""));
@@ -370,7 +370,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC
 	paragraph.appendChild(formats);
 	paragraph.appendChild(text);
 	parent.appendChild(paragraph);
-	paragraph.appendChild(layout);
+	paragraph.appendChild(tqlayout);
 	layoutAttribute(paragraph,"NAME","value","Standard");
 	return paragraph;
 }
@@ -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").arg(oldLength));
-	lastformat.setAttribute("len",TQString("%1").arg(newLength));
+	lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength));
+	lastformat.setAttribute("len",TQString("%1").tqarg(newLength));
 }
 
 TQString KWDWriter::getText(TQDomElement paragraph) {
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 2942f22a6..542a1748f 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -93,7 +93,7 @@ public:
 
 
 	/**
-	 * create a horizontal ruler layout
+	 * create a horizontal ruler tqlayout
 	 **/
 	void createHR(TQDomElement paragraph, int width=1);
 
@@ -115,7 +115,7 @@ public:
 	 * adds a paragraph
 	 **/
 	TQDomElement addParagraph(TQDomElement parent);
-	TQDomElement addParagraph(TQDomElement parent, TQDomElement layout);
+	TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout);
 
 	/**
 	 * adds/changes an attribute to/of the current format
@@ -123,13 +123,13 @@ public:
         TQDomElement formatAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
 
         /**
-         * get a layout attribute
+         * get a tqlayout attribute
          **/
 	TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName);
 
 
         /**
-         * adds/changes an attribute to/of the current layout
+         * adds/changes an attribute to/of the current tqlayout
          **/
         TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
 
@@ -164,9 +164,9 @@ public:
 	TQDomElement createLink(TQDomElement paragraph, TQString linkName, TQString hrefName);
 
 	/**
-	 * copy the given layout, and set it as layout of the given paragraph
+	 * copy the given tqlayout, and set it as tqlayout of the given paragraph
 	 **/
-	TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout);
+	TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout);
 
 	/**
 	 * returns the text of this paragraph.
diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp
index 5d1d2fe3b..9a658e419 100644
--- a/filters/kword/kword1.3/import/kword13formatone.cpp
+++ b/filters/kword/kword1.3/import/kword13formatone.cpp
@@ -1,4 +1,4 @@
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kword13utils.h"
 #include "kword13formatone.h"
diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h
index 682ef8872..e4cc7f38c 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"\> children
- * also the grand-children of \<STYLE\> and \<LAYOUT\>
+ * Contains the data of the \<FORMAT id="1"\> tqchildren
+ * also the grand-tqchildren 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 children of \<FORMAT id="1"\>
+    KWord13FormatOneData m_formatOne; ///< Data of tqchildren 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 47eed1e7d..ebcf3f6a7 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-children of the document element
+    // In documentinfo.xml, the text data is in the grand-tqchildren of the document element
     for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() )
     {
         kdDebug(30520) << "Child " << node.nodeName() << endl;
@@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc )
     return post.postParse( store, doc );
 }
 
-KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.oasis.opendocument.text"
         || from != "application/x-kword" )
diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h
index 77c05c23d..7d60dd892 100644
--- a/filters/kword/kword1.3/import/kword13import.h
+++ b/filters/kword/kword1.3/import/kword13import.h
@@ -39,7 +39,7 @@ public:
     KWord13Import(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~KWord13Import() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 protected:
     bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument );
     bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument );
diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp
index f72dd5f8c..cc8a7046d 100644
--- a/filters/kword/kword1.3/import/kword13layout.cpp
+++ b/filters/kword/kword1.3/import/kword13layout.cpp
@@ -1,4 +1,4 @@
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kword13utils.h"
 #include "kword13layout.h"
@@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void )
 
 void KWord13Layout::xmldump( TQTextStream& iostream )
 {
-    iostream << "    <layout name=\"" << EscapeXmlDump( m_name )
+    iostream << "    <tqlayout name=\"" << EscapeXmlDump( m_name )
         << "\" outline=\"" << ( m_outline ? TQString("true") : TQString("false") ) << "\">\n";
     
     for ( TQMap<TQString,TQString>::ConstIterator it = m_layoutProperties.begin();
@@ -25,7 +25,7 @@ void KWord13Layout::xmldump( TQTextStream& iostream )
     
     m_format.xmldump( iostream );
     
-    iostream << "    </layout>\n";
+    iostream << "    </tqlayout>\n";
 }
 
 TQString KWord13Layout::key( void ) const
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 7f246cad8..00b899f96 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -178,11 +178,11 @@ double KWord13OasisGenerator::positiveNumberOrNull( const TQString& str ) const
 }
 
 // Inspired by KoParagStyle::saveStyle
-void KWord13OasisGenerator::declareLayout( KWord13Layout& layout )
+void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout )
 {
-    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name );
+    KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name );
 
-    // ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name );
+    // ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.m_name );
 #if 0
     // TODO: check that this is correct
     if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@@ -192,21 +192,21 @@ void KWord13OasisGenerator::declareLayout( KWord13Layout& layout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( layout, gs, false );
-    fillGenStyleWithFormatOne( layout.m_format , gs, false );
+    fillGenStyleWithLayout( tqlayout, gs, false );
+    fillGenStyleWithFormatOne( tqlayout.m_format , gs, false );
 
-    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
+    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true );
 
-    kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl;
+    kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
 }
 
 
 // Inspired by KoParagStyle::saveStyle
-void KWord13OasisGenerator::declareStyle( KWord13Layout& layout )
+void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout )
 {
     KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() );
 
-    gs.addAttribute( "style:display-name", layout.m_name );
+    gs.addAttribute( "style:display-name", tqlayout.m_name );
 #if 0
     // TODO: check that this is correct
     if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) {
@@ -216,12 +216,12 @@ void KWord13OasisGenerator::declareStyle( KWord13Layout& layout )
             gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 );
     }
 #endif
-    fillGenStyleWithLayout( layout, gs, true );
-    fillGenStyleWithFormatOne( layout.m_format , gs, true );
+    fillGenStyleWithLayout( tqlayout, gs, true );
+    fillGenStyleWithFormatOne( tqlayout.m_format , gs, true );
 
-    layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false );
+    tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false );
 
-    kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl;
+    kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl;
 }
 
 
@@ -341,13 +341,13 @@ void KWord13OasisGenerator::fillGenStyleWithFormatOne( const KWord13FormatOneDat
 }
 
 // Inspired from KoParagLayout::saveOasis but we have not the same data to start with.
-void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const
+void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const
 {
     // ### TODO syntaxVersion < 3
 
-    TQString str; // Help string to store each KWord 1.3 layout property
+    TQString str; // Help string to store each KWord 1.3 tqlayout property
 
-    str = layout.getProperty( "FLOW:align" );
+    str = tqlayout.getProperty( "FLOW:align" );
     if ( str.isEmpty() && ! style)
     {
         // Nothing to do!
@@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout,
         gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent
     }
 
-    str = layout.getProperty( "FLOW:dir" );
+    str = tqlayout.getProperty( "FLOW:dir" );
     if ( str == "R" ) // ### TODO: check the right value
     {
             gs.addProperty( "style:writing-mode", "rl-tb" ); // right-to-left, top-to-bottom
@@ -372,11 +372,11 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout,
     }
 
     // ### TODO: do not define if it does not exist and ! style
-    gs.addPropertyPt( "fo:margin-left", numberOrNull( layout.getProperty( "INDENTS:left" ) ) );
-    gs.addPropertyPt( "fo:margin-right", numberOrNull( layout.getProperty( "INDENTS:right" ) ) );
-    gs.addPropertyPt( "fo:text-indent", numberOrNull( layout.getProperty( "INDENTS:first" ) ) );
-    gs.addPropertyPt( "fo:margin-top", numberOrNull( layout.getProperty( "OFFSETS:before" ) ) );
-    gs.addPropertyPt( "fo:margin-bottom", numberOrNull( layout.getProperty( "OFFSETS:after" ) ) );
+    gs.addPropertyPt( "fo:margin-left", numberOrNull( tqlayout.getProperty( "INDENTS:left" ) ) );
+    gs.addPropertyPt( "fo:margin-right", numberOrNull( tqlayout.getProperty( "INDENTS:right" ) ) );
+    gs.addPropertyPt( "fo:text-indent", numberOrNull( tqlayout.getProperty( "INDENTS:first" ) ) );
+    gs.addPropertyPt( "fo:margin-top", numberOrNull( tqlayout.getProperty( "OFFSETS:before" ) ) );
+    gs.addPropertyPt( "fo:margin-bottom", numberOrNull( tqlayout.getProperty( "OFFSETS:after" ) ) );
 
 #if 0
     switch ( lineSpacingType ) {
@@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout,
         case T_RIGHT:
             tabsWriter.addAttribute( "style:type", "right" );
             break;
-        case T_DEC_PNT:  // "alignment on decimal point"
+        case T_DEC_PNT:  // "tqalignment on decimal point"
             tabsWriter.addAttribute( "style:type", "char" );
             tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) );
             break;
@@ -614,7 +614,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
     Q_ASSERT( styles.count() == 1 );
     it = styles.begin();
     for ( ; it != styles.end() ; ++it ) {
-        (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
+        (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
         //if ( m_pageLayout.columns > 1 ) TODO add columns element. This is a bit of a hack,
         // which only works as long as we have only one page master
         stylesWriter->endElement();
@@ -629,7 +629,7 @@ void KWord13OasisGenerator::writeStylesXml( void )
     stylesWriter->startElement( "office:master-styles" );
     stylesWriter->startElement( "style:master-page" );
     stylesWriter->addAttribute( "style:name", "Standard" );
-    stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName );
+    stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName );
     stylesWriter->endElement();
     stylesWriter->endElement(); // office:master-styles
 
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.h b/filters/kword/kword1.3/import/kword13oasisgenerator.h
index 3db989f2b..39bc232a7 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.h
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.h
@@ -49,17 +49,17 @@ protected: // Generating phase
     void writePreviewFile(void);
     void writePictures( void );
 protected: // Preparing phase
-    /// Preparing page layout
+    /// Preparing page tqlayout
     void preparePageLayout( void );
     void prepareTextFrameset( KWordTextFrameset* frameset );
     /// Also sets the name of the automatical style
-    void declareLayout( KWord13Layout& layout );
+    void declareLayout( KWord13Layout& tqlayout );
     /// Also sets the name of the automatical style
-    void declareStyle( KWord13Layout& layout );
+    void declareStyle( KWord13Layout& tqlayout );
     double numberOrNull( const TQString& str ) const;
     double positiveNumberOrNull( const TQString& str ) const;
     void fillGenStyleWithFormatOne( const KWord13FormatOneData& one, KoGenStyle& gs, const bool style ) const;
-    void fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const;
+    void fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const;
 protected:
     KWord13Document* m_kwordDocument;
     KoStore* m_store;
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index a3e222903..e3958b45a 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -133,7 +133,7 @@ bool KWord13Parser::startElementLayoutProperty( const TQString& name, const TQXm
     }
     else
     {
-        kdError(30520) << "No current layout for storing property: " << name << endl;
+        kdError(30520) << "No current tqlayout for storing property: " << name << endl;
         return false;
     }
 }
@@ -166,7 +166,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes&
     else if ( stackItem->elementType == KWord13TypeLayout )
     {
         stackItem->elementType = KWord13TypeLayoutFormatOne;
-        return true; // Everything is done directly on the layout
+        return true; // Everything is done directly on the tqlayout
     }
     else if ( stackItem->elementType != KWord13TypeFormatsPlural )
     {
@@ -247,7 +247,7 @@ bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes&
     if ( m_currentLayout )
     {
         // Delete an eventually already existing paragraph (should not happen)
-        kdWarning(30520) << "Current layout already defined!" << endl;
+        kdWarning(30520) << "Current tqlayout already defined!" << endl;
         delete m_currentLayout;
     }
         
@@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri
     }
     else if ( name == "FRAMESTYLE" )
     {
-        // ### TODO, but some of the <STYLE> children are also children of <FRAMESTYLE>, so we have to set it to "ignore"
+        // ### TODO, but some of the <STYLE> tqchildren are also tqchildren 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> children
+        // We just need a separate "type" for the <KEY> tqchildren
         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.at(i).unicode();
+                const ushort uni = ch.tqat(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 754a618e2..7dc81d425 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 children of \<FORMAT id="1"\>
+    /// Process tqchildren of \<FORMAT id="1"\>
     bool startElementFormatOneProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem);
-    /// Process children of \<LAYOUT\> (with exceptions)
+    /// Process tqchildren 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 children of \<DOC\> and which only define document properties
+    /// Process opening tag of some elements that are tqchildren 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\>
@@ -129,7 +129,7 @@ protected:
     KWord13StackItemStack parserStack;
     KWord13Document* m_kwordDocument;
     KWord13Paragraph* m_currentParagraph; ///< Current paragraph
-    KWord13Layout* m_currentLayout; ///< Current layout (or style)
+    KWord13Layout* m_currentLayout; ///< Current tqlayout (or style)
     KWord13Format* m_currentFormat; ///< Current format 
 };
 
diff --git a/filters/kword/kword1.3/import/kword13utils.cpp b/filters/kword/kword1.3/import/kword13utils.cpp
index 0caf48a78..d870f484a 100644
--- a/filters/kword/kword1.3/import/kword13utils.cpp
+++ b/filters/kword/kword1.3/import/kword13utils.cpp
@@ -8,7 +8,7 @@ TQString EscapeXmlDump( const TQString& strIn )
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
             {
diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h
index 26d954eaa..7a81b168d 100644
--- a/filters/kword/latex/export/config.h
+++ b/filters/kword/latex/export/config.h
@@ -22,7 +22,7 @@
 #ifndef __LATEX_CONFIG_H__
 #define __LATEX_CONFIG_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 
 /***********************************************************************/
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "unicode"); }
-		bool mustUseLatin1() const { return (_encoding != "unicode"); }
+		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
+		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kword/latex/export/document.h b/filters/kword/latex/export/document.h
index d6a964591..b2844127a 100644
--- a/filters/kword/latex/export/document.h
+++ b/filters/kword/latex/export/document.h
@@ -23,7 +23,7 @@
 #define __KWORD_LATEX_DOCUMENT_H__
 
 #include <tqptrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "listtable.h"		/* list of tables (another kind of list of elements). */
 #include "key.h"
diff --git a/filters/kword/latex/export/element.h b/filters/kword/latex/export/element.h
index 0db14aced..9374620d4 100644
--- a/filters/kword/latex/export/element.h
+++ b/filters/kword/latex/export/element.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_ELEMENT_H__
 #define __KWORD_ELEMENT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "xmlparser.h"
 #include "border.h"
 
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cc
index 8da25a16e..96b4be4ec 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 children markups --> PAPERBORDERS
+	// Analyse tqchildren 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]{geometry}" << endl;
+		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kword/latex/export/fileheader.h b/filters/kword/latex/export/fileheader.h
index d6843c26d..d837c8287 100644
--- a/filters/kword/latex/export/fileheader.h
+++ b/filters/kword/latex/export/fileheader.h
@@ -22,7 +22,7 @@
 #ifndef __KWORD_FILEHEADER_H__
 #define __KWORD_FILEHEADER_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "xmlparser.h"
 
diff --git a/filters/kword/latex/export/format.h b/filters/kword/latex/export/format.h
index cd82b36ad..c4c3e37ac 100644
--- a/filters/kword/latex/export/format.h
+++ b/filters/kword/latex/export/format.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_FORMAT_H__
 #define __KWORD_FORMAT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kword/latex/export/formula.h b/filters/kword/latex/export/formula.h
index b023cdf67..03ba4bd68 100644
--- a/filters/kword/latex/export/formula.h
+++ b/filters/kword/latex/export/formula.h
@@ -25,7 +25,7 @@
 
 #include "element.h"
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 /***********************************************************************/
 /* Class: Formula                                                      */
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 145b30ed2..079b38d3a 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").arg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("unicode");
+	encodingComboBox->insertItem("tqunicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc
index a72d8c527..f521ec9de 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cc
@@ -25,7 +25,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "kwordlatexexportdia.h"
 
 typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
@@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h
index 4d34e0f05..e7c0312be 100644
--- a/filters/kword/latex/export/latexexport.h
+++ b/filters/kword/latex/export/latexexport.h
@@ -21,7 +21,7 @@
 #define __LATEXEXPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXExport : public KoFilter
 		LATEXExport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXExport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXExport_H__ */
diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui
index 741a9c7ea..8c3835edf 100644
--- a/filters/kword/latex/export/latexexportdia.ui
+++ b/filters/kword/latex/export/latexexportdia.ui
@@ -593,7 +593,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cc
index 05ad34053..f75ac6516 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cc
@@ -24,7 +24,7 @@
 #include <kdebug.h>	/* for kdDebug() stream */
 
 #include "fileheader.h"	/* for _header use */
-#include "layout.h"
+#include "tqlayout.h"
 #include "layout.h"
 
 /* Static Datas */
@@ -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 children markups */
+	/* Analyse tqchildren markups */
 	for(int index= 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("NAME")== 0)
diff --git a/filters/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h
index 04096c776..298b08ff4 100644
--- a/filters/kword/latex/export/layout.h
+++ b/filters/kword/latex/export/layout.h
@@ -23,7 +23,7 @@
 #ifndef __KWORD_LAYOUT_H__
 #define __KWORD_LAYOUT_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <kdebug.h>
 #include "textformat.h"
@@ -93,7 +93,7 @@ class Layout: public TextFormat
 		 * Nothing to do.
 		 */
 		virtual ~Layout() {
-			kdDebug(30522) << "Destruction of a layout." << endl;
+			kdDebug(30522) << "Destruction of a tqlayout." << endl;
 		}
 
 		/**
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 9cc829b57..6003a075b 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"		/* children classes.    */
+#include "format.h"		/* tqchildren 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 children markups */
+	/* Analyse of the tqchildren markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		if(getChildName(balise, index).compare("TEXT")== 0)
@@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise)
 /*******************************************/
 /* AnalyseLayoutPara                       */
 /*******************************************/
-/* Analyse the layout of a para.           */
+/* Analyse the tqlayout of a para.           */
 /* For each format, keep the type (picture,*/
 /* text, variable, footnote) and put the   */
 /* zone in a list.                         */
diff --git a/filters/kword/latex/export/para.h b/filters/kword/latex/export/para.h
index 7d1c0af1d..75c41b3ab 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"*/	/* children class contents the zone (italic, footnote,
+/*#include "listeformat.h"*/	/* tqchildren 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/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc
index 5b254f87a..b67a73855 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cc
@@ -6,7 +6,7 @@
 #include <klocale.h>
 #include <KoFilter.h>
 #include <KoStore.h>
-#include<textstream.h>
+#include<tqtextstream.h>
 
 
 int main(int argc, char* argv[])
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc
index d6141e966..cdcbba6a6 100644
--- a/filters/kword/latex/export/textFrame.cc
+++ b/filters/kword/latex/export/textFrame.cc
@@ -217,7 +217,7 @@ void TextFrame::generate(TQTextStream &out)
 			lastPara->closeList(out, currentPara);
 			_lastTypeEnum = TL_NONE;
 		}
-		/* layout management (left, center, justify, right) */
+		/* tqlayout management (left, center, justify, right) */
 		if((!lastPara->isChapter() && _lastEnv != getNextEnv(_parags, _parags.at()) &&
 			lastPara->notEmpty()) ||
 			_lastEnv != getNextEnv(_parags, _parags.at()))
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc
index 0bf4e436e..a4beb8757 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the unicode table
+/* MEMO: to see the tqunicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */
@@ -85,7 +85,7 @@ bool TextZone::useFormat() const
 /*******************************************/
 /* escapeLatin1                            */
 /*******************************************/
-/* Convert special caracters (unicode) in  */
+/* Convert special caracters (tqunicode) in  */
 /* latex usable caracters.                 */
 /*******************************************/
 TQString TextZone::escapeLatin1(TQString text)
@@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text)
 	};
 
 	TQString escapedText;
-	int unicode;         /* the character to be escaped */
+	int tqunicode;         /* the character to be escaped */
 
 	escapedText = text;  /* copy input text */
 	
@@ -185,8 +185,8 @@ TQString TextZone::escapeLatin1(TQString text)
 
 	for(int index = 0; index < 64; index++)
 	{
-		unicode = CSTART + index;
-		convert(escapedText, unicode, escapes[index]);
+		tqunicode = CSTART + index;
+		convert(escapedText, tqunicode, escapes[index]);
 	}
 
 	convert(escapedText, 0X2020, "\\textdied{}");		/* textcomp */
@@ -259,12 +259,12 @@ TQString TextZone::escapeLatin1(TQString text)
 /* Convert all the instance of one         */
 /* character in latex usable caracter.     */
 /*******************************************/
-void TextZone::convert(TQString& text, int unicode, const char* escape)
+void TextZone::convert(TQString& text, int tqunicode, const char* escape)
 {
 	TQString expression;
 	TQString value;
 
-	expression = TQString("\\x") + value.setNum(unicode, 16);
+	expression = TQString("\\x") + value.setNum(tqunicode, 16);
 
 	if( !TQString(escape).isEmpty() )
 	{
diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h
index 848b276a3..fbc09280b 100644
--- a/filters/kword/latex/export/textzone.h
+++ b/filters/kword/latex/export/textzone.h
@@ -26,7 +26,7 @@
 #ifndef __KWORD_LATEX_TEXTZONE_H__
 #define __KWORD_LATEX_TEXTZONE_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include "textformat.h"
 
@@ -81,7 +81,7 @@ class TextZone: public TextFormat
 		/* ==== Helpfull functions ==== */
 
 		/**
-		 * convert a unicode text in latin1 enconding ala latex.
+		 * convert a tqunicode text in latin1 enconding ala latex.
 		 */
 		TQString escapeLatin1(TQString);
 		
diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cc
index b73788b3e..09a16635a 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the unicode table
+/* MEMO: to see the tqunicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */
diff --git a/filters/kword/latex/export/variablezone.h b/filters/kword/latex/export/variablezone.h
index acdf06e5e..a428984a1 100644
--- a/filters/kword/latex/export/variablezone.h
+++ b/filters/kword/latex/export/variablezone.h
@@ -26,7 +26,7 @@
 #ifndef __KWORD_VARIABLEZONE_H__
 #define __KWORD_VARIABLEZONE_H__
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include "variableformat.h"
 
diff --git a/filters/kword/latex/export/xml2latexparser.h b/filters/kword/latex/export/xml2latexparser.h
index 914cf3a2a..38adc1238 100644
--- a/filters/kword/latex/export/xml2latexparser.h
+++ b/filters/kword/latex/export/xml2latexparser.h
@@ -23,7 +23,7 @@
 #define __XML2LATEXPARSER_H__
 
 #include <tqfile.h>			/* for TQFile class */
-#include <textstream.h>	/* for TQTextStream class */
+#include <tqtextstream.h>	/* for TQTextStream class */
 #include <tqstring.h>		/* for TQString class */
 #include "fileheader.h"
 #include "document.h"
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cc
index 9d83bedb8..9c4c07e4d 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 children = balise.toElement().elementsByTagName(name);
-		if ( children.count() )
-			return children.item(index);
+		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
+		if ( tqchildren.count() )
+			return tqchildren.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList children = balise.childNodes();
-	if ( children.count() )
-		return children.item(index);
+	TQDomNodeList tqchildren = balise.childNodes();
+	if ( tqchildren.count() )
+		return tqchildren.item(index);
 	return TQDomNode();
 }
 
diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cc
index aad270d8e..13685e025 100644
--- a/filters/kword/latex/import/generator/document.cc
+++ b/filters/kword/latex/import/generator/document.cc
@@ -18,7 +18,7 @@
  */
 
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "kdebug.h"
 #include <KoStore.h>
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc
index c1cd74c98..f644910a1 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "lateximportdia.h"
 
 typedef KGenericFactory<LATEXImport, KoFilter> LATEXImportFactory;
@@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h
index 0451ce783..949d7163b 100644
--- a/filters/kword/latex/import/lateximport.h
+++ b/filters/kword/latex/import/lateximport.h
@@ -21,7 +21,7 @@
 #define __LATEXIMPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXImport : public KoFilter
 		LATEXImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~LATEXImport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* __LATEXIMPORT_H__ */
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 8354b9ab1..9489d4919 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -92,8 +92,8 @@ void LATEXImportDia::createDialog()
 
 	TQBoxLayout *langLayout = new TQVBoxLayout(langBox);
 
-	unicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
-	langLayout->addWidget(unicodeRBtn);
+	tqunicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox);
+	langLayout->addWidget(tqunicodeRBtn);
 
 	latin1RBtn = new TQRadioButton(i18n("latin1"), langBox);
 	langLayout->addWidget(latin1RBtn);
@@ -124,7 +124,7 @@ void LATEXImportDia::createDialog()
 	docBox->setButton(0);			/* NEW DOC IS THE DEFAULT. */
 	docLayout->activate();
 
-	/* Display the main layout */
+	/* Display the main tqlayout */
 	mainLayout->addStretch(5);
 	mainLayout->activate();
 }
@@ -138,7 +138,7 @@ void LATEXImportDia::state()
 	else if(embededRBtn == docBox->selected())
 		config.setType(TYPE_EMBEDED);
 
-	if(unicodeRBtn == langBox->selected())
+	if(tqunicodeRBtn == langBox->selected())
 		config.setEncoding(ENC_UNICODE);
 	else if(latin1RBtn == langBox->selected())
 		config.setEncoding(ENC_LATIN1);
diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h
index 237b84b92..b6f83baaf 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -37,7 +37,7 @@
 
 #include <tqwidget.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 
@@ -72,7 +72,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject
 	private:
 		TQVButtonGroup* styleBox,       *langBox,        *docBox;
 		TQRadioButton*  latexStyleRBtn, *kwordStyleRBtn;	/* Document style */
-		TQRadioButton*  unicodeRBtn,    *latin1RBtn;		/* Language       */
+		TQRadioButton*  tqunicodeRBtn,    *latin1RBtn;		/* Language       */
 		TQRadioButton*  newDocRBtn,     *embededRBtn;	/* Latex file     */
 	
 	k_dcop:
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc
index 14abad37a..e25e95ab7 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>* children)
+void Env::setChildren(TQPtrList<Element>* tqchildren)
 {
-	if(children != NULL)
-		_children = *children;
+	if(tqchildren != NULL)
+		_tqchildren = *tqchildren;
 }
 
 void Env::print(int tab)
@@ -58,7 +58,7 @@ void Env::print(int tab)
 	cout << "ENV " << getName().latin1() << "{" << endl;
 	
 	Element* elt;
-	for ( elt = _children.first(); elt; elt = _children.next() )
+	for ( elt = _tqchildren.first(); elt; elt = _tqchildren.next() )
 	{
 		elt->print(tab);
 	}
diff --git a/filters/kword/latex/import/parser/env.h b/filters/kword/latex/import/parser/env.h
index 191c0dd63..cef56b29b 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> _children;
+	TQPtrList<Element> _tqchildren;
 	TQString _name;
 
 	public:
diff --git a/filters/kword/latex/status.html b/filters/kword/latex/status.html
index 0b78eac2b..ea2a527c1 100644
--- a/filters/kword/latex/status.html
+++ b/filters/kword/latex/status.html
@@ -131,14 +131,14 @@
 <B>VERSION 1:</B>
 <table BORDER="0" WIDTH="100%">
 <tr><td>text with accent</td>			<td>DONE</td></tr>
-<tr><td>text with special characters</td>	<td>A LOT OF SPECIAL CHARS SUPPORTED for latin1  (all for unicode)!</td></tr>
-<tr><td>layout</td>				<td>DONE</td></tr>
+<tr><td>text with special characters</td>	<td>A LOT OF SPECIAL CHARS SUPPORTED for latin1  (all for tqunicode)!</td></tr>
+<tr><td>tqlayout</td>				<td>DONE</td></tr>
 <tr><td>title</td>				<td>DONE</td></tr>
 <tr><td>list</td>				<td>DONE</td></tr>
 <tr><td>paper</td>				<td>DONE</td></tr>
 <tr><td>footnote, head</td>			<td>DONE (still a little bug for first foot/header and a line is added)</td></tr>
 <tr><td>comments with kdoc</td>			<td>STARTED</td></tr>
-<tr><td>unicode support</td>			<td>DONE (omega package)</td></tr>
+<tr><td>tqunicode support</td>			<td>DONE (omega package)</td></tr>
 <tr><td>break (line, page)</td>			<td>STARTED</td></tr>
 <tr><td>indent list</td>			<td></td></tr>
 </table>
@@ -209,7 +209,7 @@
 	<ul>
 		<li>features
 		<ul>
-			<li>support of unicode with omega</li>
+			<li>support of tqunicode with omega</li>
 		</ul>
 		</li>
 	</ul>
diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cc
index a47f647da..d3d41ff32 100644
--- a/filters/kword/libexport/KWEFBaseWorker.cc
+++ b/filters/kword/libexport/KWEFBaseWorker.cc
@@ -62,7 +62,7 @@ bool KWEFBaseWorker::doFullAllParagraphs (const TQValueList<ParaData>& paraList)
 	TQValueList<ParaData>::ConstIterator end(paraList.end());
     for (it=paraList.begin();it!=end;++it)
     {
-        if (!doFullParagraph((*it).text,(*it).layout,(*it).formattingList))
+        if (!doFullParagraph((*it).text,(*it).tqlayout,(*it).formattingList))
             return false;
     }
     return true;
diff --git a/filters/kword/libexport/KWEFBaseWorker.h b/filters/kword/libexport/KWEFBaseWorker.h
index 67cdb6912..e2046913a 100644
--- a/filters/kword/libexport/KWEFBaseWorker.h
+++ b/filters/kword/libexport/KWEFBaseWorker.h
@@ -57,7 +57,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
 	virtual bool doVariableSettings (const VariableSettingsData &varSettings);
         virtual bool doFullDocument (const TQValueList<ParaData> &);
         virtual bool doFullAllParagraphs (const TQValueList<ParaData>& paraList);
-        virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+        virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
             const ValueListFormatData& paraFormatDataList);
         virtual bool doFullPaperFormat (const int format,
             const double width, const double height, const int orientation); ///< Like AbiWord's \<papersize\>
@@ -77,7 +77,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker
         virtual bool doCloseBody (void); ///< Like HTML's \</BODY\>
         virtual bool doOpenStyles (void); ///< Like HTML's \<style\>
         virtual bool doCloseStyles (void); ///< Like HTML's \</style\>
-        virtual bool doFullDefineStyle (LayoutData& layout); ///< Defines a single style
+        virtual bool doFullDefineStyle (LayoutData& tqlayout); ///< Defines a single style
         virtual bool doOpenSpellCheckIgnoreList (void); ///< like AbiWord's \<ignorewords\> and KWord's \<SPELLCHECKIGNORELIST\>
         virtual bool doCloseSpellCheckIgnoreList (void); ///< like AbiWord's \</ignorewords\> and Kwords \</SPELLCHECKIGNORELIST\>
         virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); ///< like AbiWord's \<iw\> and Kwords \</SPELLCHECKIGNOREWORD\>
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index a3fca243f..3e9a724e3 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -189,11 +189,11 @@ static void ProcessParagraphTag ( TQDomNode         myNode,
     TQValueList<TagProcessing> tagProcessingList;
     tagProcessingList << TagProcessing ( "TEXT",    ProcessTextTag,     &paraData.text           )
                       << TagProcessing ( "FORMATS", ProcessFormatsTag,  &paraData.formattingList )
-                      << TagProcessing ( "LAYOUT",  ProcessLayoutTag,   &paraData.layout         );
+                      << TagProcessing ( "LAYOUT",  ProcessLayoutTag,   &paraData.tqlayout         );
     
     if ( leader->m_oldSyntax )
     {
-        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.layout.pageBreakBefore ) );
+        tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, &paraData.tqlayout.pageBreakBefore ) );
     }
     ProcessSubtags (myNode, tagProcessingList, leader);
 
@@ -203,9 +203,9 @@ static void ProcessParagraphTag ( TQDomNode         myNode,
     // TODO/FIXME: why !paraData.text.isEmpty()
     if ( paraData.formattingList.isEmpty () && !paraData.text.isEmpty () )
     {
-        if ( paraData.layout.formatData.id == 1 )
+        if ( paraData.tqlayout.formatData.id == 1 )
         {
-            paraData.formattingList << paraData.layout.formatData;
+            paraData.formattingList << paraData.tqlayout.formatData;
         }
         else
         {
@@ -591,11 +591,11 @@ static void ProcessFramesetsTag ( TQDomNode        myNode,
 
 static void ProcessStyleTag (TQDomNode myNode, void *, KWEFKWordLeader *leader )
 {
-    LayoutData layout;
+    LayoutData tqlayout;
 
-    ProcessLayoutTag (myNode, &layout, leader);
+    ProcessLayoutTag (myNode, &tqlayout, leader);
 
-    leader->doFullDefineStyle (layout);
+    leader->doFullDefineStyle (tqlayout);
 }
 
 
@@ -1227,10 +1227,10 @@ bool KWEFKWordLeader::doFullPaperFormatOther ( const int columns, const double c
     return false;
 }
 
-bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &layout )
+bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &tqlayout )
 {
     if ( m_worker )
-        return m_worker->doFullDefineStyle (layout);
+        return m_worker->doFullDefineStyle (tqlayout);
 
     return false;
 }
@@ -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")
-            .arg( errorLine ).arg( errorColumn ).arg(i18n( "TQXml", errorMsg.utf8() ) ),
+            .tqarg( errorLine ).tqarg( errorColumn ).tqarg(i18n( "TQXml", errorMsg.utf8() ) ),
             i18n("KWord Export Filter Library"), 0 );
         return false;
     }
@@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array)
     return true;
 }
 
-KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain,
+KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain,
     const TQCString& from, const TQCString& to)
 {
     if ( from != "application/x-kword" )
diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h
index fc7e787a9..78ce13488 100644
--- a/filters/kword/libexport/KWEFKWordLeader.h
+++ b/filters/kword/libexport/KWEFKWordLeader.h
@@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
     public:
         void setWorker ( KWEFBaseWorker *newWorker );
         KWEFBaseWorker *getWorker(void) const;
-        KoFilter::ConversionStatus convert( KoFilterChain* chain,
+        KoFilter::ConversiontqStatus convert( KoFilterChain* chain,
             const TQCString& from, const TQCString& to);
     public: // ### TODO: where to put in the end?
         void createBookmarkFormatData( ParaData& paraData );
@@ -63,7 +63,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader
         bool doCloseBody (void);
         bool doOpenStyles (void);
         bool doCloseStyles (void);
-        bool doFullDefineStyle (LayoutData& layout);
+        bool doFullDefineStyle (LayoutData& tqlayout);
         bool doOpenSpellCheckIgnoreList (void);
         bool doCloseSpellCheckIgnoreList (void);
         bool doFullSpellCheckIgnoreWord (const TQString& ignoreword);
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index 682606feb..dbee22d07 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -412,7 +412,7 @@ public:
     virtual ~TabulatorList(void) {}
 };
 
-/// Paragraph layout
+/// Paragraph tqlayout
 class LayoutData
 {
 public:
@@ -428,7 +428,7 @@ public:
 
     TQString     styleName;
     TQString     styleFollowing;
-    TQString     alignment;      ///< left, right, center, justify
+    TQString     tqalignment;      ///< left, right, center, justify
     CounterData counter;
     FormatData  formatData;
     double      indentFirst;    ///< indentation correction of first line (can be negative!)
@@ -459,7 +459,7 @@ struct ParaData
 {
     TQString                    text;
     ValueListFormatData        formattingList;
-    LayoutData                 layout;
+    LayoutData                 tqlayout;
 };
 
 struct HeaderFooterData
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc
index 32b5eac2d..56e2b669b 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <KoPageLayout.h>
 
@@ -36,7 +36,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
             {
@@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec,
                 {
                     if (!codec->canEncode(ch))
                     {
-                        strReturn+=TQString("&#%1;").arg(ch.unicode());
+                        strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
                         break;
                     }
                 }
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc
index 3a626f7f1..ed5a7bfcf 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 children are directly children of <FORMAT id="4">
+// ### TODO: some files have not a <VARIABLE> tag but its supposed tqchildren are directly tqchildren of <FORMAT id="4">
 static void ProcessVariableTag (TQDomNode myNode, void* tagData, KWEFKWordLeader* leader)
 {
     VariableData *variable = (VariableData *) tagData;
@@ -607,7 +607,7 @@ static void SubProcessFormatSixTag(TQDomNode myNode,
         TQString instance;
 
         TQValueList<TagProcessing> tagProcessingList;
-        // TODO: We can have all layout information as in regular texts
+        // TODO: We can have all tqlayout information as in regular texts
         //       They simply apply to the table frames
         //       FONT is just the first that we've come across so far
         tagProcessingList << TagProcessing ( "FONT" )
@@ -765,12 +765,12 @@ static void ProcessLayoutTabulatorTag ( TQDomNode myNode, void *tagData, KWEFKWo
 
 static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("first" , layout->indentFirst );
-    attrProcessingList << AttrProcessing ("left"  , layout->indentLeft  );
-    attrProcessingList << AttrProcessing ("right" , layout->indentRight );
+    attrProcessingList << AttrProcessing ("first" , tqlayout->indentFirst );
+    attrProcessingList << AttrProcessing ("left"  , tqlayout->indentLeft  );
+    attrProcessingList << AttrProcessing ("right" , tqlayout->indentRight );
     ProcessAttributes (myNode, attrProcessingList);
 
     AllowNoSubtags (myNode, leader);
@@ -779,11 +779,11 @@ static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader
 
 static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ("after" ,  layout->marginBottom );
-    attrProcessingList << AttrProcessing ("before" , layout->marginTop    );
+    attrProcessingList << AttrProcessing ("after" ,  tqlayout->marginBottom );
+    attrProcessingList << AttrProcessing ("before" , tqlayout->marginTop    );
     ProcessAttributes (myNode, attrProcessingList);
 
     AllowNoSubtags (myNode, leader);
@@ -792,14 +792,14 @@ static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordL
 
 static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQString strBefore, strAfter;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "linesTogether",       layout->keepLinesTogether  );
-    attrProcessingList << AttrProcessing ( "hardFrameBreak",      layout->pageBreakBefore );
-    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", layout->pageBreakAfter  );
+    attrProcessingList << AttrProcessing ( "linesTogether",       tqlayout->keepLinesTogether  );
+    attrProcessingList << AttrProcessing ( "hardFrameBreak",      tqlayout->pageBreakBefore );
+    attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", tqlayout->pageBreakAfter  );
     attrProcessingList << AttrProcessing ( "keepWithNext" ); // RTF import filter
     ProcessAttributes (myNode, attrProcessingList);
 
@@ -809,21 +809,21 @@ static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordL
 
 static void ProcessShadowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader)
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     int red=0;
     int green=0;
     int blue=0;
 
     TQValueList<AttrProcessing> attrProcessingList;
-    attrProcessingList << AttrProcessing ( "distance", layout->shadowDistance );
-    attrProcessingList << AttrProcessing ( "direction", layout->shadowDirection );
+    attrProcessingList << AttrProcessing ( "distance", tqlayout->shadowDistance );
+    attrProcessingList << AttrProcessing ( "direction", tqlayout->shadowDirection );
     attrProcessingList << AttrProcessing ( "red",      red   );
     attrProcessingList << AttrProcessing ( "green",    green );
     attrProcessingList << AttrProcessing ( "blue",     blue  );
     ProcessAttributes (myNode, attrProcessingList);
 
-    layout->shadowColor.setRgb(red,green,blue);
+    tqlayout->shadowColor.setRgb(red,green,blue);
 
     AllowNoSubtags (myNode, leader);
 }
@@ -856,7 +856,7 @@ static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLead
 
 static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
     TQString oldValue, spacingType;
     double spacingValue;
 
@@ -873,9 +873,9 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
     {
         // for old format
         if( oldValue == "oneandhalf" )
-            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( oldValue == "double" )
-            layout->lineSpacingType = LayoutData::LS_DOUBLE;
+            tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
         else
         {
             bool ok = false;
@@ -883,38 +883,38 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea
             if ( ok && ( size >= 0.0 ) ) // 0 is allowed but negative values are not
             {
                 // We have a valid size
-                layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-                layout->lineSpacing     = size;
+                tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+                tqlayout->lineSpacing     = size;
             }
             else
-               layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+               tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
          }
     }
     else
     {
         // for new format
         if( spacingType == "oneandhalf" )
-            layout->lineSpacingType = LayoutData::LS_ONEANDHALF;
+            tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF;
         else if ( spacingType == "double" )
-            layout->lineSpacingType = LayoutData::LS_DOUBLE;
+            tqlayout->lineSpacingType = LayoutData::LS_DOUBLE;
         else if ( spacingType == "custom" )
-            layout->lineSpacingType = LayoutData::LS_CUSTOM;
+            tqlayout->lineSpacingType = LayoutData::LS_CUSTOM;
         else if ( spacingType == "atleast" )
-            layout->lineSpacingType = LayoutData::LS_ATLEAST;
+            tqlayout->lineSpacingType = LayoutData::LS_ATLEAST;
         else if ( spacingType == "multiple" )
-            layout->lineSpacingType = LayoutData::LS_MULTIPLE;
+            tqlayout->lineSpacingType = LayoutData::LS_MULTIPLE;
         else if ( spacingType == "fixed" )
-            layout->lineSpacingType = LayoutData::LS_FIXED;
+            tqlayout->lineSpacingType = LayoutData::LS_FIXED;
         else
-             layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
-        layout->lineSpacing = spacingValue;
+             tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace
+        tqlayout->lineSpacing = spacingValue;
     }
 }
 
 static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ )
 {
     // <LINESPACE> is an old tag, of before syntax 1
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
     double spacingValue = 0.0;
 
     TQValueList<AttrProcessing> attrProcessingList;
@@ -923,13 +923,13 @@ static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeade
     attrProcessingList << AttrProcessing ( "inch" );
     ProcessAttributes (myNode, attrProcessingList);
 
-    layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
-    layout->lineSpacing     = spacingValue;
+    tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom
+    tqlayout->lineSpacing     = spacingValue;
 }
 
 static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader )
 {
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     TQString oldAlign, normalAlign;
 
@@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l
     {
         if ( oldAlign.isEmpty() )
         {
-            layout->alignment = "left"; // KWord 0.8 did not support right-to-left
+            tqlayout->tqalignment = "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;
-                layout->alignment = "left"; // Unknown, so assume left
+                tqlayout->tqalignment = "left"; // Unknown, so assume left
             }
             else
             {
                 const char* flows[]={"left", "right", "center", "justify" };
-                layout->alignment = flows[ align ];
+                tqlayout->tqalignment = flows[ align ];
             }
         }
-        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << layout->alignment << endl;
+        kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->tqalignment << endl;
     }
     else
     {
-        layout->alignment = normalAlign;
+        tqlayout->tqalignment = normalAlign;
     }
 
 }
@@ -981,36 +981,36 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     attrProcessingList << AttrProcessing ( "outline" ); // Only in <STYLE>
     ProcessAttributes (myNode, attrProcessingList);
 
-    LayoutData *layout = (LayoutData *) tagData;
+    LayoutData *tqlayout = (LayoutData *) tagData;
 
     ValueListFormatData formatDataList;
 
     TQValueList<TagProcessing> tagProcessingList;
-    tagProcessingList << TagProcessing ( "NAME",         ProcessStringValueTag,       &layout->styleName           );
-    tagProcessingList << TagProcessing ( "FOLLOWING",    ProcessFollowingTag,         &layout->styleFollowing      );
-    tagProcessingList << TagProcessing ( "FLOW",         ProcessFlowTag,              layout );
-    tagProcessingList << TagProcessing ( "INDENTS",      ProcessIndentsTag,           layout              );
-    tagProcessingList << TagProcessing ( "OFFSETS",      ProcessLayoutOffsetTag,      layout              );
-    tagProcessingList << TagProcessing ( "LINESPACING",  ProcessLinespacingTag,       layout              );
-    tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag,      layout              );
-    tagProcessingList << TagProcessing ( "LEFTBORDER",   ProcessAnyBorderTag,         &layout->leftBorder          );
-    tagProcessingList << TagProcessing ( "RIGHTBORDER",  ProcessAnyBorderTag,         &layout->rightBorder         );
-    tagProcessingList << TagProcessing ( "TOPBORDER",    ProcessAnyBorderTag,         &layout->topBorder           );
-    tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag,         &layout->bottomBorder        );
-    tagProcessingList << TagProcessing ( "COUNTER",      ProcessCounterTag,           &layout->counter    );
+    tagProcessingList << TagProcessing ( "NAME",         ProcessStringValueTag,       &tqlayout->styleName           );
+    tagProcessingList << TagProcessing ( "FOLLOWING",    ProcessFollowingTag,         &tqlayout->styleFollowing      );
+    tagProcessingList << TagProcessing ( "FLOW",         ProcessFlowTag,              tqlayout );
+    tagProcessingList << TagProcessing ( "INDENTS",      ProcessIndentsTag,           tqlayout              );
+    tagProcessingList << TagProcessing ( "OFFSETS",      ProcessLayoutOffsetTag,      tqlayout              );
+    tagProcessingList << TagProcessing ( "LINESPACING",  ProcessLinespacingTag,       tqlayout              );
+    tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag,      tqlayout              );
+    tagProcessingList << TagProcessing ( "LEFTBORDER",   ProcessAnyBorderTag,         &tqlayout->leftBorder          );
+    tagProcessingList << TagProcessing ( "RIGHTBORDER",  ProcessAnyBorderTag,         &tqlayout->rightBorder         );
+    tagProcessingList << TagProcessing ( "TOPBORDER",    ProcessAnyBorderTag,         &tqlayout->topBorder           );
+    tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag,         &tqlayout->bottomBorder        );
+    tagProcessingList << TagProcessing ( "COUNTER",      ProcessCounterTag,           &tqlayout->counter    );
     tagProcessingList << TagProcessing ( "FORMAT",       ProcessFormatTag,            &formatDataList     );
-    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &layout->tabulatorList       );
-    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            layout                       );
+    tagProcessingList << TagProcessing ( "TABULATOR",    ProcessLayoutTabulatorTag,   &tqlayout->tabulatorList       );
+    tagProcessingList << TagProcessing ( "SHADOW",       ProcessShadowTag,            tqlayout                       );
 
     if ( leader->m_oldSyntax )
     {
-        layout->indentLeft = 0.0; // ### TODO: needed or not?
+        tqlayout->indentLeft = 0.0; // ### TODO: needed or not?
         tagProcessingList
-            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &layout->marginTop )
-            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &layout->marginBottom )
-            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &layout->indentLeft )
-            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &layout->indentFirst )
-            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   layout )
+            << TagProcessing ( "OHEAD",  ProcessOldLayoutChildTag, &tqlayout->marginTop )
+            << TagProcessing ( "OFOOT",  ProcessOldLayoutChildTag, &tqlayout->marginBottom )
+            << TagProcessing ( "ILEFT",  ProcessOldLayoutChildTag, &tqlayout->indentLeft )
+            << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &tqlayout->indentFirst )
+            << TagProcessing ( "LINESPACE", ProcessLineSpaceTag,   tqlayout )
             ;
     }
 
@@ -1023,7 +1023,7 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
     }
     else
     {
-        layout->formatData = formatDataList.first ();
+        tqlayout->formatData = formatDataList.first ();
 
         if ( formatDataList.count () > 1 )
         {
@@ -1031,10 +1031,10 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader
         }
     }
 
-    if ( layout->styleName.isEmpty () )
+    if ( tqlayout->styleName.isEmpty () )
     {
-        layout->styleName = "Standard";
-        kdWarning (30508) << "Empty layout name!" << endl;
+        tqlayout->styleName = "Standard";
+        kdWarning (30508) << "Empty tqlayout name!" << endl;
     }
 
 }
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 595c026cb..6bd895b97 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::alignment( int jc ) {
+TQString Conversion::tqalignment( 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 f8610415a..fd30c69fe 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 alignment code to string
-    TQString alignment( int jc );
+    // Convert tqalignment code to string
+    TQString tqalignment( 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 ab70c79a4..5044f0233 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").arg( ++m_endNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with KWordTextHandler::footnoteFound
-        framesetElement.setAttribute("name", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
+        framesetElement.setAttribute("name", i18n("Footnote %1").tqarg( ++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").arg(tableName).arg(row).arg(column);
+    TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column);
     framesetElement.setAttribute( "name", name );
     framesetElement.setAttribute( "row", row );
     framesetElement.setAttribute( "col", column );
diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp
index 714db2742..3be95f7a2 100644
--- a/filters/kword/msword/mswordimport.cpp
+++ b/filters/kword/msword/mswordimport.cpp
@@ -41,7 +41,7 @@ MSWordImport::~MSWordImport()
 {
 }
 
-KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to )
 {
     // check for proper conversion
     if ( to != "application/x-kword" || from != "application/msword" )
diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h
index ae348fc72..73a568ffd 100644
--- a/filters/kword/msword/mswordimport.h
+++ b/filters/kword/msword/mswordimport.h
@@ -33,7 +33,7 @@ public:
     MSWordImport( KoFilter* parent, const char* name, const TQStringList& );
     virtual ~MSWordImport();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 242a6d392..07eb3da72 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").arg( ++m_endNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) );
     else
         // Keep name in sync with Document::startFootnote
-        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").arg( ++m_footNoteNumber ) );
+        footnoteElem.setAttribute( "frameset", i18n("Footnote %1").tqarg( ++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").arg( ++s_tableNumber );
+        m_currentTable->name = i18n("Table %1").tqarg( ++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").arg( ++s_pictureNumber );
+    TQString frameName = i18n("Picture %1").tqarg( ++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").arg(dist).arg(dist);
+            css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist);
         }
         shadowElem.setAttribute( "text-shadow", css );
         format.appendChild( shadowElem );
@@ -568,16 +568,16 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
 
     m_paragraph = TQString( "" );
     m_index = 0;
-    m_oldLayout = layoutElement; // Keep a reference to the old layout for some hacks
+    m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks
 }
 
 void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::Word97::PAP& pap = paragraphProperties.pap();
-    // Always write out the alignment, it's required
+    // Always write out the tqalignment, it's required
     TQDomElement flowElement = mainDocument().createElement("FLOW");
-    TQString alignment = Conversion::alignment( pap.jc );
-    flowElement.setAttribute( "align", alignment );
+    TQString tqalignment = Conversion::tqalignment( pap.jc );
+    flowElement.setAttribute( "align", tqalignment );
     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;
@@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P
             // which kword doesn't support. We map it to 0 with a clever '%4' :)
             tabElement.setAttribute( "type", td.tbd.jc % 4 );
             int filling = 0;
-            double width = 0.5; // default kword value, see koparaglayout.cc
+            double width = 0.5; // default kword value, see koparagtqlayout.cc
             switch ( td.tbd.tlc ) {
             case 1: // dots
             case 2: // hyphenated
@@ -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->alignment() is not supported in KWord
+        // listInfo->tqalignment() 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 c75cfd4ea..ebea5202c 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_ (children) of a <LAYOUT> or <STYLE> tag, from the given parag props
+    // Write the _contents_ (tqchildren) 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/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index bf9c06686..460677cbc 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <klocale.h>
 #include <kcharsets.h>
@@ -29,7 +29,7 @@
 #include <ImportDialogUI.h>
 #include <ImportDialog.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqcombobox.h>
diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui
index bed2bad1a..db7dcc208 100644
--- a/filters/kword/mswrite/ImportDialogUI.ui
+++ b/filters/kword/mswrite/ImportDialogUI.ui
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -218,7 +218,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -237,7 +237,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index b645649b3..02d980ef2 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqfont.h>
 #include <tqimage.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
 
@@ -1286,7 +1286,7 @@ public:
 
 	bool processTable (const Table &table)
 	{
-		// just dump the table out for now (no layout)
+		// just dump the table out for now (no tqlayout)
 		for (TQValueList <TableCell>::ConstIterator it = table.cellList.begin ();
 				it != table.cellList.end ();
 				it++)
@@ -1417,12 +1417,12 @@ public:
 	bool doFullParagraph (const ParaData &paraData)
 	{
 		return doFullParagraph (paraData.text,
-							 			paraData.layout,
+							 			paraData.tqlayout,
 										paraData.formattingList);
 	}
 
 	bool doFullParagraph (const TQString &paraText,
-						 			const LayoutData &layout,
+						 			const LayoutData &tqlayout,
 									const ValueListFormatData &paraFormatDataList)
 	{
 		MSWrite::FormatParaProperty paraProp;
@@ -1446,34 +1446,34 @@ public:
 		paraProp.setIsText (true);
 
 		// Alignment
-		if (!layout.alignment.isEmpty ())
+		if (!tqlayout.tqalignment.isEmpty ())
 		{
-			if (layout.alignment == "left")
+			if (tqlayout.tqalignment == "left")
 				// quite useless since MSWrite::Alignment::Left is the default anyway
-				paraProp.setAlignment (MSWrite::Alignment::Left);
-			else if (layout.alignment == "right")
-				paraProp.setAlignment (MSWrite::Alignment::Right);
-			else if (layout.alignment == "center")
-				paraProp.setAlignment (MSWrite::Alignment::Center);
-			else if (layout.alignment == "justify")
-				paraProp.setAlignment (MSWrite::Alignment::Justify);
+				paraProp.tqsetAlignment (MSWrite::Alignment::Left);
+			else if (tqlayout.tqalignment == "right")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Right);
+			else if (tqlayout.tqalignment == "center")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Center);
+			else if (tqlayout.tqalignment == "justify")
+				paraProp.tqsetAlignment (MSWrite::Alignment::Justify);
 			else
-				kdWarning (30509) << "Unknown Alignment: " << layout.alignment << endl;
+				kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl;
 		}
 
 		// Indentation
-		if (layout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (layout.indentFirst)));
-		if (layout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (layout.indentLeft)));
-		if (layout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (layout.indentRight)));
+		if (tqlayout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (tqlayout.indentFirst)));
+		if (tqlayout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (tqlayout.indentLeft)));
+		if (tqlayout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (tqlayout.indentRight)));
 	#if 0
-		kdDebug (30509) << "Indent: " << Point2Twip (layout.indentFirst) << " "
-												<< Point2Twip (layout.indentLeft) << " "
-												<< Point2Twip (layout.indentRight) << endl;
+		kdDebug (30509) << "Indent: " << Point2Twip (tqlayout.indentFirst) << " "
+												<< Point2Twip (tqlayout.indentLeft) << " "
+												<< Point2Twip (tqlayout.indentRight) << endl;
 	#endif
 
 		// Line Spacing
 		MSWrite::Word lineSpacing = MSWrite::LineSpacing::Normal;
-		switch (layout.lineSpacingType)
+		switch (tqlayout.lineSpacingType)
 		{
 		case LayoutData::LS_SINGLE:
 			lineSpacing = MSWrite::LineSpacing::Normal;
@@ -1487,12 +1487,12 @@ public:
 		case LayoutData::LS_CUSTOM:
 		case LayoutData::LS_FIXED:
 		case LayoutData::LS_ATLEAST:
-			lineSpacing = getClosestLineSpacing (layout.lineSpacing);
+			lineSpacing = getClosestLineSpacing (tqlayout.lineSpacing);
 			break;
 		case LayoutData::LS_MULTIPLE:
 			break;
 		default:
-			kdWarning (30509) << "unknown lineSpacingType \'" << layout.lineSpacingType << "\'" << endl;
+			kdWarning (30509) << "unknown lineSpacingType \'" << tqlayout.lineSpacingType << "\'" << endl;
 		}
 		paraProp.setLineSpacing (lineSpacing);
 
@@ -1500,8 +1500,8 @@ public:
 		// It seems that Write applies the 1st paragraph's Tabulator settings to the _entire_ document
 		// Word97 and KWord, however, will treat them like a Paragraph Property
 		int numTabs = 0;
-		for (TabulatorList::ConstIterator tabIt = layout.tabulatorList.begin ();
-				tabIt != layout.tabulatorList.end ();
+		for (TabulatorList::ConstIterator tabIt = tqlayout.tabulatorList.begin ();
+				tabIt != tqlayout.tabulatorList.end ();
 				tabIt++)
 		{
 			MSWrite::FormatParaPropertyTabulator tab;
@@ -1544,7 +1544,7 @@ public:
 
 		// get this paragraph's "default formatting"
 		MSWrite::FormatCharProperty charPropDefault;
-		processFormatData (charPropDefault, layout.formatData.text);
+		processFormatData (charPropDefault, tqlayout.formatData.text);
 
 		MSWrite::DWord uptoByte = 0;	// relative to start of KWord paragraph
 		MSWrite::DWord numBytes = paraText.length ();	// relative to start of KWord paragraph
@@ -1561,18 +1561,18 @@ public:
 			if (!m_generator->writeCharInfoBegin (&charPropDefault)) return false;
 
 			// page break at start of paragraph?
-			if (layout.pageBreakBefore)
+			if (tqlayout.pageBreakBefore)
 				if (!m_generator->writePageBreak ()) return false;
 
 			// counter data
-			processCounter (layout.counter);
+			processCounter (tqlayout.counter);
 
 			// end of line
 			if (!m_generator->writeCarriageReturn ()) return false;
 			if (!m_generator->writeNewLine (true/*end of paragraph*/)) return false;
 
 			// page break at end of paragraph?
-			if (layout.pageBreakAfter)
+			if (tqlayout.pageBreakAfter)
 				if (!m_generator->writePageBreak ()) return false;
 
 			// write default character property end
@@ -1595,11 +1595,11 @@ public:
 				if (uptoByte == 0)
 				{
 					// page break at start of paragraph?
-					if (layout.pageBreakBefore)
+					if (tqlayout.pageBreakBefore)
 						if (!m_generator->writePageBreak ()) return false;
 
 					// counter data
-					processCounter (layout.counter);
+					processCounter (tqlayout.counter);
 				}
 
 				// yes, this is slightly premature but it doesn't matter
@@ -1733,7 +1733,7 @@ public:
 					}
 
 					// page break at end of paragraph?
-					if (layout.pageBreakAfter)
+					if (tqlayout.pageBreakAfter)
 						if (!m_generator->writePageBreak ()) return false;
 				}
 
@@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport ()
 {
 }
 
-KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
@@ -1929,7 +1929,7 @@ KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const
 		return KoFilter::OutOfMemory;
 	}
 
-	KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to);
+	KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to);
 	int errorCode = worker->getError ();
 
 	delete leader;
diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h
index adfbc4ba9..796ce705f 100644
--- a/filters/kword/mswrite/mswriteexport.h
+++ b/filters/kword/mswrite/mswriteexport.h
@@ -31,7 +31,7 @@ public:
 	MSWriteExport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteExport ();
 
-	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
 };
 
 #endif // MSWRITEEXPORT_H
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc
index a1ccc150b..379d3c015 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cc
@@ -27,8 +27,8 @@
 #include <tqfile.h>
 #include <tqobject.h>
 #include <tqstring.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport ()
 	delete m_device;
 }
 
-KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
+KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to)
 {
 	kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite "
 			  				<< MSWrite::Version << endl;
diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h
index 8d59fe38e..65be7e7aa 100644
--- a/filters/kword/mswrite/mswriteimport.h
+++ b/filters/kword/mswrite/mswriteimport.h
@@ -40,7 +40,7 @@ public:
 	MSWriteImport (KoFilter *parent, const char *name, const TQStringList &);
 	virtual ~MSWriteImport ();
 
-	KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to);
+	KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to);
 	
 	void sigProgress (const int value)
 	{
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 5a8bddd15..6ede1caf4 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 (alignment, linespacing, indentation, tabulation) <br>
+			- Paragraph formatting (tqalignment, 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 alignment
+		- the underlying code to read in the format is there but the filter can only do plain text with tqalignment
 		<br>
 	</td>
     </tr>
diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h
index 5aa4f6a39..af687b3a3 100644
--- a/filters/kword/mswrite/structures.h
+++ b/filters/kword/mswrite/structures.h
@@ -378,7 +378,7 @@ namespace MSWrite
 		
 		// convenience functions
 		Byte getAlign (void) const	{	return getAlignment ();	}
-		void setAlign (const Byte val)	{	setAlignment (val);	}
+		void setAlign (const Byte val)	{	tqsetAlignment (val);	}
 		
 		Short getLeftIndentFirstLine (const bool purist = false) const
 		{
diff --git a/filters/kword/mswrite/structures_generated.cpp b/filters/kword/mswrite/structures_generated.cpp
index c443f252f..6b6e5575c 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;						// alignment
+		m_data [2] = 0;						// tqalignment
 		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_alignment = (Byte) (0);
+		m_tqalignment = (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_alignment = rhs.m_alignment;
+		m_tqalignment = rhs.m_tqalignment;
 		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_alignment will not be checked
+		// m_tqalignment 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_alignment, m_data + 2);
-		signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);
+		ReadByte (m_tqalignment, m_data + 2);
+		signalHaveSetData (m_tqalignment == 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_alignment, m_data + 2);
+		WriteByte (m_tqalignment, 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 feb0f5639..0ee985ce1 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -183,7 +183,7 @@ namespace MSWrite
 		void setNumPages (const Word val)	{	m_numPages = val;	}
 	};
 	
-	// Page layout information (margins, dimensions, ...)
+	// Page tqlayout information (margins, dimensions, ...)
 	class PageLayoutGenerated : public NeedsDevice
 	{
 	public:
@@ -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_alignment;
+		Byte m_tqalignment;
 		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_alignment;	}
-		void setAlignment (const Byte val)	{	m_alignment = val;	signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/);	}
+		Byte getAlignment (void) const	{	return m_tqalignment;	}
+		void tqsetAlignment (const Byte val)	{	m_tqalignment = val;	signalHaveSetData (m_tqalignment == 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 2e6e515ec..ff9c82765 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -33,7 +33,7 @@
 #include <tqmap.h>
 #include <tqiodevice.h>
 #include <tqbuffer.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 #include <kdebug.h>
@@ -96,7 +96,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
         }
 
         // ### TODO: would be switch/case or if/elseif the best?
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 9: // Tab
             {
@@ -180,7 +180,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const
         case 30:
         case 31:
             {
-                kdWarning(30518) << "Not allowed XML character: " << ch.unicode() << endl;
+                kdWarning(30518) << "Not allowed XML character: " << ch.tqunicode() << endl;
                 strReturn += '?';
                 break;
             }
@@ -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").arg( m_tableNumber ) );
+    const TQString translatedName( i18n( "Object name", "Table %1").tqarg( m_tableNumber ) );
     const TQString automaticFrameStyle ( makeAutomaticStyleName( "TableFrame", m_textBoxNumber ) ); // It also increases m_textBoxNumber
-    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").arg( m_textBoxNumber ) );
+    const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").tqarg( m_textBoxNumber ) );
 
     kdDebug(30518) << "Processing table " << anchor.key.toString() << " => " << tableName << endl;
 
@@ -1729,38 +1729,38 @@ void OOWriterWorker::processParagraphData ( const TQString &paraText,
 }
 
 TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force, TQString& styleKey)
+    const LayoutData& tqlayout, const bool force, TQString& styleKey)
 {
     TQString props; // Props has to remain empty, if there is no difference.
 
-    styleKey += layout.styleName;
+    styleKey += tqlayout.styleName;
     styleKey += ',';
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         // 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 (layout.alignment == "left")
+        if (tqlayout.tqalignment == "left")
         {
             props += "fo:text-align=\"start\" ";
             styleKey += 'L';
         }
-        else if (layout.alignment == "right")
+        else if (tqlayout.tqalignment == "right")
         {
             props += "fo:text-align=\"end\" ";
             styleKey += 'R';
         }
-        else if (layout.alignment == "center")
+        else if (tqlayout.tqalignment == "center")
         {
             props += "fo:text-align=\"center\" ";
             styleKey += 'C';
         }
-        else if (layout.alignment == "justify")
+        else if (tqlayout.tqalignment == "justify")
         {
             props += "fo:text-align=\"justify\" ";
             styleKey += 'J';
         }
-        else if (layout.alignment == "auto")
+        else if (tqlayout.tqalignment == "auto")
         {
             props += "fo:text-align=\"start\" ";
 #ifndef STRICT_OOWRITER_VERSION_1
@@ -1770,68 +1770,68 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         }
         else
         {
-            kdWarning(30518) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30518) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
     styleKey += ',';
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
-        props += TQString("fo:margin-left=\"%1pt\" ").arg(layout.indentLeft);
-        styleKey += TQString::number(layout.indentLeft);
+        props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft);
+        styleKey += TQString::number(tqlayout.indentLeft);
     }
 
     styleKey += ',';
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
-        props += TQString("fo:margin-right=\"%1pt\" ").arg(layout.indentRight);
-        styleKey += TQString::number(layout.indentRight);
+        props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight);
+        styleKey += TQString::number(tqlayout.indentRight);
     }
 
     styleKey += ',';
 
-    if (force || (layoutOrigin.indentLeft!=layout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "fo:text-indent=\"";
-        props += TQString::number(layout.indentFirst);
+        props += TQString::number(tqlayout.indentFirst);
         props += "\" ";
-        styleKey += TQString::number(layout.indentFirst);
+        styleKey += TQString::number(tqlayout.indentFirst);
     }
 
     styleKey += ',';
 
-    if ((layout.marginBottom>=0.0)
-        && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) )
+    if ((tqlayout.marginBottom>=0.0)
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
-       props += TQString("fo:margin-bottom=\"%1pt\" ").arg(layout.marginBottom);
-       styleKey += TQString::number(layout.marginBottom);
+       props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom);
+       styleKey += TQString::number(tqlayout.marginBottom);
     }
 
     styleKey += ',';
 
-    if ((layout.marginTop>=0.0)
-        && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) )
+    if ((tqlayout.marginTop>=0.0)
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
-       props += TQString("fo:margin-top=\"%1pt\" ").arg(layout.marginTop);
-       styleKey += TQString::number(layout.marginTop);
+       props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop);
+       styleKey += TQString::number(tqlayout.marginTop);
     }
 
     styleKey += ',';
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        switch ( layout.lineSpacingType )
+        switch ( tqlayout.lineSpacingType )
         {
         case LayoutData::LS_CUSTOM:
             {
                 // We have a custom line spacing (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 props += "style:line-spacing=\"";
                 props += height;
                 props += "pt\" ";
@@ -1860,7 +1860,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_MULTIPLE:
             {
                 // OOWriter 1.1 only allows up to 200%
-                const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) );
+                const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) );
                 props += "fo:line-height=\"";
                 props += mult;
                 props += "%\" ";
@@ -1871,7 +1871,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_FIXED:
             {
                 // We have a fixed line height (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 props += "fo:line-height=\"";
                 props += height;
                 props += "pt\" ";
@@ -1882,7 +1882,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
         case LayoutData::LS_ATLEAST:
             {
                 // We have a at-least line height (in points)
-                const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding?
+                const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding?
                 props += "style:line-height-at-least=\"";
                 props += height;
                 props += "pt\" ";
@@ -1892,7 +1892,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
             }
         default:
             {
-                kdWarning(30518) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+                kdWarning(30518) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
                 break;
             }
         }
@@ -1900,7 +1900,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     
     styleKey += ',';
 
-    if ( layout.pageBreakBefore )
+    if ( tqlayout.pageBreakBefore )
     {
         // We have a page break before the paragraph
         props += "fo:page-break-before=\"page\" ";
@@ -1909,7 +1909,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
 
     styleKey += ',';
 
-    if ( layout.pageBreakAfter )
+    if ( tqlayout.pageBreakAfter )
     {
         // We have a page break after the paragraph
         props += "fo:page-break-after=\"page\" ";
@@ -1918,20 +1918,20 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
 
     styleKey += '@'; // A more visible seperator
 
-    props += textFormatToStyle(layoutOrigin.formatData.text,layout.formatData.text,force,styleKey);
+    props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
 
     props += ">";
 
     styleKey += '@'; // A more visible seperator
 
     // ### TODO/FIXME: what if all tabulators must be erased?
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "\n    <style:tab-stops>\n";
         TabulatorList::ConstIterator it;
-		TabulatorList::ConstIterator end(layout.tabulatorList.end());
-        for (it=layout.tabulatorList.begin();it!=end;++it)
+		TabulatorList::ConstIterator end(tqlayout.tabulatorList.end());
+        for (it=tqlayout.tabulatorList.begin();it!=end;++it)
         {
             props+="     <style:tab-stop style:position=\"";
             props += TQString::number((*it).m_ptpos);
@@ -1966,27 +1966,27 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     return props;
 }
 
-bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout,
+bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
     const ValueListFormatData& paraFormatDataList)
 {
-    const bool header = ( (layout.counter.numbering == CounterData::NUM_CHAPTER)
-        && (layout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
+    const bool header = ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER)
+        && (tqlayout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10?
 
     if (header)
     {
         *m_streamOut << "  <text:h text:level=\"";
-        *m_streamOut << TQString::number(layout.counter.depth+1,10);
+        *m_streamOut << TQString::number(tqlayout.counter.depth+1,10);
         *m_streamOut << "\" ";
     }
     else
         *m_streamOut << "  <text:p ";
 
-    const LayoutData& styleLayout=m_styleMap[layout.styleName];
+    const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
 
     TQString styleKey;
-    const TQString props(layoutToParagraphStyle(styleLayout,layout,false,styleKey));
+    const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
 
-    TQString actualStyle(layout.styleName);
+    TQString actualStyle(tqlayout.styleName);
     if (!props.isEmpty())
     {
         TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) );
@@ -2003,7 +2003,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
 
             m_contentAutomaticStyles += "  <style:style";
             m_contentAutomaticStyles += " style:name=\"" + escapeOOText(automaticStyle) + "\"";
-            m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(layout.styleName) + "\"";
+            m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\"";
             m_contentAutomaticStyles += " style:family=\"paragraph\" style:class=\"text\"";
             m_contentAutomaticStyles += ">\n";
             m_contentAutomaticStyles += "   <style:properties ";
@@ -2032,7 +2032,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
 
     *m_streamOut << ">";
 
-    processParagraphData(paraText, layout.formatData.text, paraFormatDataList);
+    processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList);
 
     if (header)
         *m_streamOut << "</text:h>\n";
@@ -2054,21 +2054,21 @@ bool OOWriterWorker::doOpenStyles(void)
     return true;
 }
 
-bool OOWriterWorker::doFullDefineStyle(LayoutData& layout)
+bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register style in the style map
-    m_styleMap[layout.styleName]=layout;
+    m_styleMap[tqlayout.styleName]=tqlayout;
 
     m_styles += "  <style:style";
 
-    m_styles += " style:name=\"" + escapeOOText( layout.styleName ) + "\"";
-    m_styles += " style:next-style-name=\"" + escapeOOText( layout.styleFollowing ) + "\"";
+    m_styles += " style:name=\"" + escapeOOText( tqlayout.styleName ) + "\"";
+    m_styles += " style:next-style-name=\"" + escapeOOText( tqlayout.styleFollowing ) + "\"";
     m_styles += " style:family=\"paragraph\" style:class=\"text\"";
     m_styles += ">\n";
     m_styles += "   <style:properties ";
 
     TQString debugKey; // Not needed
-    m_styles += layoutToParagraphStyle(layout,layout,true,debugKey);
+    m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
     kdDebug(30518) << "Defining style: " << debugKey << endl;
 
     m_styles += "</style:properties>\n";
@@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName)
     {
         TQString props;
 
-        // Disabled, as TQFontInfo::styleHint() cannot guess
+        // Disabled, as TQFontInfo::tqstyleHint() cannot guess
 #if 0
         TQFont font(fontName);
         TQFontInfo info(font);
         props+="style:font-family-generic=\""
-        switch (info.styleHint())
+        switch (info.tqstyleHint())
         {
         case TQFont::SansSerif:
         default:
@@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c
         return str2;
 
     // If it is still not unique, try a time stamp.
-    const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC));
+    const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC));
 
     str2 = str + "_" + TQString::number(dt.toTime_t(),16);
     if (m_styleMap.find(str2)==m_styleMap.end())
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index c89e15acb..0a8982276 100644
--- a/filters/kword/oowriter/ExportFilter.h
+++ b/filters/kword/oowriter/ExportFilter.h
@@ -68,7 +68,7 @@ public:
     virtual bool doCloseFile(void); ///< Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullPaperFormat(const int format,
         const double width, const double height, const int orientation);
@@ -81,7 +81,7 @@ public:
     virtual bool doFullPaperFormatOther ( const int columns, const double columnspacing, const int numPages );        
     virtual bool doOpenStyles(void);
     virtual bool doCloseStyles(void);
-    virtual bool doFullDefineStyle(LayoutData& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doVariableSettings(const VariableSettingsData& vs);
     virtual bool doOpenBody (void);
@@ -107,7 +107,7 @@ private:
     TQString textFormatToStyle(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force, TQString& key);
     TQString layoutToParagraphStyle(const LayoutData& layoutOrigin,
-        const LayoutData& layout, const bool force, TQString& styleKey);
+        const LayoutData& tqlayout, const bool force, TQString& styleKey);
     TQString escapeOOText(const TQString& strText) const;
     TQString escapeOOSpan(const TQString& strText) const;
     TQString cellToProperties( const TableCell& cell, TQString& key) const;
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 22d9fed5d..209b2bec6 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 alignment " << align << endl;
+    kdWarning(30518) << "Conversion::importAlignment unknown tqalignment " << 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 alignment " << align << endl;
+    kdWarning(30518) << "Conversion::exportAlignment unknown tqalignment " << align << endl;
     return "auto";
 }
 
@@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap )
     if ( oowrap == "run-through" )
         return tqMakePair( 0, TQString() );
     if ( oowrap == "biggest" ) // OASIS extension
-        return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+        return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
 
     ////if ( oowrap == "parallel" || oowrap == "dynamic" )
     // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel.
 
     // Those are not supported in KWord, let's use biggest instead
-    return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+    return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) );
 }
 
 TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs )
diff --git a/filters/kword/oowriter/conversion.h b/filters/kword/oowriter/conversion.h
index ee6b41f60..d93882684 100644
--- a/filters/kword/oowriter/conversion.h
+++ b/filters/kword/oowriter/conversion.h
@@ -32,7 +32,7 @@
 
 namespace Conversion
 {
-    // Convert paragraph alignment value
+    // Convert paragraph tqalignment value
     TQString importAlignment( const TQString& );
     TQString exportAlignment( const TQString& );
 
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc
index aba0ee9fd..426105e81 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cc
@@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" )
     {
@@ -79,7 +79,7 @@ KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const
         return KoFilter::StupidError;
     }
 
-    KoFilter::ConversionStatus result=leader->convert(m_chain,from,to);
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to);
 
     delete leader;
     delete worker;
diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h
index bd1a0f403..8f4695b82 100644
--- a/filters/kword/oowriter/oowriterexport.h
+++ b/filters/kword/oowriter/oowriterexport.h
@@ -47,6 +47,6 @@ public:
     OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~OOWRITERExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif // OOWRITEREXPORT_H
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 07262c861..5fd196f8a 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport()
 {
 }
 
-KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl;
 
@@ -99,20 +99,20 @@ KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCS
     }
 
 
-    KoFilter::ConversionStatus preStatus = openFile();
+    KoFilter::ConversiontqStatus pretqStatus = openFile();
 
     TQImage thumbnail;
-    if ( preStatus == KoFilter::OK )
+    if ( pretqStatus == KoFilter::OK )
     {
         // We do not care about the failure
         OoUtils::loadThumbnail( thumbnail, m_zip );
     }
 
-    if ( preStatus != KoFilter::OK )
+    if ( pretqStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return preStatus;
+        return pretqStatus;
     }
 
     m_currentMasterPage = TQString();
@@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle
     return frameElementOut;
 }
 
-KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
 
-KoFilter::ConversionStatus OoWriterImport::openFile()
+KoFilter::ConversiontqStatus OoWriterImport::openFile()
 {
-    KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content);
+    KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content);
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -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.arg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
+        message = message.tqarg( docElement.attributeNS( ooNS::office, "version", TQString() ) );
         if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No )
           return false;
       }
@@ -873,13 +873,13 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutEleme
         TQString bulletChar = listStyle.attributeNS( ooNS::text, "bullet-char", TQString() );
         if ( !bulletChar.isEmpty() ) {
 #if 0 // doesn't work well. Fonts lack those symbols!
-            counter.setAttribute( "bullet", bulletChar[0].unicode() );
-            kdDebug(30518) << "bullet code " << bulletChar[0].unicode() << endl;
+            counter.setAttribute( "bullet", bulletChar[0].tqunicode() );
+            kdDebug(30518) << "bullet code " << bulletChar[0].tqunicode() << endl;
             TQString fontName = listStyleProperties.attributeNS( ooNS::style, "font-name", TQString() );
             counter.setAttribute( "bulletfont", fontName );
 #endif
             // Reverse engineering, I found those codes:
-            switch( bulletChar[0].unicode() ) {
+            switch( bulletChar[0].tqunicode() ) {
             case 0x2022: // small disc
                 counter.setAttribute( "type", 10 ); // a disc bullet
                 break;
@@ -992,11 +992,11 @@ void OoWriterImport::parseList( TQDomDocument& doc, const TQDomElement& list, TQ
 
 static int numberOfParagraphs( const TQDomElement& frameset )
 {
-    const TQDomNodeList children = frameset.childNodes();
+    const TQDomNodeList tqchildren = frameset.childNodes();
     const TQString paragStr = "PARAGRAPH";
     int paragCount = 0;
-    for ( unsigned int i = 0 ; i < children.length() ; ++i ) {
-        if ( children.item( i ).toElement().tagName() == paragStr )
+    for ( unsigned int i = 0 ; i < tqchildren.length() ; ++i ) {
+        if ( tqchildren.item( i ).toElement().tagName() == paragStr )
             ++paragCount;
     }
     return paragCount;
@@ -1209,12 +1209,12 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )];
     TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString();
     if ( masterPageName.isEmpty() )
-        masterPageName = "Standard"; // Seems to be a builtin name for the default layout...
+        masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout...
     if ( masterPageName != m_currentMasterPage )
     {
-        // Detected a change in the master page -> this means we have to use a new page layout
+        // Detected a change in the master page -> this means we have to use a new page tqlayout
         // and insert a frame break if not on the first paragraph.
-        // In KWord we don't support sections so the first paragraph is the one that determines the page layout.
+        // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout.
         if ( m_currentMasterPage.isEmpty() ) {
             m_currentMasterPage = masterPageName; // before writePageLayout to avoid recursion
             writePageLayout( doc, masterPageName );
@@ -1228,7 +1228,7 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
                 layoutElement.appendChild( pageBreakElem );
             }
             pageBreakElem.setAttribute( "hardFrameBreak", "true" );
-            // We have no way to store the new page layout, KWord doesn't have sections.
+            // We have no way to store the new page tqlayout, KWord doesn't have sections.
         }
     }
 
@@ -1458,7 +1458,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen
 {
     Q_ASSERT( layoutElement.ownerDocument() == doc );
 
-    // Always write out the alignment, it's required
+    // Always write out the tqalignment, 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 alignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
+    vertical tqalignment - 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
@@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href.mid(1));
-        KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+        KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
         picture.setKey(key);
 
         if (!m_zip)
@@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
             if (!dt.isValid())
             {
-                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
             const TQDate date(dt.date());
@@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
             bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
             if (!dt.isValid()) {
-                dt = TQDateTime::currentDateTime(); // OOo docs say so :)
+                dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
                 fixed = false;
             }
 
@@ -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")
-                .arg(row).arg(column).arg(tableName)); // The table name could have a % sequence, so use the table name as last!
+                .tqarg(row).tqarg(column).tqarg(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/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h
index 4de60534c..80586a312 100644
--- a/filters/kword/oowriter/oowriterimport.h
+++ b/filters/kword/oowriter/oowriterimport.h
@@ -38,7 +38,7 @@ public:
     OoWriterImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoWriterImport();
 
-    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem );
@@ -61,8 +61,8 @@ private:
     void createDocumentInfo( TQDomDocument &docinfo );
     void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement );
     void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement );
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
-    KoFilter::ConversionStatus openFile();
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversiontqStatus openFile();
     bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc );
     void insertStyles( const TQDomElement& element, TQDomDocument& doc );
     void importDateTimeStyle( const TQDomElement& parent );
diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp
index b7155fa8d..65a835185 100644
--- a/filters/kword/palmdoc/palmdb.cpp
+++ b/filters/kword/palmdoc/palmdb.cpp
@@ -18,7 +18,7 @@
 */
 
 /*
-   The database layout for PalmDB files is described in 
+   The database tqlayout for PalmDB files is described in 
    http://www.palmos.com/dev/support/docs/protein_books/FileFormats/Intro.html
 */
 
@@ -38,9 +38,9 @@ PalmDB::PalmDB()
   setName( "Unnamed" );
   setAttributes( 0 );
   setVersion( 0 );
-  setCreationDate( TQDateTime::currentDateTime() );
-  setModificationDate( TQDateTime::currentDateTime() );
-  setLastBackupDate( TQDateTime::currentDateTime() );
+  setCreationDate( TQDateTime::tqcurrentDateTime() );
+  setModificationDate( TQDateTime::tqcurrentDateTime() );
+  setLastBackupDate( TQDateTime::tqcurrentDateTime() );
   setType( TQString() );
   setCreator( TQString() );
 
@@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename )
 
   // read and encode database name
   // The name field is 32 bytes long, and is NUL terminated.
-  // Use the length parameter of fromLatin1() anyway.
+  // Use the length parameter of tqfromLatin1() anyway.
   TQ_UINT8 name[32];
   for(int k = 0; k < 32; k++)
     stream >> name[k];
-  m_name = TQString::fromLatin1( (char*) name, 31 );
+  m_name = TQString::tqfromLatin1( (char*) name, 31 );
 
   // read database attribute
   TQ_UINT16 attr;
@@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename )
   // read and encode database type
   TQ_UINT8 dbt[4];
   stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3];
-  m_type = TQString::fromLatin1( (char*) dbt, 4 );
+  m_type = TQString::tqfromLatin1( (char*) dbt, 4 );
 
   // read and encode database creator
   TQ_UINT8 dbc[4];
   stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3];
-  m_creator = TQString::fromLatin1( (char*) dbc, 4 );
+  m_creator = TQString::tqfromLatin1( (char*) dbc, 4 );
 
   // read unique id seed
   TQ_UINT32 idseed;
@@ -184,9 +184,9 @@ bool PalmDB::load( const char* filename )
       if( recsize[r] >= 0 )
         {
           data->resize( recsize[r] );
-          stream.device()->at( recpos[r] );
+          stream.tqdevice()->at( recpos[r] );
           for( int q = 0; q < recsize[r]; q++ )
-            { TQ_UINT8 c; stream >> c; data->at(q) = c; }
+            { TQ_UINT8 c; stream >> c; data->tqat(q) = c; }
         }
     records.append( data );
   }
diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp
index 72bb0434c..791fa3566 100644
--- a/filters/kword/palmdoc/palmdoc.cpp
+++ b/filters/kword/palmdoc/palmdoc.cpp
@@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename )
 
   // if the text is not compressed, simply append as string
   if( format == 1 )
-      setText( TQString::fromLatin1( rec.data(),rec.count() ) );
+      setText( TQString::tqfromLatin1( rec.data(),rec.count() ) );
 
   // done
   m_result = OK;
@@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename )
   setCreator( "REAd" );
 
   // "touch" the database :-)
-  setModificationDate( TQDateTime::currentDateTime() ); 
+  setModificationDate( TQDateTime::tqcurrentDateTime() ); 
 
   // Palm record size is always 4 KB
   unsigned recsize = 4096;
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc
index 9bbb980f8..5e18ff6f5 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cc
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -53,7 +53,7 @@ public:
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
 private:
     TQString title;
@@ -101,7 +101,7 @@ bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo )
 }
 
 bool PalmDocWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*layout*/, const ValueListFormatData& /*paraFormatDataList*/)
+  const LayoutData& /*tqlayout*/, const ValueListFormatData& /*paraFormatDataList*/)
 {
   kdDebug(30525) << "Entering ::doFullParagraph" << endl;
   text.append( paraText );
@@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, 
+KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -125,7 +125,7 @@ KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from,
   PalmDocWorker* worker = new PalmDocWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h
index 4c09946b7..fd2a11406 100644
--- a/filters/kword/palmdoc/palmdocexport.h
+++ b/filters/kword/palmdoc/palmdocexport.h
@@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter
 
     virtual ~PalmDocExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __PALMDOCEXPORT_H
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc
index a1e8107bc..98cd76296 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cc
@@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "application/vnd.palm" )
@@ -96,7 +96,7 @@ KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const
 
 TQString PalmDocImport::processPlainParagraph( TQString text )
 {
-  TQString formats, layout, result;
+  TQString formats, tqlayout, result;
 
   // specify FORMAT (just empty element)
   formats.append ( "  <FORMAT id=\"1\" pos=\"0\" len=\"" +
@@ -108,29 +108,29 @@ TQString PalmDocImport::processPlainParagraph( TQString text )
   double fontSize = font.pointSizeFloat();
 
   // default LAYOUT
-  layout.append( "<LAYOUT>\n" );
-  layout.append( "  <NAME value=\"Standard\" />\n" );
-  layout.append( "  <FLOW align=\"left\" />\n" );
-  layout.append( "  <LINESPACING value=\"0\" />\n" );
-  layout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
-  layout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
-  layout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
-  layout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
-  layout.append( "  <INDENTS />\n" );
-  layout.append( "  <OFFSETS after=\"9\" />\n" );
-  layout.append( "  <PAGEBREAKING />\n" );
-  layout.append( "  <COUNTER />\n" );
-  layout.append( "  <FORMAT id=\"1\">\n" );
-  layout.append( "    <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" );
-  layout.append( "    <WEIGHT value=\"50\" />\n" );
-  layout.append( "    <ITALIC value=\"0\" />\n" );
-  layout.append( "    <UNDERLINE value=\"0\" />\n" );
-  layout.append( "    <STRIKEOUT value=\"0\" />\n" );
-  layout.append( "    <CHARSET value=\"0\" />\n" );
-  layout.append( "    <VERTALIGN value=\"0\" />\n" );
-  layout.append( "    <FONT name=\"" + fontFamily + "\" />\n" );
-  layout.append( "  </FORMAT>\n" );
-  layout.append( "</LAYOUT>\n" );
+  tqlayout.append( "<LAYOUT>\n" );
+  tqlayout.append( "  <NAME value=\"Standard\" />\n" );
+  tqlayout.append( "  <FLOW align=\"left\" />\n" );
+  tqlayout.append( "  <LINESPACING value=\"0\" />\n" );
+  tqlayout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
+  tqlayout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
+  tqlayout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
+  tqlayout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
+  tqlayout.append( "  <INDENTS />\n" );
+  tqlayout.append( "  <OFFSETS after=\"9\" />\n" );
+  tqlayout.append( "  <PAGEBREAKING />\n" );
+  tqlayout.append( "  <COUNTER />\n" );
+  tqlayout.append( "  <FORMAT id=\"1\">\n" );
+  tqlayout.append( "    <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" );
+  tqlayout.append( "    <WEIGHT value=\"50\" />\n" );
+  tqlayout.append( "    <ITALIC value=\"0\" />\n" );
+  tqlayout.append( "    <UNDERLINE value=\"0\" />\n" );
+  tqlayout.append( "    <STRIKEOUT value=\"0\" />\n" );
+  tqlayout.append( "    <CHARSET value=\"0\" />\n" );
+  tqlayout.append( "    <VERTALIGN value=\"0\" />\n" );
+  tqlayout.append( "    <FONT name=\"" + fontFamily + "\" />\n" );
+  tqlayout.append( "  </FORMAT>\n" );
+  tqlayout.append( "</LAYOUT>\n" );
 
   // encode text for XML-ness
   text.replace( '&', "&amp;" );
@@ -145,7 +145,7 @@ TQString PalmDocImport::processPlainParagraph( TQString text )
   result.append( "<FORMATS>\n");
   result.append( formats );
   result.append( "</FORMATS>\n");
-  result.append( layout );
+  result.append( tqlayout );
   result.append( "</PARAGRAPH>\n" );
 
   return result;
diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h
index 77b4cc73f..a97f97298 100644
--- a/filters/kword/palmdoc/palmdocimport.h
+++ b/filters/kword/palmdoc/palmdocimport.h
@@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter
 
     virtual ~PalmDocImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
   private:
     
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index 8a08c95ce..5182f1883 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").arg(_data.imageIndex());
+    TQString name = TQString("pictures/picture%1.png").tqarg(_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 geometry
+    // get image tqgeometry
     Image image;
     image.mask = withMask;
     computeGeometry(state, image);
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 14d3d384a..5391cb244 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -85,7 +85,7 @@ void Page::addString(TextString *str)
 //    TQString s;
 //    for (int i=0; i<str->len; i++) s += TQChar(str->text[i]);
 //    kdDebug(30516) << "string: " << s << " ("
-//                   << (str->len>0 ? s[0].unicode() : 0) << ")" << endl;
+//                   << (str->len>0 ? s[0].tqunicode() : 0) << ")" << endl;
     TextPage::addString(str);
 //    kdDebug(30516) << " ...addString done" << endl;
 }
@@ -245,9 +245,9 @@ void Page::initParagraph(Paragraph &par) const
             if ( res==-1 ) {
                 tab.pos = dx;
                 if (tabRightAligned) {
-                    tab.alignment = Tabulator::Right;
+                    tab.tqalignment = Tabulator::Right;
                     kdDebug(30516) << "tabulated text right aligned.." << endl;
-                } else tab.alignment = Tabulator::Left;
+                } else tab.tqalignment = 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 alignment
+    // compute tqalignment
     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 alignment
+    // finalize tqalignment
     if (rightAligned) par.align = (leftAligned ? AlignBlock : AlignRight);
     else if (centered) par.align = AlignCenter;
 }
@@ -315,14 +315,14 @@ void Page::fillParagraph(Paragraph &par, double &offset) const
                 TQChar c = par.blocks[bi].text[si];
                 int psi = par.charFromEnd(1, pbi);
                 TQChar prev = (psi<0 ? TQChar::null : par.blocks[pbi].text[psi]);
-                if ( !prev.isNull() && type(c.unicode())==Hyphen )
+                if ( !prev.isNull() && type(c.tqunicode())==Hyphen )
                     kdDebug(30516) << "hyphen ? " << TQString(prev)
-                                   << " type=" << type(prev.unicode())
+                                   << " type=" << type(prev.tqunicode())
                                    << endl;
                 TextString *next =
                     ((*it)->next ? (*it)->next->blocks->strings : 0);
-                if ( !prev.isNull() && type(c.unicode())==Hyphen
-                     && isLetter( type(prev.unicode()) )
+                if ( !prev.isNull() && type(c.tqunicode())==Hyphen
+                     && isLetter( type(prev.tqunicode()) )
                      && next && next->len>0
                      && isLetter( type(next->text[next->len-1]) ) ) {
                     kdDebug(30516) << "found hyphen" << endl;
@@ -389,7 +389,7 @@ void Page::fillParagraph(Paragraph &par, double &offset) const
 FontFamily Page::checkSpecial(TQChar &c, const Font &font) const
 {
     Unicode res = 0;
-    switch ( PDFImport::checkSpecial(c.unicode(), res) ) {
+    switch ( PDFImport::checkSpecial(c.tqunicode(), res) ) {
     case Bullet:
         kdDebug(30516) << "found bullet" << endl;
         // #### FIXME : if list, use a COUNTER
@@ -405,7 +405,7 @@ FontFamily Page::checkSpecial(TQChar &c, const Font &font) const
         kdDebug(30516) << "found latex special" << endl;
         return Times;
     case SpecialSymbol:
-        kdDebug(30516) << "found symbol=" << c.unicode() << endl;
+        kdDebug(30516) << "found symbol=" << c.tqunicode() << endl;
         return Times;
         //return Symbol;
     default:
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 3236aa399..a6abf9297 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")).arg(index);
+                : i18n("Picture %1")).tqarg(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]).arg(pageIndex);
+        TQString name = i18n(TEXT_FRAMESET_NAMES[i]).tqarg(pageIndex);
         _textFramesets[i] = createFrameset(Text, name);
         _framesets.appendChild(_textFramesets[i]);
         TQDomElement frame = createFrame(Text, rects[i], true);
@@ -189,13 +189,13 @@ void Data::createParagraph(const TQString &text, ParagraphType type,
     textElement.appendChild( _document.createTextNode(text) );
     paragraph.appendChild(textElement);
 
-    TQDomElement layout = _document.createElement("LAYOUT");
-    paragraph.appendChild(layout);
+    TQDomElement tqlayout = _document.createElement("LAYOUT");
+    paragraph.appendChild(tqlayout);
     TQDomElement element = _document.createElement("NAME");
     element.setAttribute("value", "Standard");
-    layout.appendChild(element);
+    tqlayout.appendChild(element);
     for (uint i=0; i<layouts.size(); i++)
-        layout.appendChild(layouts[i]);
+        tqlayout.appendChild(layouts[i]);
 
     if ( formats.size() ) {
         TQDomElement format = _document.createElement("FORMATS");
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 74aa89e22..29e0eabc2 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqgrid.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
@@ -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)").arg(nbPages), gbox);
+    _allButton = new TQRadioButton(i18n("All (%1 pages)").tqarg(nbPages), gbox);
     _allButton->setChecked(true);
     _group->insert(_allButton);
     TQHBox *hbox = new TQHBox(gbox);
@@ -147,8 +147,8 @@ 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 alignment. "
-                         "Note that the layout of some pages can "
+                         "Also tries to compute the paragraph tqalignment. "
+                         "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").arg(_nbPages) : _range->text()) );
+                             TQString("1-%1").tqarg(_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 c8ecabcbe..1dd953aac 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", alignment);
+    element.setAttribute("type", tqalignment);
     element.setAttribute("ptpos", pos);
     element.setAttribute("filling", filling);
-    if ( alignment==Character )
+    if ( tqalignment==Character )
         element.setAttribute("alignchar", TQString(alignmentChar));
     return element;
 }
diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h
index 644c9398d..6e4d0b6a7 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() : alignment(Left) {}
+    Tabulator() : tqalignment(Left) {}
 
     TQDomElement createElement(Data &data) const;
 
 public:
     double    pos;
-    Alignment alignment;
+    Alignment tqalignment;
     Filling   filling;
     TQChar     alignmentChar;
 };
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 3cd0e1bfb..0ffc9dbad 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").arg(_left).arg(_right)
-        .arg(_top).arg(_bottom);
+    return TQString("left=%1 right=%2 top=%3 bottom=%4").tqarg(_left).tqarg(_right)
+        .tqarg(_top).tqarg(_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.families();
+                TQStringList list = fdb.tqfamilies();
                 list = list.grep(name, false);
                 if ( !list.isEmpty() ) {
                     _data->family = list[0];
diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp
index 80ec92d08..ffe27e1c2 100644
--- a/filters/kword/pdf/pdfdocument.cpp
+++ b/filters/kword/pdf/pdfdocument.cpp
@@ -38,7 +38,7 @@ Document::Document()
     : _file(0), _object(0), _fileStream(0), _document(0), _device(0)
 {}
 
-KoFilter::ConversionStatus
+KoFilter::ConversiontqStatus
 Document::init(const TQString &name, const TQString &ownerPassword,
                const TQString &userPassword)
 {
diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h
index b2da781fb..c54606f45 100644
--- a/filters/kword/pdf/pdfdocument.h
+++ b/filters/kword/pdf/pdfdocument.h
@@ -43,7 +43,7 @@ class Document
     Document();
     ~Document() { clear(); }
 
-    KoFilter::ConversionStatus init(const TQString &name,
+    KoFilter::ConversiontqStatus init(const TQString &name,
                     const TQString &ownerPassword, const TQString &userPassword);
     void clear();
 
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index dfc567030..bee3e39a0 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory())
 PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&)
 {}
 
-KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
+KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from,
                                               const TQCString& to)
 {
     // check for proper conversion
@@ -63,7 +63,7 @@ KoFilter::ConversionStatus PdfImport::convert(const TQCString& from,
         return KoFilter::NotImplemented;
 
     // read file
-    KoFilter::ConversionStatus result
+    KoFilter::ConversiontqStatus result
         = _doc.init(m_chain->inputFile(), TQString(), TQString());
     if ( result!=KoFilter::OK ) return result;
 
@@ -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.arg(it.current()) );
+            pd.setLabel( s.tqarg(it.current()) );
             tqApp->processEvents();
             if (pd.wasCancelled()) return KoFilter::UserCancelled;
             kdDebug(30516) << "-- " << "pass #" << k
diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h
index 53ca8f976..9686714ea 100644
--- a/filters/kword/pdf/pdfimport.h
+++ b/filters/kword/pdf/pdfimport.h
@@ -33,7 +33,7 @@ class PdfImport : public KoFilter
 public:
     PdfImport(KoFilter *parent, const char *name, const TQStringList&);
 
-    KoFilter::ConversionStatus
+    KoFilter::ConversiontqStatus
     convert(const TQCString& from, const TQCString& to);
 
 private:
diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cc
index 8de09e0e6..ebbbff40f 100644
--- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cc
@@ -50,7 +50,7 @@ FTFontEngine::~FTFontEngine() {
 FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
 		       char **fontEnc, GBool pdfFontHasEncoding) {
   char *name;
-  int unicodeCmap, macRomanCmap, msSymbolCmap;
+  int tqunicodeCmap, macRomanCmap, msSymbolCmap;
   int i, j;
 
   ok = gFalse;
@@ -89,11 +89,11 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
     //        and use (0xf000 + char code).
     // 3. If none of these rules apply, use the first cmap and hope for
     //    the best (this shouldn't happen).
-    unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+    tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
     for (i = 0; i < face->num_charmaps; ++i) {
       if (face->charmaps[i]->platform_id == 3 &&
 	  face->charmaps[i]->encoding_id == 1) {
-	unicodeCmap = i;
+	tqunicodeCmap = i;
       } else if (face->charmaps[i]->platform_id == 1 &&
 		 face->charmaps[i]->encoding_id == 0) {
 	macRomanCmap = i;
@@ -106,8 +106,8 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName,
     mode = ftFontModeCharCode;
     charMapOffset = 0;
     if (pdfFontHasEncoding) {
-      if (unicodeCmap != 0xffff) {
-	i = unicodeCmap;
+      if (tqunicodeCmap != 0xffff) {
+	i = tqunicodeCmap;
 	mode = ftFontModeUnicode;
       } else if (macRomanCmap != 0xffff) {
 	i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
index ccb880bfb..73a7f1d35 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc
@@ -3206,7 +3206,7 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
 				      GBool pdfFontHasEncoding,
 				      FontFileOutputFunc outputFunc,
 				      void *outputStream) {
-  int unicodeCmap, macRomanCmap, msSymbolCmap;
+  int tqunicodeCmap, macRomanCmap, msSymbolCmap;
   int nCmaps, cmapPlatform, cmapEncoding, cmapFmt, cmapOffset;
   T42FontIndexMode mode;
   const char *name;
@@ -3239,13 +3239,13 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
   // 3. If none of these rules apply, use the first cmap and hope for
   //    the best (this shouldn't happen).
   nCmaps = getUShort(pos+2);
-  unicodeCmap = macRomanCmap = msSymbolCmap = -1;
+  tqunicodeCmap = macRomanCmap = msSymbolCmap = -1;
   cmapOffset = 0;
   for (i = 0; i < nCmaps; ++i) {
     cmapPlatform = getUShort(pos + 4 + 8*i);
     cmapEncoding = getUShort(pos + 4 + 8*i + 2);
     if (cmapPlatform == 3 && cmapEncoding == 1) {
-      unicodeCmap = i;
+      tqunicodeCmap = i;
     } else if (cmapPlatform == 1 && cmapEncoding == 0) {
       macRomanCmap = i;
     } else if (cmapPlatform == 3 && cmapEncoding == 0) {
@@ -3255,8 +3255,8 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA,
   i = 0;
   mode = t42FontModeCharCode;
   if (pdfFontHasEncoding) {
-    if (unicodeCmap >= 0) {
-      i = unicodeCmap;
+    if (tqunicodeCmap >= 0) {
+      i = tqunicodeCmap;
       mode = t42FontModeUnicode;
     } else if (macRomanCmap >= 0) {
       i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
index 8a7b36de8..d25970de5 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
@@ -139,7 +139,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
   nameToUnicode = new NameToCharCode();
   cidToUnicodes = new GHash(gTrue);
   residentUnicodeMaps = new GHash();
-  unicodeMaps = new GHash(gTrue);
+  tqunicodeMaps = new GHash(gTrue);
   cMapDirs = new GHash(gTrue);
   toUnicodeDirs = new GList();
   displayFonts = new GHash();
@@ -195,7 +195,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
   errQuiet = gFalse;
 
   cidToUnicodeCache = new CIDToUnicodeCache();
-  unicodeMapCache = new UnicodeMapCache();
+  tqunicodeMapCache = new UnicodeMapCache();
   cMapCache = new CMapCache();
 
   // set up the initial nameToUnicode table
@@ -318,7 +318,7 @@ void GlobalParams::parseFile(GString *fileName, FILE *f) {
 	parseNameToUnicode(tokens, fileName, line);
       } else if (!cmd->cmp("cidToUnicode")) {
 	parseCIDToUnicode(tokens, fileName, line);
-      } else if (!cmd->cmp("unicodeMap")) {
+      } else if (!cmd->cmp("tqunicodeMap")) {
 	parseUnicodeMap(tokens, fileName, line);
       } else if (!cmd->cmp("cMapDir")) {
 	parseCMapDir(tokens, fileName, line);
@@ -465,16 +465,16 @@ void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName,
   GString *encodingName, *name, *old;
 
   if (tokens->getLength() != 3) {
-    error(-1, "Bad 'unicodeMap' config file command (%s:%d)",
+    error(-1, "Bad 'tqunicodeMap' config file command (%s:%d)",
 	  fileName->getCString(), line);
     return;
   }
   encodingName = (GString *)tokens->get(1);
   name = (GString *)tokens->get(2);
-  if ((old = (GString *)unicodeMaps->remove(encodingName))) {
+  if ((old = (GString *)tqunicodeMaps->remove(encodingName))) {
     delete old;
   }
-  unicodeMaps->add(encodingName->copy(), name->copy());
+  tqunicodeMaps->add(encodingName->copy(), name->copy());
 }
 
 void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) {
@@ -765,7 +765,7 @@ GlobalParams::~GlobalParams() {
   delete nameToUnicode;
   deleteGHash(cidToUnicodes, GString);
   deleteGHash(residentUnicodeMaps, UnicodeMap);
-  deleteGHash(unicodeMaps, GString);
+  deleteGHash(tqunicodeMaps, GString);
   deleteGList(toUnicodeDirs, GString);
   deleteGHash(displayFonts, DisplayFontParam);
   deleteGHash(displayCIDFonts, DisplayFontParam);
@@ -793,7 +793,7 @@ GlobalParams::~GlobalParams() {
   delete cMapDirs;
 
   delete cidToUnicodeCache;
-  delete unicodeMapCache;
+  delete tqunicodeMapCache;
   delete cMapCache;
 }
 
@@ -825,7 +825,7 @@ UnicodeMap *GlobalParams::getResidentUnicodeMap(const GString *encodingName) {
 FILE *GlobalParams::getUnicodeMapFile(const GString *encodingName) {
   GString *fileName;
 
-  if (!(fileName = (GString *)unicodeMaps->lookup(encodingName))) {
+  if (!(fileName = (GString *)tqunicodeMaps->lookup(encodingName))) {
     return NULL;
   }
   return fopen(fileName->getCString(), "r");
@@ -959,7 +959,7 @@ UnicodeMap *GlobalParams::getUnicodeMap(GString *encodingName) {
     map->incRefCnt();
     return map;
   }
-  return unicodeMapCache->getUnicodeMap(encodingName);
+  return tqunicodeMapCache->getUnicodeMap(encodingName);
 }
 
 CMap *GlobalParams::getCMap(GString *collection, GString *cMapName) {
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
index 86114a150..1f3e4c53c 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h
@@ -237,7 +237,7 @@ private:
 				//   [GString]
   GHash *residentUnicodeMaps;	// mappings from Unicode to char codes,
 				//   indexed by encoding name [UnicodeMap]
-  GHash *unicodeMaps;		// files for mappings from Unicode to char
+  GHash *tqunicodeMaps;		// files for mappings from Unicode to char
 				//   codes, indexed by encoding name [GString]
   GHash *cMapDirs;		// list of CMap dirs, indexed by collection
 				//   name [GList[GString]]
@@ -263,7 +263,7 @@ private:
   GBool psEmbedCIDTrueType;	// embed CID TrueType fonts?
   GBool psOPI;			// generate PostScript OPI comments?
   GBool psASCIIHex;		// use ASCIIHex instead of ASCII85?
-  GString *textEncoding;	// encoding (unicodeMap) to use for text
+  GString *textEncoding;	// encoding (tqunicodeMap) to use for text
 				//   output
   EndOfLineKind textEOL;	// type of EOL marker to use for text
 				//   output
@@ -280,7 +280,7 @@ private:
   GBool errQuiet;		// suppress error messages?
 
   CIDToUnicodeCache *cidToUnicodeCache;
-  UnicodeMapCache *unicodeMapCache;
+  UnicodeMapCache *tqunicodeMapCache;
   CMapCache *cMapCache;
 };
 
diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cc
index 6107fd43a..6077f3c07 100644
--- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cc
@@ -48,7 +48,7 @@ TTFontEngine::~TTFontEngine() {
 TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
 		       char **fontEnc, GBool pdfFontHasEncoding) {
   TT_Face_Properties props;
-  TT_UShort unicodeCmap, macRomanCmap, msSymbolCmap;
+  TT_UShort tqunicodeCmap, macRomanCmap, msSymbolCmap;
   TT_UShort platform, encoding, i;
   int j;
 
@@ -77,11 +77,11 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
   //        and use (0xf000 + char code).
   // 3. If none of these rules apply, use the first cmap and hope for
   //    the best (this shouldn't happen).
-  unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
+  tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
   for (i = 0; i < props.num_CharMaps; ++i) {
     if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) {
       if (platform == 3 && encoding == 1) {
-	unicodeCmap = i;
+	tqunicodeCmap = i;
       } else if (platform == 1 && encoding == 0) {
 	macRomanCmap = i;
       } else if (platform == 3 && encoding == 0) {
@@ -93,8 +93,8 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
   mode = ttFontModeCharCode;
   charMapOffset = 0;
   if (pdfFontHasEncoding) {
-    if (unicodeCmap != 0xffff) {
-      i = unicodeCmap;
+    if (tqunicodeCmap != 0xffff) {
+      i = tqunicodeCmap;
       mode = ttFontModeUnicode;
     } else if (macRomanCmap != 0xffff) {
       i = macRomanCmap;
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
index fe1185d7d..d197e5cf5 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
@@ -46,7 +46,7 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
   char *tok1, *tok2, *tok3;
 
   if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) {
-    error(-1, "Couldn't find unicodeMap file for the '%s' encoding",
+    error(-1, "Couldn't find tqunicodeMap file for the '%s' encoding",
 	  encodingNameA->getCString());
     return NULL;
   }
@@ -93,11 +93,11 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 	eMap->nBytes = nBytes;
 	++map->eMapsLen;
       } else {
-	error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
+	error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
 	      line, encodingNameA->getCString());
       }
     } else {
-      error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding",
+      error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding",
 	    line, encodingNameA->getCString());
     }
     ++line;
@@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) {
 
 UnicodeMap::UnicodeMap(GString *encodingNameA) {
   encodingName = encodingNameA;
-  unicodeOut = gFalse;
-  kind = unicodeMapUser;
+  tqunicodeOut = gFalse;
+  kind = tqunicodeMapUser;
   ranges = NULL;
   len = 0;
   eMaps = NULL;
@@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) {
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 		       UnicodeMapRange *rangesA, int lenA) {
   encodingName = new GString(encodingNameA);
-  unicodeOut = unicodeOutA;
-  kind = unicodeMapResident;
+  tqunicodeOut = tqunicodeOutA;
+  kind = tqunicodeMapResident;
   ranges = rangesA;
   len = lenA;
   eMaps = NULL;
@@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
   refCnt = 1;
 }
 
-UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 		       UnicodeMapFunc funcA) {
   encodingName = new GString(encodingNameA);
-  unicodeOut = unicodeOutA;
-  kind = unicodeMapFunc;
+  tqunicodeOut = tqunicodeOutA;
+  kind = tqunicodeMapFunc;
   func = funcA;
   eMaps = NULL;
   eMapsLen = 0;
@@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
 
 UnicodeMap::~UnicodeMap() {
   delete encodingName;
-  if (kind == unicodeMapUser && ranges) {
+  if (kind == tqunicodeMapUser && ranges) {
     gfree(ranges);
   }
   if (eMaps) {
@@ -170,7 +170,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
   int a, b, m, n, i, j;
   Guint code;
 
-  if (kind == unicodeMapFunc) {
+  if (kind == tqunicodeMapFunc) {
     return (*func)(u, buf, bufSize);
   }
 
@@ -219,7 +219,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) {
 UnicodeMapCache::UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < unicodeMapCacheSize; ++i) {
+  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
     cache[i] = NULL;
   }
 }
@@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() {
 UnicodeMapCache::~UnicodeMapCache() {
   int i;
 
-  for (i = 0; i < unicodeMapCacheSize; ++i) {
+  for (i = 0; i < tqunicodeMapCacheSize; ++i) {
     if (cache[i]) {
       cache[i]->decRefCnt();
     }
@@ -242,7 +242,7 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     cache[0]->incRefCnt();
     return cache[0];
   }
-  for (i = 1; i < unicodeMapCacheSize; ++i) {
+  for (i = 1; i < tqunicodeMapCacheSize; ++i) {
     if (cache[i] && cache[i]->match(encodingName)) {
       map = cache[i];
       for (j = i; j >= 1; --j) {
@@ -254,10 +254,10 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) {
     }
   }
   if ((map = UnicodeMap::parse(encodingName))) {
-    if (cache[unicodeMapCacheSize - 1]) {
-      cache[unicodeMapCacheSize - 1]->decRefCnt();
+    if (cache[tqunicodeMapCacheSize - 1]) {
+      cache[tqunicodeMapCacheSize - 1]->decRefCnt();
     }
-    for (j = unicodeMapCacheSize - 1; j >= 1; --j) {
+    for (j = tqunicodeMapCacheSize - 1; j >= 1; --j) {
       cache[j] = cache[j - 1];
     }
     cache[0] = map;
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
index 189f31542..35506aab1 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h
@@ -25,9 +25,9 @@ class GString;
 //------------------------------------------------------------------------
 
 enum UnicodeMapKind {
-  unicodeMapUser,		// read from a file
-  unicodeMapResident,		// static list of ranges
-  unicodeMapFunc		// function pointer
+  tqunicodeMapUser,		// read from a file
+  tqunicodeMapResident,		// static list of ranges
+  tqunicodeMapFunc		// function pointer
 };
 
 typedef int (*UnicodeMapFunc)(Unicode u, char *buf, int bufSize);
@@ -49,12 +49,12 @@ public:
   static UnicodeMap *parse(GString *encodingNameA);
 
   // Create a resident UnicodeMap.
-  UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 	     UnicodeMapRange *rangesA, int lenA);
 
   // Create a resident UnicodeMap that uses a function instead of a
   // list of ranges.
-  UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+  UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA,
 	     UnicodeMapFunc funcA);
 
   ~UnicodeMap();
@@ -64,7 +64,7 @@ public:
 
   GString *getEncodingName() { return encodingName; }
 
-  GBool isUnicode() { return unicodeOut; }
+  GBool isUnicode() { return tqunicodeOut; }
 
   // Return true if this UnicodeMap matches the specified
   // <encodingNameA>.
@@ -82,7 +82,7 @@ private:
 
   GString *encodingName;
   UnicodeMapKind kind;
-  GBool unicodeOut;
+  GBool tqunicodeOut;
   union {
     UnicodeMapRange *ranges;	// (user, resident)
     UnicodeMapFunc func;	// (func)
@@ -95,7 +95,7 @@ private:
 
 //------------------------------------------------------------------------
 
-#define unicodeMapCacheSize 4
+#define tqunicodeMapCacheSize 4
 
 class UnicodeMapCache {
 public:
@@ -110,7 +110,7 @@ public:
 
 private:
 
-  UnicodeMap *cache[unicodeMapCacheSize];
+  UnicodeMap *cache[tqunicodeMapCacheSize];
 };
 
 #endif
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
index e456310b6..d0bda6653 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},
-  {"-geometry",      ".geometry",        XrmoptionSepArg,  NULL},
-  {"-g",             ".geometry",        XrmoptionSepArg,  NULL},
+  {"-tqgeometry",      ".tqgeometry",        XrmoptionSepArg,  NULL},
+  {"-g",             ".tqgeometry",        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 geometry;
+  String tqgeometry;
   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, geometry),     XtRString, (XtPointer)NULL             },
+  { "geometry",     "Geometry",     XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, tqgeometry),     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);
-  geometry = resources.geometry ? new GString(resources.geometry)
+  tqgeometry = resources.tqgeometry ? new GString(resources.tqgeometry)
                                 : (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 (geometry) {
-    delete geometry;
+  if (tqgeometry) {
+    delete tqgeometry;
   }
   if (title) {
     delete title;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h
index 4875456e6..46aa28dc4 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 geometry; }
+  GString *getGeometry() { return tqgeometry; }
   GString *getTitle() { return title; }
   GBool getInstallCmap() { return installCmap; }
   int getRGBCubeSize() { return rgbCubeSize; }
@@ -90,7 +90,7 @@ private:
   Widget remoteWin;
 
   //----- resource/option values
-  GString *geometry;
+  GString *tqgeometry;
   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 8f5baeb56..290861b94 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 *children;
+  XPDFTreeEntry *tqchildren;
   XPDFTreeEntry *next;
 };
 
@@ -56,7 +56,7 @@ static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead);
 static void deleteChildFromList(XPDFTreeEntry *e, XPDFTreeEntry **listHead);
 static void createGC(Widget widget);
 static void destroyGC(Widget widget);
-static void layout(Widget widget, Widget instigator);
+static void tqlayout(Widget widget, Widget instigator);
 static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
 			 XPDFTreeEntry *e, Position x, Position y,
 			 Boolean visible);
@@ -66,7 +66,7 @@ static void calcSize(Widget widget, Widget instigator,
 static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
 			    XPDFTreeEntry *e,
 			    Dimension *width, Dimension *height);
-static Boolean needRelayout(Widget oldWidget, Widget newWidget);
+static Boolean needRetqlayout(Widget oldWidget, Widget newWidget);
 static void click(Widget widget, XEvent *event,
 		  String *params, Cardinal *numParams);
 static Boolean findPosition(XPDFTreeWidget w, int x, int y,
@@ -158,7 +158,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
     XtVersion,					// version
     NULL,					// callback_private
     defaultTranslations,			// tm_table
-    &queryGeometry,				// query_geometry
+    &queryGeometry,				// query_tqgeometry
     NULL,					// display_accelerator
     NULL					// extension
   },
@@ -195,9 +195,9 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
   { // XPDFTree
     &createGC,					// createGC
     &destroyGC,					// destroyGC
-    &layout,					// layout
+    &tqlayout,					// tqlayout
     &calcSize,					// calcSize
-    &needRelayout,				// needRelayout
+    &needRetqlayout,				// needRetqlayout
     NULL					// extension
   }
 };
@@ -218,14 +218,14 @@ static void classPartInitialize(WidgetClass widgetCls) {
   if (wc->treeClass.destroyGC == XPDFInheritDestroyGC) {
     wc->treeClass.destroyGC = sc->treeClass.destroyGC;
   }
-  if (wc->treeClass.layout == XPDFInheritLayout) {
-    wc->treeClass.layout = sc->treeClass.layout;
+  if (wc->treeClass.tqlayout == XPDFInheritLayout) {
+    wc->treeClass.tqlayout = sc->treeClass.tqlayout;
   }
   if (wc->treeClass.calcSize == XPDFInheritCalcSize) {
     wc->treeClass.calcSize = sc->treeClass.calcSize;
   }
-  if (wc->treeClass.needRelayout == XPDFInheritNeedRelayout) {
-    wc->treeClass.needRelayout = sc->treeClass.needRelayout;
+  if (wc->treeClass.needRetqlayout == XPDFInheritNeedRetqlayout) {
+    wc->treeClass.needRetqlayout = sc->treeClass.needRetqlayout;
   }
 }
 
@@ -259,8 +259,8 @@ static void destroy(Widget widget) {
 }
 
 static void destroySubtree(XPDFTreeEntry *e) {
-  if (e->children) {
-    destroySubtree(e->children);
+  if (e->tqchildren) {
+    destroySubtree(e->tqchildren);
   }
   if (e->next) {
     destroySubtree(e->next);
@@ -270,10 +270,10 @@ static void destroySubtree(XPDFTreeEntry *e) {
 static void resize(Widget widget) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(widget);
 
-  if (cls->treeClass.layout) {
-    (*cls->treeClass.layout)(widget, NULL);
+  if (cls->treeClass.tqlayout) {
+    (*cls->treeClass.tqlayout)(widget, NULL);
   } else {
-    layout(widget, NULL);
+    tqlayout(widget, NULL);
   }
 }
 
@@ -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->children) {
+  if (e->tqchildren) {
     if (c->entryExpanded) {
       drawExpandedIcon(w, x - 8, y);
       y2 = y; // make gcc happy
-      for (child = e->children; child; child = child->next) {
+      for (child = e->tqchildren; 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);
@@ -346,16 +346,16 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget,
   XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget;
   XPDFTreeWidget nw = (XPDFTreeWidget)newWidget;
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(nw);
-  Boolean relayout, redisp;
+  Boolean retqlayout, redisp;
 
-  // check to see if layout-affecting resources have changed
-  if (cls->treeClass.needRelayout) {
-    relayout = (*cls->treeClass.needRelayout)((Widget)ow, (Widget)nw);
+  // check to see if tqlayout-affecting resources have changed
+  if (cls->treeClass.needRetqlayout) {
+    retqlayout = (*cls->treeClass.needRetqlayout)((Widget)ow, (Widget)nw);
   } else {
-    relayout = needRelayout((Widget)ow, (Widget)nw);
+    retqlayout = needRetqlayout((Widget)ow, (Widget)nw);
   }
   redisp = False;
-  if (relayout) {
+  if (retqlayout) {
 
     // calculate a new ideal size (reset the widget size first so
     // calcSize will compute a new one)
@@ -372,14 +372,14 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget,
       calcSize((Widget)nw, NULL, &nw->core.width, &nw->core.height);
     }
 
-    // if resources have changed but size hasn't, layout manually
+    // if resources have changed but size hasn't, tqlayout manually
     // (because Xt just looks at the size)
     if (nw->core.width == ow->core.width &&
 	nw->core.height == ow->core.height) {
-      if (cls->treeClass.layout) {
-	(*cls->treeClass.layout)((Widget)nw, NULL);
+      if (cls->treeClass.tqlayout) {
+	(*cls->treeClass.tqlayout)((Widget)nw, NULL);
       } else {
-	layout((Widget)nw, NULL);
+	tqlayout((Widget)nw, NULL);
       }
       redisp = True;
     }
@@ -393,13 +393,13 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
 			    XtWidgetGeometry *reply) {
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget);
 
-  // our parent rejected a geometry request, so accept the compromise
-  // and relayout
+  // our parent rejected a tqgeometry request, so accept the compromise
+  // and retqlayout
   if (!reply->request_mode) {
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)(newWidget, NULL);
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)(newWidget, NULL);
     } else {
-      layout(newWidget, NULL);
+      tqlayout(newWidget, NULL);
     }
   }
   *request = *reply;
@@ -454,7 +454,7 @@ static XtGeometryResult geometryManager(Widget widget,
     return XtGeometryNo;
   }
 
-  // save the current geometry
+  // save the current tqgeometry
   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 geometry request to our parent
+  // send tqgeometry request to our parent
   parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
     parentReq.request_mode |= XtCWQueryOnly;
@@ -491,15 +491,15 @@ static XtGeometryResult geometryManager(Widget widget,
   }
 
   if (result == XtGeometryNo || (request->request_mode & XtCWQueryOnly)) {
-    // restore the original geometry
+    // restore the original tqgeometry
     w->core.width = curWidth;
     w->core.height = curHeight;
     w->core.border_width = curBW;
   } else {
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)((Widget)w, widget);
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)((Widget)w, widget);
     } else {
-      layout((Widget)w, widget);
+      tqlayout((Widget)w, widget);
     }
   }
 
@@ -529,11 +529,11 @@ static void changeManaged(Widget widget) {
   while (XtMakeResizeRequest(widget, width, height, &width, &height)
 	 == XtGeometryAlmost) ;
 
-  // relayout
-  if (cls->treeClass.layout) {
-    (*cls->treeClass.layout)(widget, NULL);
+  // retqlayout
+  if (cls->treeClass.tqlayout) {
+    (*cls->treeClass.tqlayout)(widget, NULL);
   } else {
-    layout(widget, NULL);
+    tqlayout(widget, NULL);
   }
 
 #if XmVERSION > 1
@@ -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->children = NULL;
+  c->e->tqchildren = NULL;
   c->e->next = NULL;
   if (c->entryParent) {
-    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
+    insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
   } else {
     insertChildOnList(c->e, &w->tree.root);
   }
@@ -573,11 +573,11 @@ static void deleteSubtree(Widget widget) {
   if (!c->e) {
     return;
   }
-  while (c->e->children) {
-    deleteSubtree(c->e->children->widget);
+  while (c->e->tqchildren) {
+    deleteSubtree(c->e->tqchildren->widget);
   }
   if (c->entryParent) {
-    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->children);
+    deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren);
   } else {
     deleteChildFromList(c->e, &w->tree.root);
   }
@@ -591,7 +591,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   XPDFTreeWidget w = (XPDFTreeWidget)XtParent(newWidget);
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass((Widget)w);
   XPDFTreeConstraint oc, nc;
-  Boolean relayout;
+  Boolean retqlayout;
   Dimension width, height;
 
   if (!XtIsManaged(newWidget)) {
@@ -599,25 +599,25 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
   }
   oc = XPDFTreeCPart(oldWidget);
   nc = XPDFTreeCPart(newWidget);
-  relayout = False;
+  retqlayout = False;
   if (nc->entryParent != oc->entryParent ||
       nc->entryPosition != oc->entryPosition) {
     if (oc->entryParent) {
-      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->children);
+      deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->tqchildren);
     } else {
       deleteChildFromList(oc->e, &w->tree.root);
     }
     if (nc->entryParent) {
-      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->children);
+      insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->tqchildren);
     } else {
       insertChildOnList(nc->e, &w->tree.root);
     }
-    relayout = True;
+    retqlayout = True;
   } else if (nc->entryExpanded != oc->entryExpanded) {
-    relayout = True;
+    retqlayout = True;
   }
 
-  if (relayout) {
+  if (retqlayout) {
 
     // calculate a new ideal size (reset the widget size first so
     // calcSize will compute a new one)
@@ -634,15 +634,15 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget,
     while (XtMakeResizeRequest((Widget)w, width, height, &width, &height)
 	   == XtGeometryAlmost) ;
 
-    // relayout the widget
-    if (cls->treeClass.layout) {
-      (*cls->treeClass.layout)((Widget)w, NULL);
+    // retqlayout the widget
+    if (cls->treeClass.tqlayout) {
+      (*cls->treeClass.tqlayout)((Widget)w, NULL);
     } else {
-      layout((Widget)w, NULL);
+      tqlayout((Widget)w, NULL);
     }
   }
 
-  return relayout;
+  return retqlayout;
 }
 
 static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead) {
@@ -701,7 +701,7 @@ static void destroyGC(Widget widget) {
   XtReleaseGC(widget, w->tree.dottedGC);
 }
 
-static void layout(Widget widget, Widget instigator) {
+static void tqlayout(Widget widget, Widget instigator) {
   XPDFTreeWidget w = (XPDFTreeWidget)widget;
   XPDFTreeEntry *e;
   Position x, y;
@@ -745,9 +745,9 @@ static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
     }
   }
 
-  // place this entry's children
+  // place this entry's tqchildren
   x += xpdfTreeIndent;
-  for (child = e->children; child; child = child->next) {
+  for (child = e->tqchildren; 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 children
+  // if this entry is expanded, get size of all of its tqchildren
   if (c->entryExpanded) {
-    for (child = e->children; child; child = child->next) {
+    for (child = e->tqchildren; child; child = child->next) {
       calcSubtreeSize(w, instigator, child, &w2, &h2);
       w2 += xpdfTreeIndent;
       if (w2 > w1) {
@@ -836,7 +836,7 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator,
   *height = h1;
 }
 
-static Boolean needRelayout(Widget oldWidget, Widget newWidget) {
+static Boolean needRetqlayout(Widget oldWidget, Widget newWidget) {
   XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget;
   XPDFTreeWidget nw = (XPDFTreeWidget)newWidget;
 
@@ -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)->children) {
+	     (*e)->tqchildren) {
     *onExpandIcon = True;
     return True;
   }
   c = XPDFTreeCPart(child);
   if (!c || c->entryExpanded) {
-    for (e2 = (*e)->children; e2; e2 = e2->next) {
+    for (e2 = (*e)->tqchildren; e2; e2 = e2->next) {
       *e = e2;
       if (findPositionInSubtree(w, x, y, e, onExpandIcon)) {
 	return True;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
index 16ab137a8..9f31f9e21 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
@@ -22,14 +22,14 @@ typedef Boolean (*XPDFNeedRelayoutProc)(Widget oldWidget, Widget newWidget);
 #define XPDFInheritDestroyGC ((XtWidgetProc)_XtInherit)
 #define XPDFInheritLayout ((XPDFLayoutProc)_XtInherit)
 #define XPDFInheritCalcSize ((XPDFCalcSizeProc)_XtInherit)
-#define XPDFInheritNeedRelayout ((XPDFNeedRelayoutProc)_XtInherit)
+#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit)
 
 typedef struct {
   XtWidgetProc createGC;
   XtWidgetProc destroyGC;
-  XPDFLayoutProc layout;
+  XPDFLayoutProc tqlayout;
   XPDFCalcSizeProc calcSize;
-  XPDFNeedRelayoutProc needRelayout;
+  XPDFNeedRelayoutProc needRetqlayout;
   XtPointer extension;
 } XPDFTreeClassPart;
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index a8c8f8f0f..de691914e 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], XmNgeometry, "+0+0"); ++n;
+    XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n;
   } else if (app->getGeometry()) {
-    XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n;
+    XtSetArg(args[n], XmNtqgeometry, 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], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, 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], XmNalignment, XmALIGNMENT_BEGINNING); ++n;
+  XtSetArg(args[n], XmNtqalignment, 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 ef47fb6e5..d4103df2e 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 geometry"},
-  {"-geometry",   argStringDummy, NULL,           0,
-   "initial window geometry"},
+   "initial window tqgeometry"},
+  {"-tqgeometry",   argStringDummy, NULL,           0,
+   "initial window tqgeometry"},
   {"-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 8d160b573..2fa566fac 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -21,7 +21,7 @@
 */
 
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqfontinfo.h>
@@ -174,7 +174,7 @@ TQString RTFWorker::makeTable(const FrameAnchor& anchor)
         for (it=paraList->begin();it!=end;++it)
         {
             rowText += endOfParagraph;
-            rowText += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
+            rowText += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
             rowText += m_eol;
             endOfParagraph = "\\par"; // The problem is that the last paragraph ends with \cell not with \par
         }
@@ -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.at(i) = image.at(i+22); // As we use uint, we need at()  ( [] uses int only .)
+                image.tqat(i) = image.tqat(i+22); // As we use uint, we need at()  ( [] uses int only .)
             image.resize( image.size()-22 );
         }
     }
@@ -362,7 +362,7 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText,
 }
 
 TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
-    const LayoutData& layout, const ValueListFormatData &paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList)
 {
     TQString str;
     TQString content;
@@ -374,40 +374,40 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\intbl";
 
 //lists
-    if (layout.counter.style)
+    if (tqlayout.counter.style)
         {
         markup += "{\\pntext\\pard\\plain";
-        if( layout.formatData.text.fontSize >= 0)
+        if( tqlayout.formatData.text.fontSize >= 0)
         {
                 markup += "\\fs";
-                markup += TQString::number((2 * layout.formatData.text.fontSize));
-                markup += lookupFont("\\f",layout.formatData.text.fontName);
+                markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
+                markup += lookupFont("\\f",tqlayout.formatData.text.fontName);
         }
         markup += " ";
-        markup += layout.counter.text;
+        markup += tqlayout.counter.text;
         markup += "\\tab}{\\*\\pn";
-        if (layout.counter.style > 5)
+        if (tqlayout.counter.style > 5)
         {
         markup += "\\pnlvlblt ";
         markup += "{\\pntxtb ";
-        if (!layout.counter.lefttext.isEmpty() && layout.counter.lefttext != "{" && layout.counter.lefttext != "}")
+        if (!tqlayout.counter.lefttext.isEmpty() && tqlayout.counter.lefttext != "{" && tqlayout.counter.lefttext != "}")
         {
-                markup += layout.counter.lefttext;
+                markup += tqlayout.counter.lefttext;
         }
-        switch (layout.counter.style)
+        switch (tqlayout.counter.style)
         {
         case 6:
         {
                 //custom bullets (one char)
                 //TODO: use correct character/sign for bullet
 
-            markup += layout.counter.customCharacter;
+            markup += tqlayout.counter.customCharacter;
             break;
         }
         case 7:
         {
                 //custom bullets (complex)
-            markup += layout.counter.text;
+            markup += tqlayout.counter.text;
             break;
         }
         case 8:
@@ -435,7 +435,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         {
                 //disc bullets
                 //TODO: use correct character/sign for bullet
-            markup += layout.counter.text;
+            markup += tqlayout.counter.text;
             break;
         }
         default:
@@ -445,23 +445,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         else
         {
-            if (layout.counter.numbering!=0)
+            if (tqlayout.counter.numbering!=0)
 		{
         	    markup += "\\pnlvl";
-        	    markup += TQString::number(layout.counter.depth + 1);
+        	    markup += TQString::number(tqlayout.counter.depth + 1);
         	    markup += "\\pnprev1";
 		}
-        else if (layout.counter.style==1)
+        else if (tqlayout.counter.style==1)
         {
         markup += "\\pnlvlbody";
         }
         else
         {
         markup += "\\pnlvl";
-        markup += TQString::number(11 - layout.counter.style);
+        markup += TQString::number(11 - tqlayout.counter.style);
         }
 
-        switch (layout.counter.style)
+        switch (tqlayout.counter.style)
         {
         case 1:
         {
@@ -492,18 +492,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         markup += "\\pndec";
         }
         markup += "{\\pntxtb ";
-        markup += layout.counter.lefttext;
+        markup += tqlayout.counter.lefttext;
         markup += " }";
     }
         markup += "{\\pntxta ";
-        markup += layout.counter.righttext;
+        markup += tqlayout.counter.righttext;
         markup += " }";
 
         // ### FIXME: that is too late! And why at every list paragraph? (See bug #88241)
-        if (layout.counter.start!=0)
+        if (tqlayout.counter.start!=0)
         {
         markup += "\\pnstart";
-        markup += TQString::number(layout.counter.start);
+        markup += TQString::number(tqlayout.counter.start);
         }
         else
         {
@@ -511,15 +511,15 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
         markup += "\\pnindent0\\pnhang";
 
-        if( layout.formatData.text.fontSize > 0 )
+        if( tqlayout.formatData.text.fontSize > 0 )
         {
         markup += "\\pnfs";
-        markup += TQString::number((2 * layout.formatData.text.fontSize));
+        markup += TQString::number((2 * tqlayout.formatData.text.fontSize));
         }
 
-        if( !layout.formatData.text.fontName.isEmpty() )
+        if( !tqlayout.formatData.text.fontName.isEmpty() )
         {
-            markup += lookupFont("\\pnf", layout.formatData.text.fontName);
+            markup += lookupFont("\\pnf", tqlayout.formatData.text.fontName);
         }
 
         markup += "}";
@@ -527,20 +527,20 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
 
     LayoutData styleLayout;
-    markup += lookupStyle(layout.styleName, styleLayout);
-    markup += layoutToRtf(styleLayout,layout,true);
+    markup += lookupStyle(tqlayout.styleName, styleLayout);
+    markup += layoutToRtf(styleLayout,tqlayout,true);
 
-    if ( 1==layout.formatData.text.verticalAlignment )
+    if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
         markup += "\\sub"; //Subscript
     }
-    else if ( 2==layout.formatData.text.verticalAlignment )
+    else if ( 2==tqlayout.formatData.text.verticalAlignment )
     {
         markup += "\\super"; //Superscript
     }
 
 
-    if (layout.pageBreakBefore)
+    if (tqlayout.pageBreakBefore)
         content += "\\page ";
 
 
@@ -554,7 +554,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
         TQString partialText;
 
-        FormatData formatRef = layout.formatData;
+        FormatData formatRef = tqlayout.formatData;
 
         for ( paraFormatDataIt = paraFormatDataList.begin ();
               paraFormatDataIt != paraFormatDataList.end ();
@@ -728,7 +728,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
                         const TQString prefixSaved = m_prefix;
                         m_prefix = TQString();
                         for (it=paraList->begin();it!=end;++it)
-                            fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList);
+                            fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList);
                         m_prefix = prefixSaved;
                         content += "{\\super ";
                         content += automatic ? "\\chftn " : value;
@@ -779,7 +779,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
         }
     }
 
-    if (layout.pageBreakAfter)
+    if (tqlayout.pageBreakAfter)
         content += "\\page";
 
     if (!content.isEmpty())
@@ -807,10 +807,10 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 }
 
 bool RTFWorker::doFullParagraph(const TQString& paraText,
-    const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+    const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
     kdDebug(30515) << "Entering RTFWorker::doFullParagraph" << endl << paraText << endl;
-    TQString par = ProcessParagraphData( paraText, layout, paraFormatDataList);
+    TQString par = ProcessParagraphData( paraText, tqlayout, paraFormatDataList);
     m_textBody += par;
     kdDebug(30515) << "Quiting RTFWorker::doFullParagraph" << endl;
     return true;
@@ -836,7 +836,7 @@ bool RTFWorker::doHeader(const HeaderData& header)
     TQValueList<ParaData>::ConstIterator it;
 	TQValueList<ParaData>::ConstIterator end(header.para.end());
     for (it=header.para.begin();it!=end;++it)
-        content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
 
     if (content!="\\par\\pard\\plain")
     {
@@ -871,7 +871,7 @@ bool RTFWorker::doFooter(const FooterData& footer)
     TQValueList<ParaData>::ConstIterator it;
 	TQValueList<ParaData>::ConstIterator end(footer.para.end());
     for (it=footer.para.begin();it!=end;++it)
-        content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList);
+        content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList);
 
     if (content!="\\par\\pard\\plain")
     {
@@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void)
         }
 #else
         else
-        // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
+        // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out.
         {
             TQFontInfo info(*it);
-            switch (info.styleHint())
+            switch (info.tqstyleHint())
             {
             case TQFont::SansSerif:
             default:
@@ -1182,7 +1182,7 @@ TQString RTFWorker::closeSpan(const FormatData& , const FormatData& )
     return result;
 }
 
-// The following function encodes the kword unicode characters into
+// The following function encodes the kword tqunicode characters into
 // RTF seven bit ASCII. This affects any 8 bit characters.
 // They are encoded either with \' or with \u
 TQString RTFWorker::escapeRtfText ( const TQString& text ) const
@@ -1192,8 +1192,8 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const
     const uint length = text.length();
     for ( uint i = 0; i < length; i++ )
     {
-        TQChar TQCh ( text.at( i ) );  // get out one unicode char from the string
-        const ushort ch = TQCh.unicode();  // take unicode value of the char
+        TQChar TQCh ( text.at( i ) );  // get out one tqunicode char from the string
+        const ushort ch = TQCh.tqunicode();  // take tqunicode value of the char
 
         if ( TQCh == '\\' )  escapedText += "\\\\"; // back-slash
         else if ( TQCh == '{' )   escapedText += "\\{";
@@ -1226,7 +1226,7 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const
         }
         else if ( ch >= 256) // check for a higher code non-ASCII character
         {
-            // encode this as decimal unicode with a replacement character.
+            // encode this as decimal tqunicode with a replacement character.
             escapedText += "\\u";
             escapedText += TQString::number ( ch, 10 );
             // We decompose the character. If it works, the first character is whitout any accent.
@@ -1270,15 +1270,15 @@ bool RTFWorker::doFullPaperBorders (const double top, const double left,
     return true;
 }
 
-bool RTFWorker::doFullDefineStyle(LayoutData& layout)
+bool RTFWorker::doFullDefineStyle(LayoutData& tqlayout)
 {
     //Register the new style in the style list
-    m_styleList << layout;
+    m_styleList << tqlayout;
 
     // Now we must register a few things (with help of the lookup methods.)
-    lookupFont("\\f", layout.formatData.text.fontName);
-    lookupColor(TQString(), layout.formatData.text.fgColor);
-    lookupColor(TQString(), layout.formatData.text.bgColor);
+    lookupFont("\\f", tqlayout.formatData.text.fontName);
+    lookupColor(TQString(), tqlayout.formatData.text.fgColor);
+    lookupColor(TQString(), tqlayout.formatData.text.bgColor);
 
     return true;
 }
@@ -1459,121 +1459,121 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin,
 }
 
 TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
-    const LayoutData& layout, const bool force)
+    const LayoutData& tqlayout, const bool force)
 {
     TQString strLayout;
 
 
-    if (force || (layoutOrigin.alignment!=layout.alignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
-        if (layout.alignment=="left")
+        if (tqlayout.tqalignment=="left")
             strLayout += "\\ql";
-        else if (layout.alignment== "right")
+        else if (tqlayout.tqalignment== "right")
             strLayout += "\\qr";
-        else if (layout.alignment=="center")
+        else if (tqlayout.tqalignment=="center")
             strLayout += "\\qc";
-        else if (layout.alignment=="justify")
+        else if (tqlayout.tqalignment=="justify")
             strLayout += "\\qj";
-        else if ( layout.alignment=="auto")
+        else if ( tqlayout.tqalignment=="auto")
         {
             // ### TODO: what for BIDI?
             //strLayout += "\\ql";
         }
         else
         {
-            kdWarning(30515) << "Unknown alignment: " << layout.alignment << endl;
+            kdWarning(30515) << "Unknown tqalignment: " << tqlayout.tqalignment << endl;
         }
     }
 
-    if ((layout.indentLeft>=0.0)
-        && (force || (layoutOrigin.indentLeft!=layout.indentLeft)))
+    if ((tqlayout.indentLeft>=0.0)
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
        strLayout += "\\li";
-       strLayout += TQString::number(int(layout.indentLeft)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10);
     }
 
-    if ((layout.indentRight>=0.0)
-        && (force || (layoutOrigin.indentRight!=layout.indentRight)))
+    if ((tqlayout.indentRight>=0.0)
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
        strLayout += "\\ri";
-       strLayout += TQString::number(int(layout.indentRight)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentRight)*20, 10);
     }
 
-    if (force || (layoutOrigin.indentFirst!=layout.indentFirst))
+    if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst))
     {
        strLayout += "\\fi";
-       strLayout += TQString::number(int(layout.indentFirst)*20, 10);
+       strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10);
     }
 
-    if ((layout.marginBottom>=0.0)
-        && (force || (layoutOrigin.marginBottom!=layout.marginBottom)))
+    if ((tqlayout.marginBottom>=0.0)
+        && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom)))
     {
        strLayout += "\\sa";
-       strLayout += TQString::number(int(layout.marginBottom)*20 ,10);
+       strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10);
     }
 
-    if ((layout.marginTop>=0.0)
-        && (force || (layoutOrigin.marginTop!=layout.marginTop)))
+    if ((tqlayout.marginTop>=0.0)
+        && (force || (layoutOrigin.marginTop!=tqlayout.marginTop)))
     {
        strLayout += "\\sb";
-       strLayout += TQString::number(int(layout.marginTop)*20, 10);
+       strLayout += TQString::number(int(tqlayout.marginTop)*20, 10);
     }
 
-    if (force || (layoutOrigin.keepLinesTogether!=layout.keepLinesTogether))
+    if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether))
     {
-       if(layout.keepLinesTogether) strLayout += "\\keep";
+       if(tqlayout.keepLinesTogether) strLayout += "\\keep";
     }
 
-    // Note: there seems to be too many problems of using a page break in a layout
+    // Note: there seems to be too many problems of using a page break in a tqlayout
     // - KWord's RTF import filter makes the page break immediately (also in styles)
     // - AbiWord's RTF import does not like \*\pgbrk
     // ### TODO: decide if we really remove this code
 #if 0
-    if (force || (layoutOrigin.pageBreakBefore!=layout.pageBreakBefore))
+    if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore))
     {
-       if(layout.pageBreakBefore) strLayout += "\\pagebb";
+       if(tqlayout.pageBreakBefore) strLayout += "\\pagebb";
     }
 
     // Note: RTF doesn't specify "page break after"
     // \*\pgbrk0 is used after OpenOffice.org Writer
-    if (force || (layoutOrigin.pageBreakAfter!=layout.pageBreakAfter))
+    if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter))
     {
-       if(layout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
+       if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
     }
 #endif
 
     if (force
-        || ( layoutOrigin.lineSpacingType != layout.lineSpacingType )
-        || ( layoutOrigin.lineSpacing != layout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
-        if ( layout.lineSpacingType==LayoutData::LS_SINGLE  )
+        if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE  )
            ;// do nothing, single linespace is default in RTF
 
-        else if ( layout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_ONEANDHALF  )
            strLayout += "\\sl360\\slmult1"; // one-and-half linespace
 
-        else if ( layout.lineSpacingType==LayoutData::LS_DOUBLE  )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_DOUBLE  )
            strLayout += "\\sl480\\slmult1"; // double linespace
 
-        else if ( layout.lineSpacingType==LayoutData::LS_ATLEAST  )
-           strLayout += TQString("\\sl%1\\slmult0").arg(int(layout.lineSpacing)*20);
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST  )
+           strLayout += TQString("\\sl%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
 
-        else if ( layout.lineSpacingType==LayoutData::LS_MULTIPLE  )
-           strLayout += TQString("\\sl%1\\slmult1").arg( int(layout.lineSpacing)*240 );
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE  )
+           strLayout += TQString("\\sl%1\\slmult1").tqarg( int(tqlayout.lineSpacing)*240 );
 
-        else if ( layout.lineSpacingType==LayoutData::LS_CUSTOM )
+        else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM )
            // "Custom" in KWord is like "Exactly" in MS Word
-           strLayout += TQString("\\sl-%1\\slmult0").arg(int(layout.lineSpacing)*20);
+           strLayout += TQString("\\sl-%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20);
 
         else
-            kdWarning(30515) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl;
+            kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl;
     }
 
-    if (!layout.tabulatorList.isEmpty()
-        && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) ))
+    if (!tqlayout.tabulatorList.isEmpty()
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         TabulatorList::ConstIterator it;
-        for (it=layout.tabulatorList.begin();it!=layout.tabulatorList.end();++it)
+        for (it=tqlayout.tabulatorList.begin();it!=tqlayout.tabulatorList.end();++it)
         {
             switch ((*it).m_type)
             {
@@ -1606,7 +1606,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
     // shadow support
     // note shadow in KWord is more full-feature/sophisticated than RTF
     // here we just treat KWord's shadow as simple \shad mark-up
-    if( layout.shadowDistance > 0 )
+    if( tqlayout.shadowDistance > 0 )
     {
        strLayout += "\\shad";
     }
@@ -1615,7 +1615,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
 
     // This must remain last, as it adds a terminating space.
     strLayout+=textFormatToRtf(layoutOrigin.formatData.text,
-        layout.formatData.text,force);
+        tqlayout.formatData.text,force);
 
     return strLayout;
 }
@@ -1708,9 +1708,9 @@ TQString RTFWorker::lookupStyle(const TQString& styleName, LayoutData& returnLay
     }
 
     kdDebug(30515) << "New style: " << styleName << " count: " << counter << endl;
-    LayoutData layout;
-    m_styleList << layout;
-    returnLayout=layout;
+    LayoutData tqlayout;
+    m_styleList << tqlayout;
+    returnLayout=tqlayout;
 
     strMarkup += TQString::number(counter);
     return strMarkup;
diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h
index f5707680b..88158efed 100644
--- a/filters/kword/rtf/export/ExportFilter.h
+++ b/filters/kword/rtf/export/ExportFilter.h
@@ -44,7 +44,7 @@ public:
     virtual bool doCloseFile(void); ///< Close file in normal conditions
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
     virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo);
     virtual bool doOpenTextFrameSet(void);
@@ -53,7 +53,7 @@ public:
         const double width, const double height, const int orientation);
     virtual bool doFullPaperBorders (const double top, const double left,
         const double bottom, const double right);
-    virtual bool doFullDefineStyle(LayoutData& layout);
+    virtual bool doFullDefineStyle(LayoutData& tqlayout);
     virtual bool doHeader(const HeaderData& header);
     virtual bool doFooter(const FooterData& footer);
     virtual bool doVariableSettings(const VariableSettingsData& vs);
@@ -69,7 +69,7 @@ private:
      */
     TQString escapeRtfText ( const TQString& text ) const;
     TQString ProcessParagraphData ( const TQString &paraText,
-        const LayoutData& layout, const ValueListFormatData &paraFormatDataList);
+        const LayoutData& tqlayout, const ValueListFormatData &paraFormatDataList);
     TQString formatTextParagraph(const TQString& strText,
         const FormatData& formatOrigin, const FormatData& format);
     TQString makeTable(const FrameAnchor& anchor);
@@ -81,7 +81,7 @@ private:
     TQString textFormatToRtf(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force);
     TQString layoutToRtf(const LayoutData& layoutOrigin,
-        const LayoutData& layout, const bool force);
+        const LayoutData& tqlayout, const bool force);
     TQString lookupFont(const TQString& markup, const TQString& fontName);
     TQString lookupColor(const TQString& markup, const TQColor& color);
     TQString lookupStyle(const TQString& styleName, LayoutData& returnLayout);
diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc
index 6f23530b1..15ff976be 100644
--- a/filters/kword/rtf/export/rtfexport.cc
+++ b/filters/kword/rtf/export/rtfexport.cc
@@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to )
 {
     if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" ))
     {
@@ -77,7 +77,7 @@ KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCS
         return KoFilter::StupidError;
     }
     
-    KoFilter::ConversionStatus result=leader->convert(m_chain, from,to );
+    KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to );
 
     delete leader;
     delete worker;
diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h
index f43f6a070..060139ed6 100644
--- a/filters/kword/rtf/export/rtfexport.h
+++ b/filters/kword/rtf/export/rtfexport.h
@@ -22,7 +22,7 @@
 #define RTFEXPORT_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -39,7 +39,7 @@ public:
     RTFExport(KoFilter *parent, const char *name, const TQStringList &);
     virtual ~RTFExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // RTFEXPORT_H
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index eb8c467de..94fad6970 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -98,7 +98,7 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"b",		setToggleProperty,	state.format.bold, 0 ),
         // \bin is handled in the tokenizer
 	MEMBER(	"@colortbl",	"blue",		setNumericProperty,	blue, 0 ),
-	MEMBER(	0L,		"box",		setEnumProperty,	state.layout.border, 0 ),
+	MEMBER(	0L,		"box",		setEnumProperty,	state.tqlayout.border, 0 ),
 	PROP(	0L,		"brdrb",	selectLayoutBorder,	0L, 3 ),
 	PROP(	0L,		"brdrcf",	setBorderColor,           0L, 0 ),
 	PROP(	0L,		"brdrdash",	setBorderStyle,		0L, RTFBorder::Dashes ),
@@ -148,7 +148,7 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@rtf",		"facingp",	setFlagProperty,	facingPages, true ),
 	PROP(	0L,		"fcharset",	setCharset,		0L, 0 ), // Not needed with TQt
 	PROP(	"@fonttbl",	"fdecor",	setFontStyleHint,	0L, TQFont::Decorative ),
-	MEMBER(	0L,		"fi",		setNumericProperty,	state.layout.firstIndent, 0 ),
+	MEMBER(	0L,		"fi",		setNumericProperty,	state.tqlayout.firstIndent, 0 ),
 	PROP(	"@fonttbl",	"fmodern",	setFontStyleHint,	0L, TQFont::TypeWriter ),
 	PROP(	"@fonttbl",	"fnil",		setFontStyleHint,	0L, TQFont::AnyStyle ),
 	MEMBER(	0L,		"footery",	setNumericProperty,	state.section.footerMargin, 0 ),
@@ -162,13 +162,13 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@colortbl",	"green",	setNumericProperty,	green, 0 ),
 	MEMBER(	0L,		"headery",	setNumericProperty,	state.section.headerMargin, 0 ),
 	MEMBER(	0L,		"i",		setToggleProperty,	state.format.italic, 0 ),
-	MEMBER(	0L,		"intbl",	setFlagProperty,	state.layout.inTable, true ),
+	MEMBER(	0L,		"intbl",	setFlagProperty,	state.tqlayout.inTable, true ),
 	PROP(	"@pict",	"jpegblip",	setPictureType,	        0L, RTFPicture::JPEG ),
-	MEMBER(	0L,		"keep",		setFlagProperty,	state.layout.keep, true ),
-	MEMBER(	0L,		"keepn",	setFlagProperty,	state.layout.keepNext, true ),
+	MEMBER(	0L,		"keep",		setFlagProperty,	state.tqlayout.keep, true ),
+	MEMBER(	0L,		"keepn",	setFlagProperty,	state.tqlayout.keepNext, true ),
 	MEMBER(	"@rtf",		"landscape",	setFlagProperty,	landscape, true ),
 	PROP(	0L,		"ldblquote",	insertSymbol,		0L, 0x201c ),
-	MEMBER(	0L,		"li",		setNumericProperty,	state.layout.leftIndent, 0 ),
+	MEMBER(	0L,		"li",		setNumericProperty,	state.tqlayout.leftIndent, 0 ),
 	PROP(	0L,		"line",		insertSymbol,		0L, 0x000a ),
 	PROP(	0L,		"lquote",	insertSymbol,		0L, 0x2018 ),
 	PROP(	0L,		"ltrmark",	insertSymbol,		0L, 0x200e ),
@@ -180,14 +180,14 @@ static RTFProperty propertyTable[] =
 	MEMBER(	"@rtf",		"margt",	setNumericProperty,	topMargin, 0 ),
 	MEMBER(	0L,		"nosupersub",	setEnumProperty,	state.format.vertAlign, RTFFormat::Normal ),
 	PROP(	"Text",		"page",		insertPageBreak,	0L, 0 ),
-	MEMBER(	0L,		"pagebb",	setFlagProperty,	state.layout.pageBB, true ),
+	MEMBER(	0L,		"pagebb",	setFlagProperty,	state.tqlayout.pageBB, true ),
 	MEMBER(	"@rtf",		"paperh",	setNumericProperty,	paperHeight, 0 ),
 	MEMBER(	"@rtf",		"paperw",	setNumericProperty,	paperWidth, 0 ),
 	PROP(	"Text",		"par",		insertParagraph,	0L, 0 ),
 	PROP(	0L,		"pard",		setParagraphDefaults,	0L, 0 ),
 	PROP(	0L,		"pc",	setPcCodepage,		0L, 0 ),
 	PROP(	0L,		"pca",	setPcaCodepage,		0L, 0 ),
-	MEMBER(	0L,		"pgbrk",	setToggleProperty,	state.layout.pageBA, true ),
+	MEMBER(	0L,		"pgbrk",	setToggleProperty,	state.tqlayout.pageBA, true ),
 	MEMBER(	"@pict",	"piccropb",	setNumericProperty,	picture.cropBottom, 0 ),
 	MEMBER(	"@pict",	"piccropl",	setNumericProperty,	picture.cropLeft, 0 ),
 	MEMBER(	"@pict",	"piccropr",	setNumericProperty,	picture.cropRight, 0 ),
@@ -202,25 +202,25 @@ 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.layout.alignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"qj",		setEnumProperty,	state.layout.alignment, RTFLayout::Justified ),
-	MEMBER(	0L,		"ql",		setEnumProperty,	state.layout.alignment, RTFLayout::Left ),
+	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 ),
 	PROP(	0L,		"qmspace",	insertSymbol,		0L, 0x2004 ),
-	MEMBER(	0L,		"qr",		setEnumProperty,	state.layout.alignment, RTFLayout::Right ),
+	MEMBER(	0L,		"qr",		setEnumProperty,	state.tqlayout.tqalignment, RTFLayout::Right ),
 	PROP(	0L,		"rdblquote",	insertSymbol,		0L, 0x201d ),
 	MEMBER(	"@colortbl",	"red",		setNumericProperty,	red, 0 ),
-	MEMBER(	0L,		"ri",		setNumericProperty,	state.layout.rightIndent, 0 ),
+	MEMBER(	0L,		"ri",		setNumericProperty,	state.tqlayout.rightIndent, 0 ),
 	PROP(	"Text",		"row",		insertTableRow,		0L, 0 ),
 	PROP(	0L,		"rquote",	insertSymbol,		0L, 0x2019 ),
 	PROP(	0L,		"rtlmark",	insertSymbol,		0L, 0x200f ),
-	MEMBER(	0L,		"s",		setNumericProperty,	state.layout.style, 0 ),
-	MEMBER(	0L,		"sa",		setNumericProperty,	state.layout.spaceAfter, 0 ),
-	MEMBER(	0L,		"sb",		setNumericProperty,	state.layout.spaceBefore, 0 ),
+	MEMBER(	0L,		"s",		setNumericProperty,	state.tqlayout.style, 0 ),
+	MEMBER(	0L,		"sa",		setNumericProperty,	state.tqlayout.spaceAfter, 0 ),
+	MEMBER(	0L,		"sb",		setNumericProperty,	state.tqlayout.spaceBefore, 0 ),
 	MEMBER(	0L,		"scaps",		setToggleProperty,	state.format.smallCaps, 0 ),
 	PROP(	"Text",		"sect",		insertPageBreak,	0L, 0 ),
 	PROP(	0L,		"sectd",	setSectionDefaults,	0L, 0 ),
-	MEMBER(	0L,		"sl",		setNumericProperty,	state.layout.spaceBetween, 0 ),
-	MEMBER(	0L,		"slmult",	setToggleProperty,	state.layout.spaceBetweenMultiple, 0 ),
+	MEMBER(	0L,		"sl",		setNumericProperty,	state.tqlayout.spaceBetween, 0 ),
+	MEMBER(	0L,		"slmult",	setToggleProperty,	state.tqlayout.spaceBetweenMultiple, 0 ),
 	MEMBER(	"@stylesheet",	"snext",	setNumericProperty,	style.next, 0 ),
 	MEMBER(	0L,		"strike",	setToggleProperty,	state.format.strike, 0 ),
 	MEMBER(	0L,		"striked",	setToggleProperty,	state.format.striked, 0 ),
@@ -228,18 +228,18 @@ static RTFProperty propertyTable[] =
 	MEMBER(	0L,		"super",	setEnumProperty,	state.format.vertAlign, RTFFormat::SuperScript ),
 	PROP(	0L,		"tab",		insertSymbol,		0L, 0x0009 ),
 	MEMBER(	0L,		"titlepg",	setFlagProperty,	state.section.titlePage, true ),
-	MEMBER(	0L,		"tldot",	setEnumProperty,	state.layout.tab.leader, RTFTab::Dots ),
-	MEMBER(	0L,		"tlhyph",	setEnumProperty,	state.layout.tab.leader, RTFTab::Hyphens ),
-	MEMBER(	0L,		"tlth",		setEnumProperty,	state.layout.tab.leader, RTFTab::ThickLine ),
-	MEMBER(	0L,		"tlul",		setEnumProperty,	state.layout.tab.leader, RTFTab::Underline ),
-	MEMBER(	0L,		"tqc",		setEnumProperty,	state.layout.tab.type, RTFTab::Centered ),
-	MEMBER(	0L,		"tqdec",	setEnumProperty,	state.layout.tab.type, RTFTab::Decimal ),
-	MEMBER(	0L,		"tqr",		setEnumProperty,	state.layout.tab.type, RTFTab::FlushRight ),
+	MEMBER(	0L,		"tldot",	setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Dots ),
+	MEMBER(	0L,		"tlhyph",	setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Hyphens ),
+	MEMBER(	0L,		"tlth",		setEnumProperty,	state.tqlayout.tab.leader, RTFTab::ThickLine ),
+	MEMBER(	0L,		"tlul",		setEnumProperty,	state.tqlayout.tab.leader, RTFTab::Underline ),
+	MEMBER(	0L,		"tqc",		setEnumProperty,	state.tqlayout.tab.type, RTFTab::Centered ),
+	MEMBER(	0L,		"tqdec",	setEnumProperty,	state.tqlayout.tab.type, RTFTab::Decimal ),
+	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.alignment, RTFLayout::Centered ),
-	MEMBER(	0L,		"trql",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Left ),
-	MEMBER(	0L,		"trqr",		setEnumProperty,	state.tableRow.alignment, RTFLayout::Right ),
+	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,		"trrh",		setNumericProperty,	state.tableRow.height, 0 ),
 	PROP(	0L,		"tx",		insertTabDef,		0L, 0 ),
 	MEMBER(	0L,		"u",		insertUnicodeSymbol,	state.format.uc, 0 ),
@@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& )
     fnnum=0;
 }
 
-KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to )
 {
     // This filter only supports RTF to KWord conversion
     if ((from != "text/rtf") || (to != "application/x-kword"))
@@ -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?").arg( 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?").tqarg( 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?").arg( 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?").tqarg( 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?").arg( 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?").tqarg( 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.").arg( token.text ),
+                i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ),
                 i18n("KWord's RTF Import Filter"), 0 );
         }
         return KoFilter::WrongFormat;
@@ -731,7 +731,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 	    // Search for 'following' style
             for (TQValueList<RTFStyle>::ConstIterator it2=styleSheet.begin();it2!=endStyleSheet;++it2)
 	    {
-		if ((*it2).layout.style == (*it).next)
+		if ((*it2).tqlayout.style == (*it).next)
 		{
                     mainDoc.addNode( "FOLLOWING" );
                     mainDoc.setAttribute( "name", CheckAndEscapeXmlText( (*it2).name ));
@@ -739,7 +739,7 @@ KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCS
 		    break;
 		}
 	    }
-	    addLayout( mainDoc, (*it).name, (*it).layout, false );
+	    addLayout( mainDoc, (*it).name, (*it).tqlayout, false );
 	    addFormat( mainDoc, kwFormat, 0L );
 	    mainDoc.closeNode( "STYLE" );
 	}
@@ -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" ).arg( it.data(), 4 )  << " * " << it.key() << endl;
+        kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 )  << " * " << it.key() << endl;
 
     return KoFilter::OK;
 }
@@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property )
 
 void RTFImport::setFontStyleHint( RTFProperty* property )
 {
-    font.styleHint = TQFont::StyleHint( property->value );
+    font.tqstyleHint = TQFont::StyleHint( property->value );
 }
 
 void RTFImport::setPictureType( RTFProperty* property )
@@ -933,15 +933,15 @@ void RTFImport::setUnderlineProperty( RTFProperty* property )
 
 void RTFImport::setBorderStyle( RTFProperty *property )
 {
-    if (state.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
+        state.tqlayout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value );
     }
     else
     {
         for (uint i=0; i < 4; i++)
         {
-            state.layout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value );
+            state.tqlayout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value );
         }
     }
 }
@@ -949,30 +949,30 @@ void RTFImport::setBorderStyle( RTFProperty *property )
 void RTFImport::setBorderProperty( RTFProperty *property )
 {
     //kdDebug() << "setBorderProperty: " << endl;
-    if (state.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->width = token.value;
+        state.tqlayout.border->width = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-            state.layout.borders[i].width = token.value;
+            state.tqlayout.borders[i].width = token.value;
 	}
     }
 }
 
 void RTFImport::setBorderColor( RTFProperty * )
 {
-    if (state.layout.border)
+    if (state.tqlayout.border)
     {
-        state.layout.border->color = token.value;
+        state.tqlayout.border->color = token.value;
     }
     else
     {
 	for (uint i=0; i < 4; i++)
 	{
-	    state.layout.borders[i].color = token.value;
+	    state.tqlayout.borders[i].color = token.value;
 	}
     }
 }
@@ -1008,34 +1008,34 @@ void RTFImport::setPlainFormatting( RTFProperty * )
 
 void RTFImport::setParagraphDefaults( RTFProperty * )
 {
-    RTFLayout &layout = state.layout;
+    RTFLayout &tqlayout = state.tqlayout;
 
-    layout.tablist.clear();
-    layout.tab.type	= RTFTab::Left;
-    layout.tab.leader	= RTFTab::None;
+    tqlayout.tablist.clear();
+    tqlayout.tab.type	= RTFTab::Left;
+    tqlayout.tab.leader	= RTFTab::None;
 
     for (uint i=0; i < 4; i++)
     {
-	RTFBorder &border = layout.borders[i];
+	RTFBorder &border = tqlayout.borders[i];
 	border.color = -1;
 	border.width = 0;
 	border.style = RTFBorder::None;
     }
-    layout.firstIndent	= 0;
-    layout.leftIndent	= 0;
-    layout.rightIndent	= 0;
-    layout.spaceBefore	= 0;
-    layout.spaceAfter	= 0;
-    layout.spaceBetween	= 0;
-    layout.spaceBetweenMultiple = false;
-    layout.style	= 0;
-    layout.alignment	= RTFLayout::Left;
-    layout.border	= 0L;
-    layout.inTable	= false;
-    layout.keep		= false;
-    layout.keepNext	= false;
-    layout.pageBB	= false;
-    layout.pageBA	= false;
+    tqlayout.firstIndent	= 0;
+    tqlayout.leftIndent	= 0;
+    tqlayout.rightIndent	= 0;
+    tqlayout.spaceBefore	= 0;
+    tqlayout.spaceAfter	= 0;
+    tqlayout.spaceBetween	= 0;
+    tqlayout.spaceBetweenMultiple = false;
+    tqlayout.style	= 0;
+    tqlayout.tqalignment	= RTFLayout::Left;
+    tqlayout.border	= 0L;
+    tqlayout.inTable	= false;
+    tqlayout.keep		= false;
+    tqlayout.keepNext	= false;
+    tqlayout.pageBB	= false;
+    tqlayout.pageBA	= false;
 }
 
 void RTFImport::setSectionDefaults( RTFProperty * )
@@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
     tableRow.height	= 0;
     tableRow.left	= 0;
-    tableRow.alignment	= RTFLayout::Left;
+    tableRow.tqalignment	= RTFLayout::Left;
     tableRow.cells.clear();
     tableCell.bgcolor	= -1;
 
@@ -1069,17 +1069,17 @@ void RTFImport::setTableRowDefaults( RTFProperty * )
 
 void RTFImport::selectLayoutBorder( RTFProperty * property )
 {
-    state.layout.border = & state.layout.borders [ property->value ];
+    state.tqlayout.border = & state.tqlayout.borders [ property->value ];
 }
 
 void RTFImport::selectLayoutBorderFromCell( RTFProperty * property )
 {
-    state.layout.border = & state.tableCell.borders [ property->value ];
+    state.tqlayout.border = & state.tableCell.borders [ property->value ];
 }
 
 void RTFImport::insertParagraph( RTFProperty * )
 {
-    if (state.layout.inTable)
+    if (state.tqlayout.inTable)
     {
 	if (textState->table == 0)
 	{
@@ -1110,10 +1110,10 @@ void RTFImport::insertPageBreak( RTFProperty * )
 void RTFImport::insertTableCell( RTFProperty * )
 {
     //{{
-    bool b = state.layout.inTable;
-    state.layout.inTable = true;
+    bool b = state.tqlayout.inTable;
+    state.tqlayout.inTable = true;
     insertParagraph();
-    state.layout.inTable = b;
+    state.tqlayout.inTable = b;
     //}}
     textState->frameSets << textState->cell.toString();
     textState->cell.clear( 3 );
@@ -1130,14 +1130,14 @@ void RTFImport::insertTableRow( RTFProperty * )
 	{
 	    char buf[64];
 	    sprintf( buf, "Table %d", textState->table );
-	    RTFLayout::Alignment align = row.alignment;
+	    RTFLayout::Alignment align = row.tqalignment;
 
 	    // Store the current state on the stack
 	    stateStack.push( state );
 	    resetState();
-	    state.layout.alignment = align;	// table alignment
+	    state.tqlayout.tqalignment = align;	// table tqalignment
 
-	    // Add anchor for new table (default layout)
+	    // Add anchor for new table (default tqlayout)
 	    addAnchor( buf );
 	    addParagraph( textState->node, false );
 
@@ -1202,9 +1202,9 @@ void RTFImport::insertCellDef( RTFProperty * )
 
 void RTFImport::insertTabDef( RTFProperty * )
 {
-    RTFTab tab = state.layout.tab;
+    RTFTab tab = state.tqlayout.tab;
     tab.position	= token.value;
-    state.layout.tablist.push( tab );
+    state.tqlayout.tablist.push( tab );
     tab.type		= RTFTab::Left;
     tab.leader		= RTFTab::None;
 }
@@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * )
     if (token.type == RTFTokenizer::OpenGroup)
     {
 	font.name = TQString();
-	font.styleHint = TQFont::AnyStyle;
+	font.tqstyleHint = TQFont::AnyStyle;
 	font.fixedPitch = 0;
     }
     else if (token.type == RTFTokenizer::PlainText)
@@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * )
 	    // Use TQt to look up the closest matching installed font
 	    TQFont qFont( font.name );
 	    qFont.setFixedPitch( (font.fixedPitch == 1) );
-	    qFont.setStyleHint( font.styleHint );
+	    qFont.setStyleHint( font.tqstyleHint );
 	    for(;!qFont.exactMatch();)
 	    {
 		int space=font.name.findRev(' ', font.name.length());
@@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * )
             else
                fontTable.insert( state.format.font, newFontName );
 	    font.name.truncate( 0 );
-	    font.styleHint = TQFont::AnyStyle;
+	    font.tqstyleHint = TQFont::AnyStyle;
 	    font.fixedPitch = 0;
 	}
     }
@@ -1386,8 +1386,8 @@ void RTFImport::parseStyleSheet( RTFProperty * )
 	    *strchr( token.text, ';' ) = 0; // ### TODO: is this allowed with multi-byte Asian characters?
 	    style.name  += textCodec->toUnicode( token.text );
 	    style.format = state.format;
-	    style.layout = state.layout;
-	    style.next   = (style.next == -1) ? style.layout.style : style.next;
+	    style.tqlayout = state.tqlayout;
+	    style.next   = (style.next == -1) ? style.tqlayout.style : style.next;
 	    styleSheet << style;
 	    style.name.truncate( 0 );
 	    style.next   = -1;
@@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * )
         // Add anchor to rich text destination
         addAnchor( frameName );
 
-        // It is safe, as we call currentDateTime only once for each picture
-        const TQDateTime dt(TQDateTime::currentDateTime());
+        // It is safe, as we call tqcurrentDateTime only once for each picture
+        const TQDateTime dt(TQDateTime::tqcurrentDateTime());
 
         // Add pixmap or clipart (key)
         pictures.addKey( dt, idStr, pictName );
@@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName )
     // Add anchor to rich text destination
     addAnchor( frameName );
 
-    // It is safe, as we call currentDateTime only once for each picture
+    // It is safe, as we call tqcurrentDateTime only once for each picture
     const TQDateTime dt( pic.getKey().lastModified() );
 
     // Add picture key
@@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     int vertAlign0 = ~vertAlign;
     int fontSize0  = ~fontSize;
 
-    // Adjust vertical alignment and font size if (\dn, \up) are used
+    // Adjust vertical tqalignment and font size if (\dn, \up) are used
     if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline)
     {
 	if (format.fmt.baseline < 0)
@@ -2261,40 +2261,40 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
     node.closeNode( "FORMAT" );
 }
 
-void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak )
+void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak )
 {
-    // Style name and alignment
+    // Style name and tqalignment
     node.addNode( "NAME" );
       node.setAttribute( "value", CheckAndEscapeXmlText(name) );
     node.closeNode( "NAME" );
     node.addNode( "FLOW" );
-      node.setAttribute( "align", alignN[layout.alignment] );
+      node.setAttribute( "align", alignN[tqlayout.tqalignment] );
     node.closeNode( "FLOW" );
 
     // Indents
-    if (layout.firstIndent || layout.leftIndent || layout.rightIndent)
+    if (tqlayout.firstIndent || tqlayout.leftIndent || tqlayout.rightIndent)
     {
 	node.addNode( "INDENTS" );
 
-	if (layout.firstIndent)
-	    node.setAttribute( "first", .05*layout.firstIndent );
-	if (layout.leftIndent)
-	    node.setAttribute( "left", .05*layout.leftIndent );
-	if (layout.rightIndent)
-	    node.setAttribute( "right", .05*layout.rightIndent );
+	if (tqlayout.firstIndent)
+	    node.setAttribute( "first", .05*tqlayout.firstIndent );
+	if (tqlayout.leftIndent)
+	    node.setAttribute( "left", .05*tqlayout.leftIndent );
+	if (tqlayout.rightIndent)
+	    node.setAttribute( "right", .05*tqlayout.rightIndent );
 
 	node.closeNode( "INDENTS" );
     }
 
     // Offets
-    if (layout.spaceBefore || layout.spaceAfter)
+    if (tqlayout.spaceBefore || tqlayout.spaceAfter)
     {
 	node.addNode( "OFFSETS" );
 
-	if (layout.spaceBefore)
-	    node.setAttribute( "before", .05*layout.spaceBefore );
-	if (layout.spaceAfter)
-	    node.setAttribute( "after", .05*layout.spaceAfter );
+	if (tqlayout.spaceBefore)
+	    node.setAttribute( "before", .05*tqlayout.spaceBefore );
+	if (tqlayout.spaceAfter)
+	    node.setAttribute( "after", .05*tqlayout.spaceAfter );
 
 	node.closeNode( "OFFSETS" );
     }
@@ -2304,10 +2304,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
 
     TQString lineSpacingType;
     TQString lineSpacingValue;  
-    if ( layout.spaceBetweenMultiple )
+    if ( tqlayout.spaceBetweenMultiple )
     {
         // Note: 240 is a sort of magic value for one line (Once upon a time, it meant 12pt for a single line)
-        switch (layout.spaceBetween )
+        switch (tqlayout.spaceBetween )
         {
         case 240:
             {
@@ -2326,10 +2326,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
             }
         default:
             {    
-                if ( layout.spaceBetween > 0 )
+                if ( tqlayout.spaceBetween > 0 )
                 {
                     lineSpacingType = "multiple";
-                    lineSpacingValue.setNum( layout.spaceBetween / 240.0 );
+                    lineSpacingValue.setNum( tqlayout.spaceBetween / 240.0 );
                 }
                 break;
             }
@@ -2337,16 +2337,16 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
     }
     else
     {
-        if (layout.spaceBetween > 0)
+        if (tqlayout.spaceBetween > 0)
         {
             lineSpacingType = "atleast";
-            lineSpacingValue.setNum( 0.05*layout.spaceBetween );
+            lineSpacingValue.setNum( 0.05*tqlayout.spaceBetween );
         }
-        if (layout.spaceBetween < 0)
+        if (tqlayout.spaceBetween < 0)
         {
             // negative linespace means "exact"
             lineSpacingType = "fixed" ;
-            lineSpacingValue.setNum( -0.05*layout.spaceBetween );
+            lineSpacingValue.setNum( -0.05*tqlayout.spaceBetween );
         }
     }
     
@@ -2359,20 +2359,20 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
         node.closeNode( "LINESPACING" );
     }
 
-    if (layout.keep || layout.pageBB || layout.pageBA || frameBreak || layout.keepNext)
+    if (tqlayout.keep || tqlayout.pageBB || tqlayout.pageBA || frameBreak || tqlayout.keepNext)
     {
 	node.addNode( "PAGEBREAKING" );
-	  node.setAttribute( "linesTogether", boolN[layout.keep] );
-	  node.setAttribute( "hardFrameBreak", boolN[layout.pageBB] );
-	  node.setAttribute( "hardFrameBreakAfter", boolN[layout.pageBA || frameBreak] );
-	  node.setAttribute( "keepWithNext", boolN[layout.keepNext] );
+	  node.setAttribute( "linesTogether", boolN[tqlayout.keep] );
+	  node.setAttribute( "hardFrameBreak", boolN[tqlayout.pageBB] );
+	  node.setAttribute( "hardFrameBreakAfter", boolN[tqlayout.pageBA || frameBreak] );
+	  node.setAttribute( "keepWithNext", boolN[tqlayout.keepNext] );
 	node.closeNode( "PAGEBREAKING" );
     }
 
     // Paragraph borders
     for (uint i=0; i < 4; i++)
     {
-	const RTFBorder &border = layout.borders[i];
+	const RTFBorder &border = tqlayout.borders[i];
 
 	if (border.style != RTFBorder::None || border.width > 0)
 	{
@@ -2386,21 +2386,21 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout
     }
 
     // Add automatic tab stop for hanging indent
-    if (layout.firstIndent < 0 && layout.leftIndent > 0)
+    if (tqlayout.firstIndent < 0 && tqlayout.leftIndent > 0)
     {
 	node.addNode( "TABULATOR" );
 	  node.setAttribute( "type", 0 );
-	  node.setAttribute( "ptpos", .05*layout.leftIndent );
+	  node.setAttribute( "ptpos", .05*tqlayout.leftIndent );
 	node.closeNode( "TABULATOR" );
     }
 
     // Tabulators
-    if (!layout.tablist.isEmpty())
+    if (!tqlayout.tablist.isEmpty())
     {
         // ### TODO: use ConstIterator
-	for (uint i=0; i < layout.tablist.count(); i++)
+	for (uint i=0; i < tqlayout.tablist.count(); i++)
 	{
-	    const RTFTab &tab = layout.tablist[i];
+	    const RTFTab &tab = tqlayout.tablist[i];
 	    int l = (int)tab.leader;
 	    node.addNode( "TABULATOR" );
 	      node.setAttribute( "type", tab.type );
@@ -2422,12 +2422,12 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak )
     // Search for style in style sheet
     TQString name;
     const RTFFormat* format = &state.format;
-    const int styleNum = state.layout.style;
+    const int styleNum = state.tqlayout.style;
 
     const TQValueList<RTFStyle>::ConstIterator endStyleSheet = styleSheet.end();
     for ( TQValueList<RTFStyle>::ConstIterator it=styleSheet.begin(); it!=endStyleSheet; ++it )
     {
-	if ( (*it).layout.style == styleNum )
+	if ( (*it).tqlayout.style == styleNum )
 	{
 	    if ( textState->length > 0 )
 	    {
@@ -2468,9 +2468,9 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak )
 	node.closeNode( "FORMATS" );
     }
 
-    // Write out layout and format
+    // Write out tqlayout and format
       node.addNode( "LAYOUT" );
-	addLayout( node, name, state.layout, frameBreak );
+	addLayout( node, name, state.tqlayout, frameBreak );
 	addFormat( node, kwFormat, 0L );
       node.closeNode( "LAYOUT" );
     node.closeNode( "PARAGRAPH" );
diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h
index 37ecfce6a..bf4f20b74 100644
--- a/filters/kword/rtf/import/rtfimport.h
+++ b/filters/kword/rtf/import/rtfimport.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "rtfimport_dom.h"
 #include "rtfimport_tokenizer.h"
 #include <tqptrlist.h>
@@ -93,7 +93,7 @@ struct RTFTab
 struct RTFFont
 {
     TQString name;
-    TQFont::StyleHint styleHint;
+    TQFont::StyleHint tqstyleHint;
     int fixedPitch;
     int number;
 };
@@ -124,7 +124,7 @@ struct RTFLayout
     RTFTab tab;
     RTFBorder borders[4];
     RTFBorder *border;
-    Alignment alignment;
+    Alignment tqalignment;
     int style;
     int firstIndent, leftIndent, rightIndent;
     int spaceBefore, spaceAfter;
@@ -173,7 +173,7 @@ struct RTFStyle
 {
     TQString name;
     RTFFormat format;
-    RTFLayout layout;
+    RTFLayout tqlayout;
     int next;
 };
 
@@ -198,7 +198,7 @@ struct RTFTableRow
 {
     TQValueList<RTFTableCell> cells;
     TQStringList frameSets;
-    RTFLayout::Alignment alignment;
+    RTFLayout::Alignment tqalignment;
     int height;
     int left;
 };
@@ -232,7 +232,7 @@ struct RTFGroupState
     RTFTableRow tableRow;
     RTFTableCell tableCell;
     RTFFormat format;
-    RTFLayout layout;
+    RTFLayout tqlayout;
     RTFSectionLayout section;
     /// '}' will close the current destination
     bool brace0;
@@ -255,7 +255,7 @@ public:
      * @param to the mimetype for KWord
      * @return true if the document was successfully converted
      */
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
     /**
      * Skip the keyword, as we do not need to do anything with it
@@ -408,7 +408,7 @@ public:
     void insertSymbol( RTFProperty *property );
     /// Insert special character (hexadecimal escape value).
     void insertHexSymbol( RTFProperty * );
-    /// Insert unicode character (keyword \\u).
+    /// Insert tqunicode character (keyword \\u).
     void insertUnicodeSymbol( RTFProperty * );
     /**
      * Insert a date or time field
@@ -489,13 +489,13 @@ public:
      */
     void addFormat( DomNode &node, const KWFormat& format, const RTFFormat* baseFormat );
     /**
-     * Add layout information to document node.
+     * Add tqlayout information to document node.
      * @param node the document node (destination)
      * @param name the name of the current style
-     * @param layout the paragraph layout information
+     * @param tqlayout the paragraph tqlayout information
      * @param frameBreak paragraph is always the last in a frame if true
      */
-    void addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak );
+    void addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak );
     /**
      * Add paragraph information to document node.
      * @param node the document node (destination)
diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp
index 75855dbf4..95fa43fc6 100644
--- a/filters/kword/rtf/import/rtfimport_dom.cpp
+++ b/filters/kword/rtf/import/rtfimport_dom.cpp
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include <tqdatetime.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcolor.h>
 
 #include <kdebug.h>
@@ -30,7 +30,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText)
     for (uint i=0; i<strReturn.length(); i++)
     {
         ch = strReturn[i];
-        const int test = ch.unicode();
+        const int test = ch.tqunicode();
 
         // The i+= is for the additional characters
         if (test == 38) { strReturn.replace(i, 1, "&amp;"); i+=4; } // &
diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html
index 904da9dbc..27239e52d 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 alignment.<br>
+       - Tables (including non-rectangular), horizontal tqalignment.<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 layout (horizontal alignment, indents, space before/after, frame break).<br>
+       - Paragraph tqlayout (horizontal tqalignment, 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 shapes<br>
+       - Shaps, especially picture that are in tqshapes<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 alignment, background color and cell borders.<br>
+       23 July 2001: Added table tqalignment, 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 9323cdbc6..d9751e15a 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*> children;
+    std::vector<Entry*> tqchildren;
     Entry();
     ~Entry();
   private:
@@ -257,9 +257,9 @@ Entry::Entry()
 
 Entry::~Entry()
 { 
-  for( unsigned i=0; i<children.size(); i++ )
+  for( unsigned i=0; i<tqchildren.size(); i++ )
   {
-    Entry* entry = children[ i ];
+    Entry* entry = tqchildren[ 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->children.push_back( entry );
+  if( parent ) parent->tqchildren.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->children.size(); j++ )
-         if( entry->children[j]->name == entryname )
-           child = entry->children[j];
+       for( unsigned j=0; j < entry->tqchildren.size(); j++ )
+         if( entry->tqchildren[j]->name == entryname )
+           child = entry->tqchildren[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 children belongs to this directory
-  for( unsigned i = 0; i<io->current_dir->children.size(); i++ )
+  // find all tqchildren belongs to this directory
+  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
   {
-    Entry* e = io->current_dir->children[i];
+    Entry* e = io->current_dir->tqchildren[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->children.size(); i++ )
+  for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ )
   {
-    Entry* e = io->current_dir->children[i];
+    Entry* e = io->current_dir->tqchildren[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 43dc1b623..a9bd80d36 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cc
@@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport()
 {
 }
 
-KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion
     // When 4.x is supported, use also: || (from != "application/x-starwriter")
@@ -345,7 +345,7 @@ bool StarWriterImport::parseTable(TQByteArray n)
     TQ_UINT8 row, column;
 
     // Set table name
-    tableName = TQString("Table %1").arg(tablesNumber);
+    tableName = TQString("Table %1").tqarg(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").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));
+            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));
             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").arg(tableName));
+    bodyStuff.append(TQString("    <ANCHOR type=\"frameset\" instance=\"%1\" />\n").tqarg(tableName));
     bodyStuff.append("    </FORMAT>\n");
     bodyStuff.append("   </FORMATS>\n");
     bodyStuff.append("  </PARAGRAPH>\n");
diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h
index f71a71eda..b030c2ba1 100644
--- a/filters/kword/starwriter/starwriterimport.h
+++ b/filters/kword/starwriter/starwriterimport.h
@@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter
 public:
     StarWriterImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~StarWriterImport();
-    KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 private:
     // most important OLE streams
diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html
index d7667e6c8..6919c5899 100644
--- a/filters/kword/starwriter/status.html
+++ b/filters/kword/starwriter/status.html
@@ -7,7 +7,7 @@
   <META NAME="GENERATOR" CONTENT="Quanta Plus">
 </HEAD>
 <BODY>
-  <H2 align="center">Status of the</H2>
+  <H2 align="center">tqStatus of the</H2>
   <H1 align="center">StarWriter 5.x filter for KWord</H1>
 
   <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A>
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc
index 36d267be3..92908c57d 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -51,7 +51,7 @@ class WMLWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
@@ -97,7 +97,7 @@ bool WMLWorker::doCloseDocument(void)
 }
 
 bool WMLWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
   TQString wmlText;
   TQString text = paraText;
@@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText,
   }
 
   // sentinel check
-  TQString align = layout.alignment.lower();
+  TQString align = tqlayout.tqalignment.lower();
   if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) )
     align = "left"; 
 
@@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, 
+KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, 
   const TQCString& to )
 {
   // check for proper conversion
@@ -155,7 +155,7 @@ KoFilter::ConversionStatus WMLExport::convert( const TQCString& from,
   WMLWorker* worker = new WMLWorker();
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h
index 2f81c8974..8d3a105eb 100644
--- a/filters/kword/wml/wmlexport.h
+++ b/filters/kword/wml/wmlexport.h
@@ -35,7 +35,7 @@ class WMLExport : public KoFilter
 
     virtual ~WMLExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLEXPORT_H
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc
index 83e14d9f0..e44c10ae9 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cc
@@ -54,7 +54,7 @@ class WMLConverter: public WMLParser
     virtual bool doOpenCard( TQString, TQString );
     virtual bool doCloseCard();
     virtual bool doParagraph( TQString text, WMLFormatList formatList,
-      WMLLayout layout );
+      WMLLayout tqlayout );
   private:
     TQString m_title;
 };
@@ -105,13 +105,13 @@ static TQString WMLFormatAsXML( WMLFormat format )
   return result;
 }
 
-static TQString WMLLayoutAsXML( WMLLayout layout )
+static TQString WMLLayoutAsXML( WMLLayout tqlayout )
 {
   TQString result;
 
   TQString align = "left";
-  if( layout.align == WMLLayout::Center ) align = "center";
-  if( layout.align == WMLLayout::Right ) align = "right";
+  if( tqlayout.align == WMLLayout::Center ) align = "center";
+  if( tqlayout.align == WMLLayout::Right ) align = "right";
 
   TQFont font = KoGlobal::defaultFont();
   TQString fontFamily = font.family();
@@ -161,7 +161,7 @@ bool WMLConverter::doCloseCard()
 }
 
 bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList,
-  WMLLayout layout  )
+  WMLLayout tqlayout  )
 {
   TQString text, formats;
 
@@ -183,7 +183,7 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList,
   root.append( "<PARAGRAPH>\n" );
   root.append( "<TEXT>" + text + "</TEXT>\n" );
   root.append( "<FORMATS>" + formats + "</FORMATS>\n" );
-  root.append( WMLLayoutAsXML( layout) );
+  root.append( WMLLayoutAsXML( tqlayout) );
   root.append( "</PARAGRAPH>\n" );
 
   return TRUE;
@@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename )
 
 }
 
-KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if( to!= "application/x-kword" || from != "text/vnd.wap.wml" )
diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h
index 1c169af19..049ff8dbd 100644
--- a/filters/kword/wml/wmlimport.h
+++ b/filters/kword/wml/wmlimport.h
@@ -37,7 +37,7 @@ class WMLImport : public KoFilter
 
     virtual ~WMLImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WMLIMPORT_H
diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp
index 81ccbd246..ecbb235c7 100644
--- a/filters/kword/wml/wmlparser.cpp
+++ b/filters/kword/wml/wmlparser.cpp
@@ -403,7 +403,7 @@ WMLFormat& WMLFormat::operator=( const WMLFormat& f )
   return *this;
 }
 
-// paragraph layout info
+// paragraph tqlayout info
 WMLLayout::WMLLayout()
 {
   align = Left;
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc
index ac211d04e..bffdecf1e 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <KWEFBaseWorker.h>
 #include <KWEFKWordLeader.h>
@@ -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.device()->at();
+  document_area_ptr = output.tqdevice()->at();
 
   return true;
 }
@@ -143,7 +143,7 @@ static TQCString WPFiveEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].unicode();
+    int c = text[i].tqunicode();
     if( c < 32 ) result += '.';
     else if ( c == 32 ) result += 0x20 ; // hard space
     else if ( c < 128 ) result += text[i].latin1();
@@ -155,7 +155,7 @@ static TQCString WPFiveEscape( const TQString& text )
 
 
 bool WPFiveWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList)
 {
   ValueListFormatData::ConstIterator it;
   for( it = paraFormatDataList.begin(); it!=paraFormatDataList.end(); ++it )
diff --git a/filters/kword/wordperfect/export/wp5.h b/filters/kword/wordperfect/export/wp5.h
index dc75e2f7b..0791459be 100644
--- a/filters/kword/wordperfect/export/wp5.h
+++ b/filters/kword/wordperfect/export/wp5.h
@@ -36,7 +36,7 @@ class WPFiveWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc
index a9dd9109e..21c596065 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvaluevector.h>
 
 #include <KWEFBaseWorker.h>
@@ -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.device()->at();
+  document_area_ptr = output.tqdevice()->at();
 
   return true;
 }
@@ -144,7 +144,7 @@ static TQCString WPSixEscape( const TQString& text )
 
   for( unsigned int i=0; i < text.length(); i++ )
   {
-    int c = text[i].unicode();
+    int c = text[i].tqunicode();
     if( c < 32 ) result += '.'; 
     else if ( c == 32 ) result += 0x80 ; // hard space
     else if ( c < 128 ) result += text[i].latin1();
@@ -155,14 +155,14 @@ static TQCString WPSixEscape( const TQString& text )
 }
 
 bool WPSixWorker::doFullParagraph(const TQString& paraText, 
-  const LayoutData& layout, const ValueListFormatData& paraFormatDataList)
+  const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList)
 {
-  // handle paragraph alignment/justification (default to left)
+  // handle paragraph tqalignment/justification (default to left)
   unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 };
-  if( layout.alignment == "left" ) wp_align[7] = 0;
-  if( layout.alignment == "justify" ) wp_align[7] = 1;
-  if( layout.alignment == "center" ) wp_align[7] = 2;
-  if( layout.alignment == "right" ) wp_align[7] = 3;
+  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;
   output.writeRawBytes( (const char*)wp_align, 12 );
 
   ValueListFormatData::ConstIterator it;
diff --git a/filters/kword/wordperfect/export/wp6.h b/filters/kword/wordperfect/export/wp6.h
index 05abb60f2..733973385 100644
--- a/filters/kword/wordperfect/export/wp6.h
+++ b/filters/kword/wordperfect/export/wp6.h
@@ -36,7 +36,7 @@ class WPSixWorker : public KWEFBaseWorker
     virtual bool doCloseFile(void);
     virtual bool doOpenDocument(void);
     virtual bool doCloseDocument(void);
-    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout,
+    virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout,
         const ValueListFormatData& paraFormatDataList);
   private:
     TQString filename;
diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc
index f1dde8ad4..43a688c34 100644
--- a/filters/kword/wordperfect/export/wpexport.cc
+++ b/filters/kword/wordperfect/export/wpexport.cc
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #endif
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ):
 {
 }
 
-KoFilter::ConversionStatus 
+KoFilter::ConversiontqStatus 
 WPExport::convert( const TQCString& from, 
   const TQCString& to )
 {
@@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from,
 
   KWEFKWordLeader* leader = new KWEFKWordLeader( worker );
 
-  KoFilter::ConversionStatus result;
+  KoFilter::ConversiontqStatus result;
   result = leader->convert( m_chain, from, to );
 
   delete worker;
diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h
index 16e81a1ba..55f43a478 100644
--- a/filters/kword/wordperfect/export/wpexport.h
+++ b/filters/kword/wordperfect/export/wpexport.h
@@ -35,7 +35,7 @@ class WPExport : public KoFilter
 
     virtual ~WPExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // __WPEXPORT_H
diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp
index 1b3b83df2..de9246cc4 100644
--- a/filters/kword/wordperfect/import/kwordfilter.cpp
+++ b/filters/kword/wordperfect/import/kwordfilter.cpp
@@ -128,7 +128,7 @@ KWordFilter::parse (const TQString & filename)
   tokens.append( new Token( Token::HardReturn ) );
 
   TQString text;
-  TQString layout;
+  TQString tqlayout;
   TQString formats;
   int LeftMargin = 0;
   int TopMargin = 36;
@@ -253,32 +253,32 @@ KWordFilter::parse (const TQString & filename)
           formats.append( "  " + fmt );
           formats.append ( "  </FORMAT>\n" );
 
-          layout = "";
-          layout.append( "<LAYOUT>\n" );
-          layout.append( "  <NAME value=\"Standard\" />\n" );
-          layout.append( "  <FLOW align=\"" + mapAlign( align ) + "\" />\n" );
-          layout.append( "  <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" );
-          layout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
-          layout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
-          layout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
-          layout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
+          tqlayout = "";
+          tqlayout.append( "<LAYOUT>\n" );
+          tqlayout.append( "  <NAME value=\"Standard\" />\n" );
+          tqlayout.append( "  <FLOW align=\"" + mapAlign( align ) + "\" />\n" );
+          tqlayout.append( "  <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" );
+          tqlayout.append( "  <LEFTBORDER width=\"0\" style=\"0\" />\n" );
+          tqlayout.append( "  <RIGHTBORDER width=\"0\" style=\"0\" />\n" );
+          tqlayout.append( "  <TOPBORDER width=\"0\" style=\"0\" />\n" );
+          tqlayout.append( "  <BOTTOMBORDER width=\"0\" style=\"0\" />\n" );
           lm = LeftMargin + LeftMarginAdjust - frameLeftMargin;
           rm = RightMargin + RightMarginAdjust - frameRightMargin;
-          layout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
+          tqlayout.append( "  <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + 
                          " right=\"" + TQString::number( TQMAX( 0 , rm ) ) + "\"" +
                          " first=\"0\" />\n" );
-          layout.append( "  <OFFSETS />\n" );
-          layout.append( "  <PAGEBREAKING />\n" );
-          layout.append( "  <COUNTER />\n" );
-          layout.append( "  <FORMAT id=\"1\">\n" );
-          layout.append( "    <WEIGHT value=\"50\" />\n" );
-          layout.append( "    <ITALIC value=\"0\" />\n" );
-          layout.append( "    <UNDERLINE value=\"0\" />\n" );
-          layout.append( "    <STRIKEOUT value=\"0\" />\n" );
-          layout.append( "    <CHARSET value=\"0\" />\n" );
-          layout.append( "    <VERTALIGN value=\"0\" />\n" );
-          layout.append( "  </FORMAT>\n" );
-          layout.append( "</LAYOUT>\n" );
+          tqlayout.append( "  <OFFSETS />\n" );
+          tqlayout.append( "  <PAGEBREAKING />\n" );
+          tqlayout.append( "  <COUNTER />\n" );
+          tqlayout.append( "  <FORMAT id=\"1\">\n" );
+          tqlayout.append( "    <WEIGHT value=\"50\" />\n" );
+          tqlayout.append( "    <ITALIC value=\"0\" />\n" );
+          tqlayout.append( "    <UNDERLINE value=\"0\" />\n" );
+          tqlayout.append( "    <STRIKEOUT value=\"0\" />\n" );
+          tqlayout.append( "    <CHARSET value=\"0\" />\n" );
+          tqlayout.append( "    <VERTALIGN value=\"0\" />\n" );
+          tqlayout.append( "  </FORMAT>\n" );
+          tqlayout.append( "</LAYOUT>\n" );
 
           // encode text for XML-ness
           // FIXME could be faster without TQRegExp
@@ -294,7 +294,7 @@ KWordFilter::parse (const TQString & filename)
           root.append( "<FORMATS>\n");
           root.append( formats );
           root.append( "</FORMATS>\n");
-          root.append( layout );
+          root.append( tqlayout );
           root.append( "</PARAGRAPH>\n" );
 
           // for the next paragraph
diff --git a/filters/kword/wordperfect/import/parser.cpp b/filters/kword/wordperfect/import/parser.cpp
index 96a2559cc..7b87e5a6c 100644
--- a/filters/kword/wordperfect/import/parser.cpp
+++ b/filters/kword/wordperfect/import/parser.cpp
@@ -1002,7 +1002,7 @@ Parser::handleTab (TQMemArray < TQ_UINT8 > data)
 
 }
 
-// the following tables maps WP charset/charcode to unicode character
+// the following tables maps WP charset/charcode to tqunicode character
 
 // WP multinational characters (charset 1)
 static unsigned multinational_map[] = {
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc
index 09fc4d5c2..460915af0 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cc
@@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ):  KoFilter()
 {
 }
 
-KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to )
 {
   // check for proper conversion
   if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" )
diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h
index 3fc527961..02cd323d2 100644
--- a/filters/kword/wordperfect/import/wpimport.h
+++ b/filters/kword/wordperfect/import/wpimport.h
@@ -48,7 +48,7 @@ class WPImport : public KoFilter
 
     virtual ~WPImport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 };
 #endif // __WPIMPORT_H
diff --git a/filters/kword/wordperfect/status_old.html b/filters/kword/wordperfect/status_old.html
index 5465048d1..1db3dc095 100644
--- a/filters/kword/wordperfect/status_old.html
+++ b/filters/kword/wordperfect/status_old.html
@@ -55,7 +55,7 @@
        <li>font information: size, typeface, color</li>
        <li>WP extended character converted to Unicode</li>
        <li>character formatting: bold, italics, underline, double underline, strikeout, superscript, subscript</li>
-       <li>paragraph layout: linespacing, justification</li>
+       <li>paragraph tqlayout: linespacing, justification</li>
        <li>page settings: margins</li>
        <li>document summary: title, author, abstract</li>
      </ul>
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index f632080e3..f079e2a51 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpaintdevice.h>
 #include <tqrect.h>
@@ -107,7 +107,7 @@ void ExportSizeDia::setupGUI()
     mainLayout->addWidget( percentHeight,  4, 0 );
     mainLayout->addWidget( m_percWidthEdit,  4, 1 );
 
-    /* Display the main layout */
+    /* Display the main tqlayout */
     //mainLayout->addStretch( 5 );
     mainLayout->activate();
 }
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index a04633fe3..9a4ac58bb 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -209,7 +209,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
     if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10
         return;
     TQDomElement tabStops = styleStack.childNodeNS( ooNS::style, "tab-stops" );
-    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
+    //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl;
     for ( TQDomNode it = tabStops.firstChild(); !it.isNull(); it = it.nextSibling() )
     {
         TQDomElement tabStop = it.toElement();
@@ -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; // "alignment on decimal point"
+            kOfficeType = 3; // "tqalignment on decimal point"
         }
 
         elem.setAttribute( "type", kOfficeType );
@@ -235,7 +235,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack&
         double pos = KoUnit::parseValue( tabStop.attributeNS( ooNS::style, "position", TQString() ) );
         elem.setAttribute( "ptpos", pos );
 
-        // TODO Convert leaderChar's unicode value to the KOffice enum
+        // TODO Convert leaderChar's tqunicode value to the KOffice enum
         // (blank/dots/line/dash/dash-dot/dash-dot-dot, 0 to 5)
         TQString leaderChar = tabStop.attributeNS( ooNS::style, "leader-char", TQString() ); // single character
         if ( !leaderChar.isEmpty() )
@@ -499,7 +499,7 @@ void OoUtils::createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo)
     }
 }
 
-KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store )
+KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store )
 {
     kdDebug(30518) << "loadAndParse: Trying to open " << fileName << endl;
 
@@ -508,13 +508,13 @@ KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDom
         kdWarning(30519) << "Entry " << fileName << " not found!" << endl;
         return KoFilter::FileNotFound;
     }
-    KoFilter::ConversionStatus convertStatus = loadAndParse( m_store->device(),doc, fileName );
+    KoFilter::ConversiontqStatus converttqStatus = loadAndParse( m_store->device(),doc, fileName );
     m_store->close();
-    return convertStatus;
+    return converttqStatus;
 
 }
 
-KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName)
+KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName)
 {
     TQXmlInputSource source( io );
     // Copied from TQDomDocumentPrivate::setContent, to change the whitespace thing
@@ -538,7 +538,7 @@ KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument&
 
 }
 
-KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip)
+KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip)
 {
     kdDebug(30519) << "Trying to open " << filename << endl;
 
@@ -562,12 +562,12 @@ KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDom
     const KZipFileEntry* f = static_cast<const KZipFileEntry *>(entry);
     kdDebug(30519) << "Entry " << filename << " has size " << f->size() << endl;
     TQIODevice* io = f->device();
-    KoFilter::ConversionStatus convertStatus = loadAndParse( io,doc, filename );
+    KoFilter::ConversiontqStatus converttqStatus = loadAndParse( io,doc, filename );
     delete io;
-    return convertStatus;
+    return converttqStatus;
 }
 
-KoFilter::ConversionStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip )
+KoFilter::ConversiontqStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip )
 {
     const TQString filename( "Thumbnails/thumbnail.png" );
     kdDebug(30519) << "Trying to open thumbnail " << filename << endl;
diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h
index a668d961d..70de64c8e 100644
--- a/filters/liboofilter/ooutils.h
+++ b/filters/liboofilter/ooutils.h
@@ -80,14 +80,14 @@ namespace OoUtils
     void importTextPosition( const TQString& text_position, TQString& value, TQString& relativetextsize );
 
     void createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo);
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip);
-    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store );
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip);
+    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store );
 
     /// Load an OASIS thumbnail
-    KoFilter::ConversionStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip );
+    KoFilter::ConversiontqStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip );
 
     // Internal
-    KoFilter::ConversionStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName);
+    KoFilter::ConversiontqStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName);
 }
 
 #endif /* OOUTILS_H */
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index 0f052e13b..ef4f6cd06 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -69,7 +69,7 @@ OLEFilter::~OLEFilter()
     delete docfile;
 }
 
-KoFilter::ConversionStatus OLEFilter::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversiontqStatus OLEFilter::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="application/x-kword" &&
        to!="application/x-kspread" &&
@@ -118,9 +118,9 @@ void OLEFilter::commSlotDelayStream( const char* delay )
     emit internalCommDelayStream( delay );
 }
 
-void OLEFilter::commSlotShapeID( unsigned int& shapeID )
+void OLEFilter::commSlotShapeID( unsigned int& tqshapeID )
 {
-    emit internalCommShapeID( shapeID );
+    emit internalCommShapeID( tqshapeID );
 }
 
 void OLEFilter::slotSavePart(
@@ -153,7 +153,7 @@ void OLEFilter::slotSavePart(
         if ( srcMime == KMimeType::defaultMimeType() )
             kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl;
 
-        KoFilter::ConversionStatus status;
+        KoFilter::ConversiontqStatus status;
         TQCString destMime( mimeType.latin1() );
         storageId = TQString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) );
 
@@ -234,7 +234,7 @@ void OLEFilter::slotSavePic(
     else
     {
         // It's not here, so let's generate one.
-        storageId = TQString( "pictures/picture%1.%2" ).arg( numPic++ ).arg( extension );
+        storageId = TQString( "pictures/picture%1.%2" ).tqarg( numPic++ ).tqarg( 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 2759ea503..80a037373 100644
--- a/filters/olefilters/olefilter.h
+++ b/filters/olefilters/olefilter.h
@@ -39,11 +39,11 @@ public:
     OLEFilter(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~OLEFilter();
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 public slots:
     void commSlotDelayStream( const char* delay );
-    void commSlotShapeID( unsigned int& shapeID );
+    void commSlotShapeID( unsigned int& tqshapeID );
 
 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& shapeID );
+    void internalCommShapeID( unsigned int& tqshapeID );
     void internalCommDelayStream( const char* delay );
 
 private:
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index d28430dda..b53acfc57 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -782,7 +782,7 @@ void Powerpoint::opSlideAtom(
 {
     struct
     {
-        TQ_UINT8 layout[12];  // Slide layout descriptor.
+        TQ_UINT8 tqlayout[12];  // Slide tqlayout descriptor.
         TQ_INT32 masterId;   // Id of the master of the slide. Zero for a master slide.
         TQ_INT32 notesId;    // Id for the corresponding notes slide. Zero if slide has no notes.
         TQ_UINT16 flags;
@@ -790,7 +790,7 @@ void Powerpoint::opSlideAtom(
 
     Header tmp;
     tmp.type = 1015;
-    tmp.length = sizeof(data.layout);
+    tmp.length = sizeof(data.tqlayout);
     invokeHandler(tmp, tmp.length, operands);
     operands >> data.masterId >> data.notesId >> data.flags;
 
@@ -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 shapes other than placeholders.
+        TQ_UINT32 flags;          // If bit 3 set then slide contains tqshapes 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 shape)
+                            // 4 Other (Text in a tqshape)
                             // 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 78e9cb0ab..026e2ef13 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 shape)
+#define OTHER_TEXT 		4	//other(test in tqshape)
 #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 270cc30fd..96a035672 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 = "shape-id=";
+        filterArgs = "tqshape-id=";
         filterArgs += TQString::number(id);
         filterArgs += ";delay-stream=";
         filterArgs += TQString::number(0);
diff --git a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
index e619bf21c..b8bb24de8 100644
--- a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
+++ b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
@@ -39,7 +39,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:layout-master-set>
+	<fo:tqlayout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -61,7 +61,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:layout-master-set>
+    </fo:tqlayout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>
diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui
index ff542dc39..a52e922cd 100644
--- a/filters/xsltfilter/export/xsltdialog.ui
+++ b/filters/xsltfilter/export/xsltdialog.ui
@@ -49,7 +49,7 @@
                     <property name="name">
                         <cstring>xsltList</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc
index b1d9d84e6..545ffde2e 100644
--- a/filters/xsltfilter/export/xsltexport.cc
+++ b/filters/xsltfilter/export/xsltexport.cc
@@ -40,7 +40,7 @@ XSLTExport::XSLTExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus XSLTExport::convert( const TQCString& from, const TQCString&)
+KoFilter::ConversiontqStatus XSLTExport::convert( const TQCString& from, const TQCString&)
 {
     if(from != "application/x-kword" &&
        from != "application/x-kontour" && from != "application/x-kspread" &&
diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h
index b9947255d..eac9712ab 100644
--- a/filters/xsltfilter/export/xsltexport.h
+++ b/filters/xsltfilter/export/xsltexport.h
@@ -32,6 +32,6 @@ public:
     XSLTExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~XSLTExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif /* __XSLTEXPORT_H__ */
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index aade68910..8d36f43b5 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").arg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").tqarg(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").arg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui
index ff542dc39..a52e922cd 100644
--- a/filters/xsltfilter/import/xsltdialog.ui
+++ b/filters/xsltfilter/import/xsltdialog.ui
@@ -49,7 +49,7 @@
                     <property name="name">
                         <cstring>xsltList</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc
index 999d95944..e73bdf182 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include "xsltimportdia.h"
 
 
@@ -36,7 +36,7 @@ XSLTImport::XSLTImport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus XSLTImport::convert( const TQCString&, const TQCString& to )
+KoFilter::ConversiontqStatus XSLTImport::convert( const TQCString&, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h
index 89767a32b..fead8d808 100644
--- a/filters/xsltfilter/import/xsltimport.h
+++ b/filters/xsltfilter/import/xsltimport.h
@@ -21,7 +21,7 @@
 #define __XSLTIMPORT_H__
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class XSLTImport : public KoFilter
     	XSLTImport(KoFilter *parent, const char *name, const TQStringList&);
 		virtual ~XSLTImport() {}
 
-		virtual KoFilter::ConversionStatus convert( const TQCString& from,
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from,
 							const TQCString& to );
 };
 
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index c3fb4b978..2e278bf2d 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").arg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").tqarg(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").arg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #else
-			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
diff --git a/filters/xsltfilter/kword2xslfo.xsl b/filters/xsltfilter/kword2xslfo.xsl
index 4268afbad..ea36238bf 100644
--- a/filters/xsltfilter/kword2xslfo.xsl
+++ b/filters/xsltfilter/kword2xslfo.xsl
@@ -36,7 +36,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:layout-master-set>
+	<fo:tqlayout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -58,7 +58,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:layout-master-set>
+    </fo:tqlayout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>
diff --git a/karbon/commands/vbooleancmd.h b/karbon/commands/vbooleancmd.h
index c782c8384..3a3478d38 100644
--- a/karbon/commands/vbooleancmd.h
+++ b/karbon/commands/vbooleancmd.h
@@ -37,8 +37,8 @@ public:
 	enum VBooleanType
 	{
 		intersect,
-		shape_union,
-		shape_xor,
+		tqshape_union,
+		tqshape_xor,
 		substract
 	};
 
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc
index 427ecdcab..2275dba84 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cc
@@ -44,7 +44,7 @@ VReplacingCmd::execute()
 	bool successful = false;
 
 
-	// Create new shapes if they don't exist yet.
+	// Create new tqshapes if they don't exist yet.
 	if( !m_newObjects )
 	{
 		m_newObjects = new VSelection();
@@ -65,11 +65,11 @@ VReplacingCmd::execute()
 			{
 				successful = true;
 
-				// Insert new shape right before old shape.
+				// Insert new tqshape right before old tqshape.
 				itr.current()->parent()->insertInfrontOf(
 					newObject, itr.current() );
 
-				// Add new shape to list of new objects.
+				// Add new tqshape to list of new objects.
 				m_newObjects->append( newObject );
 			}
 			// No success.
diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc
index 9a59fcd9f..ae0ad2dc8 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* shape, const TQString& icon )
-	: VCommand( doc, name, icon ), m_shape( shape )
+VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon )
+	: VCommand( doc, name, icon ), m_tqshape( tqshape )
 {
 }
 
 void
 VShapeCmd::execute()
 {
-	if( !m_shape )
+	if( !m_tqshape )
 		return;
 
-	if( m_shape->state() == VObject::deleted )
+	if( m_tqshape->state() == VObject::deleted )
 	{
 		document()->selection()->clear();
-		m_shape->setState( VObject::normal );
-		document()->selection()->append( m_shape );
+		m_tqshape->setState( VObject::normal );
+		document()->selection()->append( m_tqshape );
 	}
 	else
 	{
-		m_shape->setState( VObject::normal );
-		m_shape->setFill( *( document()->selection()->fill() ) );
-		m_shape->setStroke( *( document()->selection()->stroke() ) );
+		m_tqshape->setState( VObject::normal );
+		m_tqshape->setFill( *( document()->selection()->fill() ) );
+		m_tqshape->setStroke( *( document()->selection()->stroke() ) );
 
 		// Add path:
-		document()->append( m_shape );
+		document()->append( m_tqshape );
 		document()->selection()->clear();
-		document()->selection()->append( m_shape );
+		document()->selection()->append( m_tqshape );
 	}
 
 	setSuccess( true );
@@ -60,11 +60,11 @@ VShapeCmd::execute()
 void
 VShapeCmd::unexecute()
 {
-	if( !m_shape )
+	if( !m_tqshape )
 		return;
 
-	document()->selection()->take( *m_shape );
-	m_shape->setState( VObject::deleted );
+	document()->selection()->take( *m_tqshape );
+	m_tqshape->setState( VObject::deleted );
 
 	setSuccess( false );
 }
diff --git a/karbon/commands/vshapecmd.h b/karbon/commands/vshapecmd.h
index d4742a677..30607fcd4 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 shape will be added to the document and selected, upon undoing
+ * execution() the tqshape 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* shape, const TQString& icon = "14_polygon" );
+	VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, 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 shape.
-	VPath *m_shape;
+	/// Pointer to the created tqshape.
+	VPath *m_tqshape;
 };
 
 #endif
diff --git a/karbon/commands/vtextcmd.h b/karbon/commands/vtextcmd.h
index 2fb0a75a9..708250c83 100644
--- a/karbon/commands/vtextcmd.h
+++ b/karbon/commands/vtextcmd.h
@@ -23,7 +23,7 @@
 
 #include <tqfont.h>
 
-#include "vshapecmd.h"
+#include "vtqshapecmd.h"
 
 // create a text-object.
 
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index dc1038ab0..f0173920e 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 ) );
 	}
 
-	// invalidate all changed subpaths
+	// tqinvalidate 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 256362116..570b06dc5 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" ).arg( x ).arg( y ).arg( w ).arg( h ) );
+		docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).tqarg( x ).tqarg( y ).tqarg( w ).tqarg( 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-shape" )
+	else if( element.localName() == "custom-tqshape" )
 	{
 		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-geometry" )
+				if( e.localName() == "enhanced-tqgeometry" )
 				{
 					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)" ).arg( mat.m11() )
-																.arg( mat.m12() )
-																.arg( mat.m21() )
-																.arg( mat.m22() )
-																.arg( mat.dx() )
-																.arg( mat.dy() );
+		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() );
 	}
 	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)" ).arg( mat.m11() )
-																.arg( mat.m12() )
-																.arg( mat.m21() )
-																.arg( mat.m22() )
-																.arg( mat.dx() )
-																.arg( mat.dy() );
+		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() );
 	}
 	return transform;
 }
diff --git a/karbon/core/vdocument.h b/karbon/core/vdocument.h
index aa35b834c..45270d2e6 100644
--- a/karbon/core/vdocument.h
+++ b/karbon/core/vdocument.h
@@ -83,7 +83,7 @@ public:
 	 * Draw the document frame to a painting device.
 	 *
 	 * @param painter abstraction that is used to render to a painting device.
-	 * @param pl layout describing the page to draw on (restricting the painter)
+	 * @param pl tqlayout describing the page to draw on (restricting the painter)
 	 * @param drawPageMargins if @c true, also draw the crop marks for the page margins,
 	 *        otherwise, don't draw them.
 	 */
diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc
index dfa4d5dfb..d1cd9d13f 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%" ).arg( m_color.opacity() * 100. ) );
+			style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( 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%" ).arg( m_color.opacity() * 100. ) );
+			style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( 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 89662198a..0e5629492 100644
--- a/karbon/core/vfill.h
+++ b/karbon/core/vfill.h
@@ -33,10 +33,10 @@ class KoOasisLoadingContext;
 
 
 /**
- * Manages the fill of shapes.
+ * Manages the fill of tqshapes.
  *
  * The fill can be solid or gradient.
- * Also two fill rules are supported that effect how the shape is
+ * Also two fill rules are supported that effect how the tqshape 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 577d13735..60d892415 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" ).arg( colorstop->rampPoint ) );
+		elementWriter.addAttribute( "svg:offset", TQString( "%1" ).tqarg( colorstop->rampPoint ) );
 		elementWriter.addAttribute( "svg:color", TQColor( colorstop->color ).name() );
 		if( colorstop->color.opacity() < 1 )
-			elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).arg( colorstop->color.opacity() ) );
+			elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).tqarg( colorstop->color.opacity() ) );
 		elementWriter.endElement();
 	}
 
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 1d18f54f5..51d991e12 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-shape" )
+			if( e.localName() == "path" || e.localName() == "custom-tqshape" )
 			{
 				VPath* composite = new VPath( this );
 				composite->loadOasis( e, context );
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index eccc6180b..899422ee1 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 */
 
-		// shape specific states:
+		// tqshape 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 ea05fc762..e5366966e 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" ).
-							arg( segment->knot().x() ).arg( segment->knot().y() );
+							tqarg( segment->knot().x() ).tqarg( segment->knot().y() );
 				}
 				// Moveto.
 				else
 				{
 					d += TQString( "M%1 %2" ).
-							arg( segment->knot().x() ).arg( segment->knot().y() );
+							tqarg( segment->knot().x() ).tqarg( segment->knot().y() );
 				}
 			}
 			// Bezier ( degree >= 3 ).
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index d0cea9c72..0ec27fb28 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%" ).arg( m_color.opacity() * 100. ) );
+			style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).tqarg( 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 4c7d3989b..c45d91cb3 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_alignment			= (VText::Alignment)0;
+	m_tqalignment			= (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 alignment, const TQString& text )
-	: VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_alignment( alignment ), m_text( text )
+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 )
 {
 	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_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 )
+	: 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 )
 {
 	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( "alignment",			m_alignment );
+		me.setAttribute( "tqalignment",			m_tqalignment );
 		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_alignment			= (Alignment)element.attribute( "alignment", "0" ).toInt();
+	m_tqalignment			= (Alignment)element.attribute( "tqalignment", "0" ).toInt();
 	m_shadow			= ( element.attribute( "shadow" ).toInt() == 1 );
 	m_translucentShadow	= ( element.attribute( "translucentshadow" ).toInt() == 1 );
 	m_shadowAngle		= element.attribute( "shadowangle" ).toInt();
@@ -473,7 +473,7 @@ VText::traceText()
 
 	bool foundCharmap = false;
 
-	// Try to choose unicode charmap
+	// Try to choose tqunicode charmap
 	for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ )
 	{
 		if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode )
@@ -481,14 +481,14 @@ VText::traceText()
 			FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] );
 			if( error )
 			{
-				kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl;
+				kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl;
 				continue;
 			}
 			foundCharmap = true;
 		}
 	}
 
-	// Choose first charmap if no unicode charmap was found
+	// Choose first charmap if no tqunicode charmap was found
 	if( ! foundCharmap )
 	{
 		error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] );
@@ -518,7 +518,7 @@ VText::traceText()
 	{
 		// get the glyph index for the current character
 		TQChar character = m_text.at( i );
-		glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() );
+		glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() );
 		if( ! glyphIndex ) 
 		{
 			kdDebug(38000) << "traceText(), unable get index of char : " << character << endl;
@@ -575,7 +575,7 @@ VText::traceText()
 	kdDebug(38000) << "traceText(), using offset : " << m_offset << endl;
 	float x = m_offset * pathLength;
 	
-	switch( m_alignment )
+	switch( m_tqalignment )
 	{
 		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 234332df5..ef40ac28d 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 alignment, const TQString& text );
+	VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, 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 alignment ) { m_alignment = alignment; }
-	virtual Alignment alignment() { return m_alignment; }
+	virtual void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
+	virtual Alignment tqalignment() { return m_tqalignment; }
 	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 alignment
-	Alignment   m_alignment;
+		// The text tqalignment
+	Alignment   m_tqalignment;
 		// The text to draw
 	TQString     m_text;
 		// Shadow parameters
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index e6e30667e..56fecc0b9 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcolordialog.h>
 #include <klocale.h>
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index 19e3ef904..141006dcc 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqvgroupbox.h>
 #include <tqcombobox.h>
@@ -218,10 +218,10 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name )
     KoUnit::Unit unit = view->part()->unit();
 
     TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" );
-    tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-    tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
+    tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
 
-    TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->layout(), 4, 2 );
+    TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->tqlayout(), 4, 2 );
 
     m_oldUndoRedo = 30;
 
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 56df72272..2428de118 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index 9579303ec..c6453575f 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
 #include <tqcolor.h>
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index bdb7ad441..98b0b8839 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -19,7 +19,7 @@
 
 #include <tqhbuttongroup.h>
 #include <tqinputdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlistview.h>
 #include <tqptrvector.h>
@@ -206,12 +206,12 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
 	}
 
 	TQPainter pw( &pixmap );
-	pw.setPen( colorGroup().light() );
+	pw.setPen( tqcolorGroup().light() );
 	pw.drawLine( 1, 1, 1, height() - 2 );
 	pw.drawLine( 1, 1, width() - 2, 1 );
 	pw.drawLine( width() - 1, height() - 1, 0, height() - 1 );
 	pw.drawLine( width() - 1, height() - 1, width() - 1, 0 );
-	pw.setPen( colorGroup().dark() );
+	pw.setPen( tqcolorGroup().dark() );
 	pw.drawLine( 0, 0, width() - 1, 0 );
 	pw.drawLine( 0, 0, 0, height() - 1 );
 	pw.drawLine( width() - 2, height() - 2, width() - 2, 1 );
@@ -224,33 +224,33 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
 		: TQWidget( parent, "DocumentTab" ), m_view( view )
 {
 	TQFrame* frame;
-	TQGridLayout* layout = new TQGridLayout( this );
-	layout->setMargin( 3 );
-	layout->setSpacing( 2 );
-	layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 );
-	layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 );
-	layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 );
-	layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 );
+	TQGridLayout* tqlayout = new TQGridLayout( this );
+	tqlayout->setMargin( 3 );
+	tqlayout->setSpacing( 2 );
+	tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 );
+	tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 );
+	tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 );
+	tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 );
 	frame->setFrameShape( TQFrame::HLine );
-	layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 );
-	layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 );
-	layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 );
+	tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 );
+	tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 );
+	tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 );
 	frame->setFrameShape( TQFrame::HLine );
-	//layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 );
-	layout->addWidget( m_width = new TQLabel( this ), 0, 1 );
-	layout->addWidget( m_height = new TQLabel( this ), 1, 1 );
-	layout->addWidget( m_layers = new TQLabel( this ), 3, 1 );
-	layout->addWidget( m_format = new TQLabel( this ), 4, 1 );
-	layout->setRowStretch( 7, 1 );
-	layout->setColStretch( 0, 0 );
-	layout->setColStretch( 1, 0 );
-	layout->setColStretch( 2, 2 );
-	//layout->addWidget(
-
-	m_width->setAlignment( AlignRight );
-	m_height->setAlignment( AlignRight );
-	m_layers->setAlignment( AlignRight );
-	m_format->setAlignment( AlignRight );
+	//tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 );
+	tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 );
+	tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 );
+	tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 );
+	tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 );
+	tqlayout->setRowStretch( 7, 1 );
+	tqlayout->setColStretch( 0, 0 );
+	tqlayout->setColStretch( 1, 0 );
+	tqlayout->setColStretch( 2, 2 );
+	//tqlayout->addWidget(
+
+	m_width->tqsetAlignment( AlignRight );
+	m_height->tqsetAlignment( AlignRight );
+	m_layers->tqsetAlignment( AlignRight );
+	m_format->tqsetAlignment( AlignRight );
 
 	connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) );
 	connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) );
@@ -320,7 +320,7 @@ VObjectListViewItem::~VObjectListViewItem()
 TQString
 VObjectListViewItem::key( int, bool ) const
 {
-	return TQString( "%1" ).arg( m_key );
+	return TQString( "%1" ).tqarg( m_key );
 }
 
 void
@@ -329,7 +329,7 @@ VObjectListViewItem::update()
 	// text description
 	VSelectionDescription selectionDesc;
 	selectionDesc.visit( *m_object );
-	setText( 0, TQString( "%1" ).arg( selectionDesc.shortDescription() ) );
+	setText( 0, TQString( "%1" ).tqarg( selectionDesc.shortDescription() ) );
 
 	// draw thumb preview (16x16)
 	TQPixmap preview;
@@ -438,7 +438,7 @@ VLayerListViewItem::pos()
 TQString
 VLayerListViewItem::key( int, bool ) const
 {
-	return TQString( "%1" ).arg( m_key );
+	return TQString( "%1" ).tqarg( m_key );
 }
 
 int 
@@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
 {
 
 	TQToolButton* button;
-	TQVBoxLayout* layout = new TQVBoxLayout( this, 1 );
-	layout->addWidget( m_layersListView = new TQListView( this ), 1 );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 );
+	tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 );
 	m_buttonGroup = new TQHButtonGroup( this );
 	m_buttonGroup->setInsideMargin( 3 );
 	button = new TQToolButton( m_buttonGroup );
@@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
 	button->setIconSet( SmallIcon( "14_layer_deletelayer" ) );
 	button->setTextLabel( i18n( "Delete" ) );
 	m_buttonGroup->insert( button );
-	layout->addWidget( m_buttonGroup, 0);
-	layout->setSpacing( 0 );
-	layout->setMargin( 3 );
+	tqlayout->addWidget( m_buttonGroup, 0);
+	tqlayout->setSpacing( 0 );
+	tqlayout->setMargin( 3 );
 
 	m_layersListView->setAllColumnsShowFocus( true );
 	m_layersListView->addColumn( i18n( "Item" ), 120 );
@@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
 	connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
 	connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) );
 
-	layout->activate();
+	tqlayout->activate();
 	updateLayers();
 } // VLayersTab::VLayersTab
 
@@ -531,7 +531,7 @@ VLayersTab::resetSelection()
 	for(; it.current(); ++it )
 	{
 		it.current()->setSelected( false );
-		it.current()->repaint();
+		it.current()->tqrepaint();
 	}
 }
 
@@ -556,14 +556,14 @@ VLayersTab::selectActiveLayer()
 	for(; it.current(); ++it )
 	{
 		it.current()->setSelected( false );
-		it.current()->repaint();
+		it.current()->tqrepaint();
 	}
 
 	VLayerListViewItem *layerItem = m_layers[ m_document->activeLayer() ];
 	if( layerItem )
 	{
 		layerItem->setSelected( true );
-		layerItem->repaint();
+		layerItem->tqrepaint();
 		kdDebug(38000) << "selecting active layer: " << layerItem->text() << endl;
 	}
 }
@@ -620,7 +620,7 @@ VLayersTab::updateChildItems( TQListViewItem *item )
 			updateChildItems( objectItem );
 
 		objectItem->update();
-		objectItem->repaint();
+		objectItem->tqrepaint();
 	}
 }
 
@@ -676,7 +676,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 				toggleState( layerItem->layer(), col );
 
 				layerItem->update();
-				layerItem->repaint();
+				layerItem->tqrepaint();
 
 				updateChildItems( layerItem );
 
@@ -703,7 +703,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col )
 					objectItem->setSelected( false );
 
 				objectItem->update();
-				objectItem->repaint();
+				objectItem->tqrepaint();
 
 				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->repaint();
+			objectItem->tqrepaint();
 		}
 	}
 	
@@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent )
 		: TQWidget( parent ), m_part( part )
 {
-	TQVBoxLayout* layout = new TQVBoxLayout( this );
-	layout->setMargin( 3 );
-	layout->setSpacing( 2 );
-	layout->add( m_history = new TQListView( this ) );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	tqlayout->setMargin( 3 );
+	tqlayout->setSpacing( 2 );
+	tqlayout->add( m_history = new TQListView( this ) );
 	m_history->setVScrollBarMode( TQListView::AlwaysOn );
 	m_history->setSelectionMode( TQListView::NoSelection );
 	m_history->addColumn( i18n( "Commands" ) );
 	m_history->setResizeMode( TQListView::AllColumns );
 	m_history->setRootIsDecorated( true );
-	layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) );
+	tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) );
 
 	m_history->setSorting( 0, true );
 	VHistoryGroupItem* group = 0;
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index 4fa0b94ba..f30b30424 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -20,7 +20,7 @@
 
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqwidget.h>
 #include <tqtooltip.h>
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index 79021604e..5b7633b15 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqsize.h>
 #include <tqhbuttongroup.h>
@@ -128,9 +128,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP
 {
 	KIconLoader il;
 
-	TQVBoxLayout* layout = new TQVBoxLayout( this );
-	layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
-	layout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	tqlayout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
+	tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) );
 	TQToolButton* m_addClipartButton;
 	m_buttonGroup->insert( m_addClipartButton = new TQToolButton( m_buttonGroup ) );
 	m_buttonGroup->insert( m_importClipartButton = new TQToolButton( m_buttonGroup ) );
@@ -145,7 +145,7 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP
 	m_buttonGroup->setInsideMargin( 3 );
 
 	//setFrameStyle( Box | Sunken );
-	layout->setMargin( 3 );
+	tqlayout->setMargin( 3 );
 
 	connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
 	//connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) );
@@ -263,7 +263,7 @@ ClipartWidget::importClipart()
 	else
 	{
 		KoFilterManager man( m_part );
-		KoFilter::ConversionStatus status;
+		KoFilter::ConversiontqStatus status;
 		TQString importedFile = man.import( fname, status );
 		if( status == KoFilter::OK )
 			m_part->mergeNativeFormat( importedFile );
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 5f079afd9..7e93577b2 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqwmatrix.h>
 #include <tqtooltip.h>
diff --git a/karbon/karbon_drag.cpp b/karbon/karbon_drag.cpp
index 88ce476e7..3c60e94d8 100644
--- a/karbon/karbon_drag.cpp
+++ b/karbon/karbon_drag.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcstring.h>
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "vdocument.h"
 
@@ -46,7 +46,7 @@ KarbonDrag::format( int i ) const
 }
 
 TQByteArray
-KarbonDrag::encodedData( const char* mimetype ) const
+KarbonDrag::tqencodedData( const char* mimetype ) const
 {
 	TQCString result;
 
@@ -85,7 +85,7 @@ KarbonDrag::decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc )
 	if( e->provides( m_decodeFormats[0] ) )
 	{
 		TQDomDocument doc( "clip" );
-		TQByteArray data = e->encodedData( m_decodeFormats[0] );
+		TQByteArray data = e->tqencodedData( m_decodeFormats[0] );
 		doc.setContent( TQCString( data, data.size()+1 ) );
 		TQDomElement clip = doc.documentElement();
 		// Try to parse the clipboard data
diff --git a/karbon/karbon_drag.h b/karbon/karbon_drag.h
index f514b55db..0fb801196 100644
--- a/karbon/karbon_drag.h
+++ b/karbon/karbon_drag.h
@@ -36,7 +36,7 @@ class KarbonDrag : public TQDragObject
 public:
 	KarbonDrag( TQWidget* dragSource = 0, const char* name = 0 );
 	const char* format( int i ) const;
-	TQByteArray encodedData( const char* mimetype ) const;
+	TQByteArray tqencodedData( const char* mimetype ) const;
 	static bool canDecode( TQMimeSource * );
 	static bool decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc );
 	void setObjectList( VObjectList l );
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 90c8c29ad..1d267e1b9 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -49,8 +49,8 @@ KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
 	KarbonToolRegistry::instance();
 
 	// Load plugins
-	KTrader::OfferList offers = KTrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"),
-                                    TQString::fromLatin1("Type == 'Service'"));
+	KTrader::OfferList offers = KTrader::self() -> query(TQString::tqfromLatin1("Karbon/CoreModule"),
+                                    TQString::tqfromLatin1("Type == 'Service'"));
 
 	KTrader::OfferList::ConstIterator iter;
 
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 955b21f5c..64dafd6a2 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject()
 }
 
 void
-KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit )
+KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit )
 {
-	m_pageLayout = layout;
+	m_pageLayout = tqlayout;
 	m_doc.setUnit( _unit );
 	m_doc.setWidth( m_pageLayout.ptWidth );
 	m_doc.setHeight( m_pageLayout.ptHeight );
@@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
 		return false;
 	}
 
-	TQString masterPageName = "Standard"; // use default layout as fallback
+	TQString masterPageName = "Standard"; // use default tqlayout as fallback
 	TQDomElement *master = styles.masterPages()[ masterPageName ];
 	if ( !master ) //last test...
 		master = styles.masterPages()[ "Default" ];
@@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
 		master = it.current();
 	}
 	Q_ASSERT( master );
-	const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
+	const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
 	if( style )
 	{
 		m_pageLayout.loadOasis( *style );
@@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
     KoGenStyle pageLayout = m_pageLayout.saveOasis();
     TQString layoutName = mainStyles.lookup( pageLayout, "PL" );
     KoGenStyle masterPage( KoGenStyle::STYLE_MASTER );
-    masterPage.addAttribute( "style:page-layout-name", layoutName );
+    masterPage.addAttribute( "style:page-tqlayout-name", layoutName );
     mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering );
 
     KTempFile contentTmpFile;
@@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
     it = styleList.begin();
 
     for( ; it != styleList.end(); ++it )
-        (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" );
+        (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" );
 
     styleWriter->endElement(); // office:automatic-styles
 
@@ -495,19 +495,19 @@ KarbonPart::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ )
 void
 KarbonPart::insertObject( VObject* object )
 {
-	// don't repaint here explicitly. some commands might want to insert many
+	// don't tqrepaint here explicitly. some commands might want to insert many
 	// objects.
 	m_doc.append( object );
 	setModified( true );
 }
 
 void
-KarbonPart::addCommand( VCommand* cmd, bool repaint )
+KarbonPart::addCommand( VCommand* cmd, bool tqrepaint )
 {
 	m_commandHistory->addCommand( cmd );
 	setModified( true );
 
-	if( repaint )
+	if( tqrepaint )
 		repaintAllViews();
 }
 
@@ -530,12 +530,12 @@ KarbonPart::clearHistory()
 }
 
 void
-KarbonPart::repaintAllViews( bool repaint )
+KarbonPart::repaintAllViews( bool tqrepaint )
 {
 	TQPtrListIterator<KoView> itr( views() );
 
 	for( ; itr.current() ; ++itr )
-		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( repaint );
+		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint );
 }
 
 void
@@ -561,19 +561,19 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect,
 	painter.eraseRect( rect );
 	VPainterFactory *painterFactory = new VPainterFactory;
 	//TQPaintDeviceMetrics metrics( painter.device() );
-	painterFactory->setPainter( painter.device(), rect.width(), rect.height() );
+	painterFactory->setPainter( painter.tqdevice(), rect.width(), rect.height() );
 	VPainter *p = painterFactory->painter();
 	//VPainter *p = new VKoPainter( painter.device() );
 	p->begin();
 	p->setZoomFactor( zoomFactor );
-	kdDebug(38000) << "painter.worldMatrix().dx() : " << painter.worldMatrix().dx() << endl;
-	kdDebug(38000) << "painter.worldMatrix().dy() : " << painter.worldMatrix().dy() << endl;
+	kdDebug(38000) << "painter.tqworldMatrix().dx() : " << painter.tqworldMatrix().dx() << endl;
+	kdDebug(38000) << "painter.tqworldMatrix().dy() : " << painter.tqworldMatrix().dy() << endl;
 	kdDebug(38000) << "rect.x() : "<< rect.x() << endl;
 	kdDebug(38000) << "rect.y() : "<< rect.y() << endl;
 	kdDebug(38000) << "rect.width() : "<< rect.width() << endl;
 	kdDebug(38000) << "rect.height() : "<< rect.height() << endl;
 	r = document().boundingBox();
-	TQWMatrix mat = painter.worldMatrix();
+	TQWMatrix mat = painter.tqworldMatrix();
 	mat.scale( 1, -1 );
 	mat.translate( 0, -r.height() * zoomFactor );
 	p->setWorldMatrix( mat );
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 9c9ae91af..34e0e04b1 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 repaint = false );
+	void addCommand( VCommand* cmd, bool tqrepaint = false );
 
 	// access static document:
 	VDocument& document() { return m_doc; }
@@ -102,13 +102,13 @@ public:
 	void initConfig();
 	unsigned int maxRecentFiles() const { return m_maxRecentFiles; }
 
-	void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit );
+	void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit );
 
 	bool mergeNativeFormat( const TQString & file );
 
 public slots:
-	/// repaint all views attached to this koDocument
-	void repaintAllViews( bool repaint = true );
+	/// tqrepaint all views attached to this koDocument
+	void repaintAllViews( bool tqrepaint = 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 3c7f30acf..d90c506eb 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" ).arg( val ).arg( m_part->unitName() );
+	return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() );
 }
 
 TQString
 KarbonPartIface::heightInUnits()
 {
 	TQString val = KoUnit::toUserStringValue( m_part->document().height(), m_part->unit() );
-	return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() );
+	return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() );
 }
 
 double
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index f76dd156d..333406902 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -22,7 +22,7 @@
 #include <tqdragobject.h>
 #include <tqiconset.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqpopupmenu.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
@@ -119,20 +119,20 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name )
 	setClientBuilder( this );
 
 	if( !p->isReadWrite() )
-		setXMLFile( TQString::fromLatin1( "karbon_readonly.rc" ) );
+		setXMLFile( TQString::tqfromLatin1( "karbon_readonly.rc" ) );
 	else
-		setXMLFile( TQString::fromLatin1( "karbon.rc" ) );
+		setXMLFile( TQString::tqfromLatin1( "karbon.rc" ) );
 
 	m_dcop = 0L;
 	dcopObject(); // build it
 
 	// set up status bar message
 	m_status = new KStatusBarLabel( TQString(), 0, statusBar() );
-	m_status->setAlignment( AlignLeft | AlignVCenter );
+	m_status->tqsetAlignment( AlignLeft | AlignVCenter );
 	m_status->setMinimumWidth( 300 );
 	addStatusBarItem( m_status, 1 );
 	m_cursorCoords = new KStatusBarLabel( TQString(), 0, statusBar() );
-	m_cursorCoords->setAlignment( AlignLeft | AlignVCenter );
+	m_cursorCoords->tqsetAlignment( AlignLeft | AlignVCenter );
 	m_cursorCoords->setMinimumWidth( 50 );
 	addStatusBarItem( m_cursorCoords, 0 );
 	m_smallPreview = new VSmallPreview( this, name );
@@ -462,7 +462,7 @@ KarbonView::fileImportGraphic()
 	else
 	{
 		KoFilterManager man( part() );
-		KoFilter::ConversionStatus status;
+		KoFilter::ConversiontqStatus status;
 		TQString importedFile = man.import( fname, status );
 		part()->mergeNativeFormat( importedFile );
 		if( !importedFile.isEmpty() )
@@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const
 
 	KarbonDrag* kd = new KarbonDrag();
 	kd->setObjectList( part()->document().selection()->objects() );
-	TQApplication::clipboard()->setData( kd );
+	TQApplication::tqclipboard()->setData( kd );
 }
 
 void
@@ -503,7 +503,7 @@ KarbonView::editPaste()
 	KarbonDrag kd;
 	VObjectList objects;
 
-	if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) )
+	if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) )
 		return;
 
 	// Paste with a small offset.
@@ -769,7 +769,7 @@ KarbonView::viewModeChanged()
 void
 KarbonView::setZoomAt( double zoom, const KoPoint &p )
 {
-	TQString zoomText = TQString( "%1%" ).arg( zoom * 100.0, 0, 'f', 2 );
+	TQString zoomText = TQString( "%1%" ).tqarg( 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" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) );
+	m_cursorCoords->setText( TQString( "%1, %2" ).tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)).tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)) );
 
 	if( toolController() )
 		return toolController()->mouseEvent( event, p );
@@ -1310,11 +1310,11 @@ void
 KarbonView::pageLayout()
 {
 	KoHeadFoot hf;
-	KoPageLayout layout = part()->pageLayout();
+	KoPageLayout tqlayout = part()->pageLayout();
 	KoUnit::Unit unit = part()->unit();
-	if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) )
+	if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) )
 	{
-		part()->setPageLayout( layout, unit );
+		part()->setPageLayout( tqlayout, unit );
 		m_horizRuler->setUnit( unit );
 		m_vertRuler->setUnit( unit );
 		m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ),
@@ -1444,9 +1444,9 @@ KarbonView::repaintAll( const KoRect &r )
 }
 
 void
-KarbonView::repaintAll( bool repaint )
+KarbonView::repaintAll( bool tqrepaint )
 {
-	m_canvas->repaintAll( repaint );
+	m_canvas->repaintAll( tqrepaint );
 }
 void
 KarbonView::setPos( const KoPoint& p )
diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index ac3dc8dd0..13afd9f16 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -274,7 +274,7 @@ private:
 	// dcop
 	DCOPObject		*m_dcop;
 
-	//Status Bar
+	//tqStatus Bar
 	TQLabel				*m_status;       // Ordinary status
 	TQLabel				*m_cursorCoords; // Cursor coordinates
 	VSmallPreview		*m_smallPreview; // Stroke and Fill
diff --git a/karbon/karbon_view_iface.cc b/karbon/karbon_view_iface.cc
index 3fdf17783..5d919f8ff 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::repaint()
+void KarbonViewIface::tqrepaint()
 {
 	m_view->canvasWidget()->repaintAll();
 }
diff --git a/karbon/karbon_view_iface.h b/karbon/karbon_view_iface.h
index 59756746b..fcd4cf558 100644
--- a/karbon/karbon_view_iface.h
+++ b/karbon/karbon_view_iface.h
@@ -61,7 +61,7 @@ k_dcop:
 	void pathRoundCorners();
 	void pathWhirlPinch();
 
-	void repaint();
+	void tqrepaint();
 
 private:
 	KarbonView* m_view;
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index fc6da1da7..dea095712 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -142,7 +142,7 @@ VCreateShadowCmd::execute()
 	bool successful = false;
 
 
-	// Create new shapes if they don't exist yet.
+	// Create new tqshapes if they don't exist yet.
 	if( !m_newObjects )
 	{
 		m_newObjects = new VSelection();
@@ -169,11 +169,11 @@ VCreateShadowCmd::execute()
 
 			if(newObject)
 			{
-				// Insert new shape right before old shape.
+				// Insert new tqshape right before old tqshape.
 				itr.current()->parent()->insertInfrontOf( 
 					newObject, itr.current() );
 
-				// Add new shape to list of new objects.
+				// Add new tqshape to list of new objects.
 				m_newObjects->append( newObject );
 			}
 		}
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc
index 99ee8c8c3..b3c00bdd2 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.cc
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc
@@ -69,7 +69,7 @@ VShadowDecorator::draw( VPainter* painter, const KoRect* rect ) const
 	if( m_object->fill()->type() != VFill::none )
 		m_object->fill()->setColor( black );
 	m_object->stroke()->setColor( black );
-	TQWMatrix mat = painter->worldMatrix();
+	TQWMatrix mat = painter->tqworldMatrix();
 	painter->setWorldMatrix( mat.translate( shadowDx * painter->zoomFactor(), -shadowDy * painter->zoomFactor()) );
 	m_object->draw( painter, rect );
 	m_object->setFill( *fill );
diff --git a/karbon/render/art_rgb.c b/karbon/render/art_rgb.c
index 4d30fad42..6dd84bdef 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 alignment. Then,
+   First, maybe we should be working at 32-bit tqalignment. Then,
    this can be a simple loop over word stores.
 
-   Second, we can keep working at 24-bit alignment, but have some
+   Second, we can keep working at 24-bit tqalignment, 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 alignment */
+	  /* handle prefix up to byte tqalignment */
 	  /* 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 617f1abed..2052d2ffa 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 shape specified with @svp into the @buf RGB buffer.
+ * Renders the tqshape 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 shape specified with @svp over the @buf RGB buffer.
+ * Renders the tqshape 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/vkopainter.h b/karbon/render/vkopainter.h
index eac4c2049..75ac0bd16 100644
--- a/karbon/render/vkopainter.h
+++ b/karbon/render/vkopainter.h
@@ -52,7 +52,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix worldMatrix() { return m_matrix; }
+	virtual const TQWMatrix tqworldMatrix() { return m_matrix; }
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h
index b61d854a7..84ad9d135 100644
--- a/karbon/render/vpainter.h
+++ b/karbon/render/vpainter.h
@@ -57,7 +57,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & ) = 0;
-	virtual const TQWMatrix worldMatrix() = 0;
+	virtual const TQWMatrix tqworldMatrix() = 0;
 	virtual void setZoomFactor( double ) = 0;
 	virtual double zoomFactor() { return 1.0; }
 
diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cc
index 51819ae30..7f3802870 100644
--- a/karbon/render/vqpainter.cc
+++ b/karbon/render/vqpainter.cc
@@ -81,9 +81,9 @@ VTQPainter::end()
 }
 
 const TQWMatrix
-VTQPainter::worldMatrix()
+VTQPainter::tqworldMatrix()
 {
-	return m_painter->worldMatrix();
+	return m_painter->tqworldMatrix();
 }
 
 void
@@ -153,13 +153,13 @@ VTQPainter::fillPath()
 {
 	// we probably dont need filling for qpainter
 	//m_index = 0;
-	m_painter->drawPolygon( m_pa, FALSE, 0, m_index );
+	m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index );
 }
 
 void
 VTQPainter::strokePath()
 {
-	m_painter->drawPolyline( m_pa, 0, m_index );
+	m_painter->tqdrawPolyline( m_pa, 0, m_index );
 	m_index = 0;
 }
 
@@ -265,7 +265,7 @@ VTQPainter::drawRect( const KoRect &rect )
 void
 VTQPainter::drawImage( const TQImage &image, const TQWMatrix &affine )
 {
-	TQWMatrix matrix = m_painter->worldMatrix();
+	TQWMatrix matrix = m_painter->tqworldMatrix();
 	
 	double m11 = affine.m11() * matrix.m11() * m_zoomFactor + affine.m12() * matrix.m21();
 	double m12 = (affine.m11() * matrix.m12() + affine.m12() * matrix.m22() ) * m_zoomFactor;
diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h
index 5cf3ecd12..d1a556dbf 100644
--- a/karbon/render/vqpainter.h
+++ b/karbon/render/vqpainter.h
@@ -44,7 +44,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix worldMatrix();
+	virtual const TQWMatrix tqworldMatrix();
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 7e9556108..b9cf93766 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, *children;
-		int nchildren;
+		Window parent, root, *tqchildren;
+		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &parent, &children, &nchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
-		if (nchildren > 0)
-			XFree (children);
+		if (ntqchildren > 0)
+			XFree (tqchildren);
 
 		if (parent == root)
 			return 1;
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index ef5bb0708..0b5fd80c2 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 shape gets mirrored in y-direction, so make the angles temporary clockwise 
+	// the tqshape 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 1735471f7..650b4698f 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").arg( m_width ) );
-		me.setAttribute( "height", TQString("%1pt").arg( m_height ) );
+		me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) );
+		me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) );
 
 		me.setAttribute( "points", m_points );
 
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index cef5bda2e..d716c3250 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" ).arg( p1.x() ).arg( p1.y() ).arg( p2.x() ).arg( p2.y() );
+		m_points = TQString( "%1,%2 %3,%4" ).tqarg( p1.x() ).tqarg( p1.y() ).tqarg( p2.x() ).tqarg( p2.y() );
 
 		moveTo( p1 );
 		lineTo( p2 );
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index bbeef50f7..bb3512fd9 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").arg( m_width ) );
-		me.setAttribute( "height", TQString("%1pt").arg( m_height ) );
+		me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) );
+		me.setAttribute( "height", TQString("%1pt").tqarg( 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 e6134662b..d82cdf9e1 100644
--- a/karbon/shapes/vstar.h
+++ b/karbon/shapes/vstar.h
@@ -23,11 +23,11 @@
 #include "vcomposite.h"
 #include <koffice_export.h>
 /**
- * This shape offers star-like shapes with a lot of parameters :
+ * This tqshape offers star-like tqshapes with a lot of parameters :
  *
  * Types :
  *
- * Star           - fully connected star shape.
+ * Star           - fully connected star tqshape.
  * 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 shape.
+ * Roundness      - uses curves instead of lines for the star tqshape.
  */
 class KARBONBASE_EXPORT VStar : public VPath
 {
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index b0f981af5..41936226a 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -152,7 +152,7 @@ VEllipseTool::refreshUnit()
 }
 
 VPath*
-VEllipseTool::shape( bool interactive ) const
+VEllipseTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h
index 5a605c53d..859cac961 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 *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 	void refreshUnit();
 
 protected:
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 92a981ba0..893c84816 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqframe.h>
 #include <tqhbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 #include <tqcursor.h>
@@ -49,9 +49,9 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
 	: KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
 {
 	TQWidget *base = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( base );
-	layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
-	layout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( base );
+	tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
+	tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
 	m_buttonGroup->insert( m_importPatternButton = new TQToolButton( m_buttonGroup ) );
 	m_buttonGroup->insert( m_deletePatternButton = new TQToolButton( m_buttonGroup ) );
 	m_patternChooser->setFixedSize( 180, 120 );
@@ -65,7 +65,7 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
 	m_deletePatternButton->setEnabled( false );
 
 	//setFrameStyle( Box | Sunken );
-	layout->setMargin( 3 );
+	tqlayout->setMargin( 3 );
 
 	connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
 	connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) );
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index fdd022993..db1ffb886 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -119,7 +119,7 @@ VPolygonTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VPolygonTool::shape( bool interactive ) const
+VPolygonTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h
index cb1dababd..052d7e504 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 *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 1b9d9c0f5..7d949ac73 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -101,7 +101,7 @@ VRectangleTool::refreshUnit()
 }
 
 VPath *
-VRectangleTool::shape( bool interactive ) const
+VRectangleTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index ce39a1190..b902b1ab1 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* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc
index c88bacd8e..b7f354cfa 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):" ).arg(KoUnit::unitName( m_part->unit() )), group );
+	new TQLabel( i18n( "Height (%1):" ).tqarg(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::shape( bool interactive ) const
+VRoundRectTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 5149ff2f6..59a2fab08 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* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc
index e6b87f628..e29e1afb2 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)").arg( x, 0, 'f', 1 ).arg( y, 0, 'f', 1 ).arg( r, 0, 'f', 1 ).arg( b, 0, 'f', 1 ).arg( view()->part()->unitName() );
+		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() );
 
 		VSelectionDescription selectionDesc;
 		selectionDesc.visit( *view()->part()->document().selection() );
-		selectMessage += TQString( "(%1)" ).arg( selectionDesc.description() );
+		selectMessage += TQString( "(%1)" ).tqarg( selectionDesc.description() );
 
 		view()->statusMessage()->setText( selectMessage );
 	}
diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc
index 9b59104d1..491977736 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 shape.<br>" );
-	s += i18n( "<i>Click</i> to place a shape using the tool properties values.</qt>" );
+	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>" );
 	return s;
 } 
 
@@ -77,7 +77,7 @@ VShapeTool::draw()
 	VPainter* painter = view()->painterFactory()->editpainter();
 	painter->setRasterOp( TQt::NotROP );
 
-	VPath* composite = shape();
+	VPath* composite = tqshape();
 	composite->setState( VPath::edit );
 	composite->draw( painter, &composite->boundingBox() );
 	delete( composite );
@@ -101,7 +101,7 @@ VShapeTool::mouseButtonRelease()
 
 	if( showDialog() )
 	{
-		VPath* composite = shape( true );
+		VPath* composite = tqshape( true );
 
 		if( composite )
 		{
@@ -136,7 +136,7 @@ VShapeTool::mouseDragRelease()
 
 	VShapeCmd* cmd = new VShapeCmd(
 		&view()->part()->document(),
-		uiname(), shape(), icon() );
+		uiname(), tqshape(), icon() );
 
 	view()->part()->addCommand( cmd, true );
 
diff --git a/karbon/tools/vshapetool.h b/karbon/tools/vshapetool.h
index f66b57193..2a774e947 100644
--- a/karbon/tools/vshapetool.h
+++ b/karbon/tools/vshapetool.h
@@ -58,7 +58,7 @@ protected:
 	// Make it "abstract":
 	virtual ~VShapeTool();
 
-	virtual VPath* shape( bool interactive = false ) const = 0;
+	virtual VPath* tqshape( bool interactive = false ) const = 0;
 
 	/**
 	 * Output coordinates.
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index 65a8a62fd..f95bc2c5a 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -120,7 +120,7 @@ VSinusTool::refreshUnit()
 }
 
 VPath*
-VSinusTool::shape( bool interactive ) const
+VSinusTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h
index 4aa1c4648..71669ebdc 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 *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index e0c78e1d0..304c86373 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -165,7 +165,7 @@ VSpiralTool::refreshUnit()
 }
 
 VPath*
-VSpiralTool::shape( bool interactive ) const
+VSpiralTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 072e3bea2..5787063d8 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* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index 114bab759..42c74f4e1 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -198,7 +198,7 @@ VStarTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VStarTool::shape( bool interactive ) const
+VStarTool::tqshape( 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( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index ce073d0c2..07d744c0f 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* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 29293e8b6..a35001605 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -23,7 +23,7 @@
 #include <tqcombobox.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
@@ -173,7 +173,7 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 		p.lineTo( KoPoint( w, h ) );
 		p.lineTo( KoPoint( w, 0 ) );
 		p.lineTo( KoPoint( 0, 0 ) );
-		VColor c( colorGroup().background() );
+		VColor c( tqcolorGroup().background() );
 		c.setOpacity( .8 );
 		p.setBrush( VFill( c ) );
 		p.fillPath();
@@ -183,13 +183,13 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 
 	TQPainter painter( this );
 	painter.drawPixmap( 2, 2, pm );
-	painter.setPen( colorGroup().light() );
+	painter.setPen( tqcolorGroup().light() );
 	painter.moveTo( 1, height() - 1 );
 	painter.lineTo( 1, 1 );
 	painter.lineTo( width() - 1, 1 );
 	painter.lineTo( width() - 1, height() - 1 );
 	painter.lineTo( 1, height() - 1 );
-	painter.setPen( colorGroup().dark() );
+	painter.setPen( tqcolorGroup().dark() );
 	painter.moveTo( 0, height() - 1 );
 	painter.lineTo( 0, 0 );
 	painter.lineTo( width() - 1, 0 );
@@ -205,22 +205,22 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d
 		: TQGroupBox( parent, name )
 {
 	setTitle( i18n( "Shadow" ) );
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
-
-	TQGridLayout* layout = new TQGridLayout( this );
-	layout->addRowSpacing( 0, 12 );
-	layout->setMargin( 3 );
-	layout->setSpacing( 2 );
-	layout->setColStretch( 0, 1 );
-	layout->setColStretch( 1, 0 );
-	layout->setColStretch( 2, 2 );
-	layout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
-	layout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
-	layout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
-	layout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
-	layout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
-	layout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
-	layout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+
+	TQGridLayout* tqlayout = new TQGridLayout( this );
+	tqlayout->addRowSpacing( 0, 12 );
+	tqlayout->setMargin( 3 );
+	tqlayout->setSpacing( 2 );
+	tqlayout->setColStretch( 0, 1 );
+	tqlayout->setColStretch( 1, 0 );
+	tqlayout->setColStretch( 2, 2 );
+	tqlayout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
+	tqlayout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
+	tqlayout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
+	tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
+	tqlayout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
+	tqlayout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
+	tqlayout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
 	m_distance->setRange( 1, 37, 1, true );
 	m_angle->setRange( 0, 360, 10, true );
 	m_angle->setValue( angle );
@@ -255,7 +255,7 @@ void
 ShadowWidget::setShadowAngle( int angle )
 {
 	m_angle->setValue( angle );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 int
@@ -268,7 +268,7 @@ void
 ShadowWidget::setShadowDistance( int distance )
 {
 	m_distance->setValue( distance );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 int
@@ -281,7 +281,7 @@ void
 ShadowWidget::setTranslucent( bool translucent )
 {
 	m_translucent->setChecked( translucent );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 bool ShadowWidget::isTranslucent()
@@ -301,13 +301,13 @@ ShadowWidget::setShadowValues( int angle, int distance, bool translucent )
 void
 ShadowWidget::updatePreview( int )
 {
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 void
 ShadowWidget::updatePreview()
 {
-	m_preview->repaint();
+	m_preview->tqrepaint();
 	bool ok = m_useShadow->isChecked();
 	m_angle->setEnabled( ok );
 	m_distance->setEnabled( ok );
@@ -317,7 +317,7 @@ ShadowWidget::updatePreview()
 VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 	: KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
 {
-	//setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+	//tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 	//setFrameStyle( Box | Sunken );
 	TQWidget *base = new TQWidget( this );
 	TQVBoxLayout* mainLayout = new TQVBoxLayout( base );
@@ -387,13 +387,13 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 
 	m_convertToShapes->setEnabled( true );
 
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") );
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") );
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Left") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Center") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Right") );
 
-	m_textPosition->insertItem( i18n( "Vertical alignment", "Above") );
-	m_textPosition->insertItem( i18n( "Vertical alignment", "On") );
-	m_textPosition->insertItem( i18n( "Vertical alignment", "Under") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Above") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "On") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Under") );
 
 	m_textOffset->setRange( 0.0, 100.0, 1.0, true );
 
@@ -518,12 +518,12 @@ VText::Position VTextOptionsWidget::position()
 }
 
 void
-VTextOptionsWidget::setAlignment( VText::Alignment alignment )
+VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment )
 {
-	m_textAlignment->setCurrentItem( alignment );
+	m_textAlignment->setCurrentItem( tqalignment );
 }
 
-VText::Alignment VTextOptionsWidget::alignment()
+VText::Alignment VTextOptionsWidget::tqalignment()
 {
 	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->alignment(), m_optionsWidget->text() );
+	m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->tqalignment(), 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->alignment() );
+	m_editedText->tqsetAlignment( m_optionsWidget->tqalignment() );
 	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->alignment(),
+				  m_editedText->tqalignment(),
 				  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.alignment() );
+	m_optionsWidget->tqsetAlignment( text.tqalignment() );
 	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->alignment();
+	m_textModifications->oldAlignment = text->tqalignment();
 	m_textModifications->newOffset = newOffset;
 	m_textModifications->oldOffset = text->offset();
 	m_textModifications->newText = newText;
@@ -1007,7 +1007,7 @@ VTextTool::VTextCmd::execute()
 		m_text->setFont( m_textModifications->newFont );
 		m_text->setBasePath( m_textModifications->newBasePath );
 		m_text->setPosition( m_textModifications->newPosition );
-		m_text->setAlignment( m_textModifications->newAlignment );
+		m_text->tqsetAlignment( m_textModifications->newAlignment );
 		m_text->setOffset( m_textModifications->newOffset );
 		m_text->setText( m_textModifications->newText );
 		m_text->setUseShadow( m_textModifications->newUseShadow );
@@ -1041,7 +1041,7 @@ VTextTool::VTextCmd::unexecute()
 		m_text->setFont( m_textModifications->oldFont );
 		m_text->setBasePath( m_textModifications->oldBasePath );
 		m_text->setPosition( m_textModifications->oldPosition );
-		m_text->setAlignment( m_textModifications->oldAlignment );
+		m_text->tqsetAlignment( m_textModifications->oldAlignment );
 		m_text->setOffset( m_textModifications->oldOffset );
 		m_text->setText( m_textModifications->oldText );
 		m_text->setUseShadow( m_textModifications->oldUseShadow );
diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index 48357dbf9..cd3c4e87d 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 alignment );
-	VText::Alignment alignment();
+	void tqsetAlignment( VText::Alignment tqalignment );
+	VText::Alignment tqalignment();
 	void setOffset( double offset );
 	double offset();
 	void setUseShadow( bool state );
diff --git a/karbon/usablity-review.txt b/karbon/usablity-review.txt
index 5d2eb8b44..237dc8281 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 shape.
+* make the 'hit area' based more on the outside of the tqshape.
 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 2b8bc72e1..877dc41b7 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 shapes like ellipses and lines
+	TOOL_SHAPE = 2,        // Geometric tqshapes like ellipses and lines
 	TOOL_MANIPULATION = 3, //
 	TOOL_MISC = 4          //
 };
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 9fa5dcd65..d96018b9b 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -152,7 +152,7 @@ VCanvas::eventFilter( TQObject* object, TQEvent* event )
 }
 
 
-// This causes a repaint normally, so just overwriting it omits the repainting
+// This causes a tqrepaint normally, so just overwriting it omits the repainting
 void
 VCanvas::focusInEvent( TQFocusEvent * )
 {
@@ -228,7 +228,7 @@ VCanvas::viewportPaintEvent( TQPaintEvent *e )
 	setYMirroring( p );
 	
 	// TRICK : slightly adjust the matrix so libart AA looks better
-	TQWMatrix mat = p->worldMatrix();
+	TQWMatrix mat = p->tqworldMatrix();
 	p->setWorldMatrix( mat.translate( -.5, -.5 ) );
 
 	// set up clippath
@@ -305,7 +305,7 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects
 		p->setZoomFactor( m_view->zoom() );
 		setYMirroring( p );
 		// TRICK : slightly adjust the matrix so libart AA looks better
-		TQWMatrix mat = p->worldMatrix();
+		TQWMatrix mat = p->tqworldMatrix();
 		p->setWorldMatrix( mat.translate( -.5, -.5 ) );
 
 		m_part->document().drawPage( p, m_part->pageLayout(), m_view->showPageMargins() );
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc
index 6c32465e2..3e2af4f02 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cc
@@ -20,7 +20,7 @@
 
 /* vcolorslider.cc */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <knuminput.h>
 #include <kselect.h>
@@ -53,15 +53,15 @@ VColorSlider::~VColorSlider()
 void VColorSlider::init()
 {
 	m_isDragging = false;
-	TQHBoxLayout *layout = new TQHBoxLayout( this, 3 );
+	TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 3 );
 
 	m_label = new TQLabel( this );
 	m_gradientSelect = new KGradientSelector( Qt::Horizontal, this );
 	m_spinBox = new KIntSpinBox( this );
 
-	layout->addWidget( m_label );
-	layout->addWidget( m_gradientSelect, 2 );
-	layout->addWidget( m_spinBox );
+	tqlayout->addWidget( m_label );
+	tqlayout->addWidget( m_gradientSelect, 2 );
+	tqlayout->addWidget( m_spinBox );
 
 	setValue( 0 );
 	setMinValue( 0 );
@@ -72,7 +72,7 @@ void VColorSlider::init()
 
 	m_gradientSelect->installEventFilter( this );
 
-	layout->activate();
+	tqlayout->activate();
 }
 
 void VColorSlider::setLabel( const TQString& label )
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index 0dd365f17..f65cfd74b 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -19,7 +19,7 @@
 
 #include <tqlabel.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqfileinfo.h>
@@ -93,9 +93,9 @@ void VGradientListItem::paint( TQPainter* painter )
 	painter->drawPixmap( 0, 0, m_pixmap );
 	painter->restore();
 	if ( isSelected() )
-		painter->setPen( listBox()->colorGroup().highlightedText() );
+		painter->setPen( listBox()->tqcolorGroup().highlightedText() );
 	else
-		painter->setPen( listBox()->colorGroup().base() );
+		painter->setPen( listBox()->tqcolorGroup().base() );
 	painter->drawRect( r );
 	painter->flush();
 } // VGradientListItem::paint
@@ -151,13 +151,13 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 
 	TQPainter p( &pixmap );
 
-	p.setPen( colorGroup().light() );
+	p.setPen( tqcolorGroup().light() );
 	p.moveTo( 1, height() - 1 );
 	p.lineTo( 1, 1 );
 	p.lineTo( width() - 1, 1 );
 	p.lineTo( width() - 1, height() - 1 );
 	p.lineTo( 1, height() - 1 );
-	p.setPen( colorGroup().dark() );
+	p.setPen( tqcolorGroup().dark() );
 	p.moveTo( 0, height() - 1 );
 	p.lineTo( 0, 0 );
 	p.lineTo( width() - 1, 0 );
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 7e9ecd756..f1c55ea1c 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -117,7 +117,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 
 	TQPainter p( &pixmap );
 
-	p.setPen( colorGroup().light() );
+	p.setPen( tqcolorGroup().light() );
 	// light frame around widget
 	p.moveTo( 1, height() - 1 );
 	p.lineTo( 1, 1 );
@@ -129,7 +129,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	p.moveTo( 1, 3 + gh );
 	p.lineTo( width() - 1, 3 + gh );
 
-	p.setPen( colorGroup().dark() );
+	p.setPen( tqcolorGroup().dark() );
 	// left-top frame around widget
 	p.moveTo( 0, height() - 1 );
 	p.lineTo( 0, 0 );
@@ -151,7 +151,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	
 	m_pntArea.setRect( 2, height() - ph - 2, w, ph );
 	// clear point area
-	p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), colorGroup().background() );
+	p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), tqcolorGroup().background() );
 
 	p.setClipRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height() );
 	p.translate( m_pntArea.x(), m_pntArea.y() );
@@ -244,7 +244,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 	if( currentPoint % 2 == 1 )
 	{
 		// ramp point hit -> change color
-		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->topLevelWidget() );
+		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->tqtopLevelWidget() );
 		if( d->exec() == TQDialog::Accepted )
 		{
 			m_gradient->m_colorStops.at( currentPoint / 2 )->color = d->Color();
@@ -256,7 +256,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 	else if( currentPoint == 0 )
 	{
 		// now point hit -> create new color stop
-		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->topLevelWidget() );
+		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->tqtopLevelWidget() );
 		if( d->exec() == TQDialog::Accepted )
 		{
 			m_gradient->addStop( d->Color(), (float)( e->x() - 2 ) / ( m_pntArea.width() ), 0.5 );
diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc
index 0040c3efc..f400fc139 100644
--- a/karbon/widgets/vreference.cc
+++ b/karbon/widgets/vreference.cc
@@ -21,14 +21,14 @@
 /* vreference.cc */
 
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include "vreference.h"
 
 VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name )
 {
-	TQVBoxLayout* layout = new TQVBoxLayout( this );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this );
 	TQRadioButton* radio = new TQRadioButton ( mButtonGroup );
 	mButtonGroup->insert( radio, TopLeft );
@@ -54,8 +54,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent,
 		this, TQT_SLOT( setReferencePoint( int ) ) );
 	
 	mButtonGroup->setButton( Center );
-	layout->addWidget( mButtonGroup );
-	layout->activate();
+	tqlayout->addWidget( mButtonGroup );
+	tqlayout->activate();
 	setReferencePoint( Center );
 }
 
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc
index 28b7db9ff..de03eb235 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);
-    repaint();
+    tqrepaint();
 }
 
 void VRuler::setZoom(double zoom)
@@ -123,7 +123,7 @@ void VRuler::setZoom(double zoom)
     recalculateSize();
     drawRuler();
     updatePointer(m_currentPosition, m_currentPosition);
-    repaint();
+    tqrepaint();
 }
 
 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)
-                repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
+                tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT);
 
             if (x != -1) {
                 bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT);
@@ -139,7 +139,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y)
             }
         } else {
             if (m_currentPosition != -1)
-                repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
+                tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH);
 
             if (y != -1) {
                 bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH);
@@ -158,7 +158,7 @@ void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos)
 
 	//kdDebug() << "--###-- VRuler::updateVisibleArea(" << xpos << ", " << ypos << ")" << endl;
     drawRuler();
-    repaint();
+    tqrepaint();
     updatePointer(m_currentPosition, m_currentPosition);
 	//kdDebug() << "--###-- VRuler::updatePointer(" << m_currentPosition << ", " << m_currentPosition << ")" << endl;
 }
@@ -188,7 +188,7 @@ void VRuler::drawRuler()
 
     p.begin(m_pixmapBuffer);
     p.setPen(TQColor(0x70, 0x70, 0x70));
-    p.setBackgroundColor(colorGroup().background());
+    p.setBackgroundColor(tqcolorGroup().background());
     p.eraseRect(0, 0, m_pixmapBuffer -> width(), m_pixmapBuffer -> height());
 
     switch (m_unit) {
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index 1cd6af0ef..6e35d921f 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -22,7 +22,7 @@
 #include <tqcolor.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 
 #include <klocale.h>
@@ -42,21 +42,21 @@
 VSmallPreview::VSmallPreview( TQWidget* parent, const char* name )
 	: TQWidget( parent, name )
 {
-	/* Create widget layout */
-	TQHBoxLayout *layout = new TQHBoxLayout( this, 4 );
+	/* Create widget tqlayout */
+	TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 );
 	m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this );
-	layout->addWidget( m_strokeLabel );
+	tqlayout->addWidget( m_strokeLabel );
 	m_strokeFrame = new TQFrame( this );
 	m_strokeFrame->setFixedWidth ( FRAMEWIDTH );
 	m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
-	layout->addWidget( m_strokeFrame );
+	tqlayout->addWidget( m_strokeFrame );
 	m_fillLabel = new TQLabel( i18n( "Fill: None" ), this );
-	layout->addWidget( m_fillLabel );
+	tqlayout->addWidget( m_fillLabel );
 	m_fillFrame = new TQFrame( this );
 	m_fillFrame->setFixedWidth ( FRAMEWIDTH );
 	m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
-	layout->addWidget( m_fillFrame );
-	layout->activate();
+	tqlayout->addWidget( m_fillFrame );
+	tqlayout->activate();
 
 	m_fill = VFill();
 	m_stroke = VStroke();
diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc
index f69d5d855..473ce4db3 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();
 
-	repaint();
+	tqrepaint();
 }
 
 void
diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h
index 53234b092..1790c9c9e 100644
--- a/karbon/widgets/vstrokefillpreview.h
+++ b/karbon/widgets/vstrokefillpreview.h
@@ -37,9 +37,9 @@ public:
 	VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	~VStrokeFillPreview();
 
-	virtual TQSize sizeHint() const
+	virtual TQSize tqsizeHint() const
 		{ return TQSize( 50, 50 ); }
-	virtual TQSize minimumSizeHint() const
+	virtual TQSize tqminimumSizeHint() const
 		{ return TQSize( 20, 20 ); }
 	virtual TQSizePolicy sizePolicy() const
 		{ return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); }
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index faa4d8370..e13da6894 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <klocale.h>
 #include <knuminput.h>
@@ -34,38 +34,38 @@ VTranslate::VTranslate( TQWidget* parent, const char* name )
 {
 	setCaption( i18n( "Translate" ) );
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this, 7);
-	mainlayout->addSpacing(5);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this, 7);
+	maintqlayout->addSpacing(5);
 
-	TQGridLayout *inputlayout = new TQGridLayout(this, 5, 3);
-	mainlayout->addLayout(inputlayout);
+	TQGridLayout *inputtqlayout = new TQGridLayout(this, 5, 3);
+	maintqlayout->addLayout(inputtqlayout);
 	m_labelX = new TQLabel(i18n("X:"), this);
-	inputlayout->addWidget(m_labelX, 0, 0);
+	inputtqlayout->addWidget(m_labelX, 0, 0);
 	labely = new TQLabel(i18n("Y:"), this);
-	inputlayout->addWidget(labely, 1, 0);
-	inputlayout->addColSpacing(1, 1);
-	inputlayout->addColSpacing(3, 5);
+	inputtqlayout->addWidget(labely, 1, 0);
+	inputtqlayout->addColSpacing(1, 1);
+	inputtqlayout->addColSpacing(3, 5);
 	m_inputX = new KDoubleNumInput( this );
 	m_inputX->setRange(-10000.00, 10000.00, 1.00, false); //range is just for example - for now :-)
-	inputlayout->addWidget(m_inputX, 0, 2);
+	inputtqlayout->addWidget(m_inputX, 0, 2);
 	m_inputY = new KDoubleNumInput( this );
 	m_inputY->setRange(-10000.00, 10000.00, 1.00, false);
-	inputlayout->addWidget(m_inputY, 1, 2);
+	inputtqlayout->addWidget(m_inputY, 1, 2);
 	m_labelUnit1 = new TQLabel("", this);
-	inputlayout->addWidget(m_labelUnit1, 0, 4);
+	inputtqlayout->addWidget(m_labelUnit1, 0, 4);
 	m_labelUnit2 = new TQLabel("", this);
-	inputlayout->addWidget(m_labelUnit2, 1, 4);
-	mainlayout->addSpacing(5);
+	inputtqlayout->addWidget(m_labelUnit2, 1, 4);
+	maintqlayout->addSpacing(5);
 	m_checkBoxPosition = new TQCheckBox(i18n("Relative &position"), this);
-	mainlayout->addWidget(m_checkBoxPosition);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(m_checkBoxPosition);
+	maintqlayout->addSpacing(5);
 	m_buttonDuplicate = new TQPushButton(i18n("&Duplicate"), this);
-	mainlayout->addWidget(m_buttonDuplicate);
-	mainlayout->addSpacing(1);
+	maintqlayout->addWidget(m_buttonDuplicate);
+	maintqlayout->addSpacing(1);
 	m_buttonApply = new KPushButton(KStdGuiItem::apply(), this);
-	mainlayout->addWidget(m_buttonApply);
+	maintqlayout->addWidget(m_buttonApply);
 
-	mainlayout->activate();
+	maintqlayout->activate();
 
 	setFixedSize(baseSize()); //Set the size tp fixed values
 }
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index b0e52fea4..38cfd8c2b 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -27,11 +27,11 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -60,14 +60,14 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( 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.arg("Apple Roman"); // Apple
-    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
-    encodings << description.arg("CP 1258"); // Windows
+    encodings << description.tqarg("Apple Roman"); // Apple
+    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
+    encodings << description.tqarg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -82,7 +82,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
 
     fillTable();
 
-    //resize(sizeHint());
+    //resize(tqsizeHint());
     resize( 600, 400 ); // Try to show as much as possible of the table view
     setMainWidget(m_dialog);
 
@@ -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").arg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
         return 0;
     }
 
diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index 4e53b54dc..a061c0cc2 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -68,7 +68,7 @@
             </attribute>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>tqlayout5</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
@@ -84,7 +84,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -122,7 +122,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -173,7 +173,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -274,7 +274,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>32767</height>
@@ -364,7 +364,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -381,7 +381,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -430,7 +430,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -479,7 +479,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -523,7 +523,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>468</width>
                                     <height>20</height>
@@ -540,7 +540,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>468</width>
                                     <height>20</height>
@@ -557,7 +557,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>611</width>
                                     <height>20</height>
@@ -574,7 +574,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>71</width>
                                     <height>20</height>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 54127a9a3..c0d3d70ef 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -33,7 +33,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index 9e4123b3f..d56668027 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqwhatsthis.h>
@@ -51,11 +51,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 );
     TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this );
-    gb->layout()->setSpacing(KDialog::spacingHint());
-    gb->layout()->setMargin(KDialog::marginHint());
+    gb->tqlayout()->setSpacing(KDialog::spacingHint());
+    gb->tqlayout()->setMargin(KDialog::marginHint());
     toplevel->addWidget( gb);
     TQString wtstr;
-    TQGridLayout* grid = new TQGridLayout( gb->layout(), 8, 3 );
+    TQGridLayout* grid = new TQGridLayout( gb->tqlayout(), 8, 3 );
 
     const int labelAlign = AlignRight | AlignVCenter;
     int row = -1;
@@ -63,7 +63,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 {                                          \
     ++row;                                 \
     TQLabel* l = new TQLabel( title, gb );   \
-    l->setAlignment( labelAlign );         \
+    l->tqsetAlignment( labelAlign );         \
     grid->addWidget( l, row, 0 );          \
     btn = new KColorButton( gb );          \
     l->setBuddy( btn );                    \
@@ -140,7 +140,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
 
     /*TQLabel* edgeLA = new TQLabel( i18n( "Edge color (pies only)" ), this );
-      edgeLA->setAlignment( AlignRight | AlignVCenter );
+      edgeLA->tqsetAlignment( AlignRight | AlignVCenter );
       grid->addWidget( edgeLA, 6, 0 );
       _edgeCB = new KColorButton( this );
       grid->addWidget( _edgeCB, 6, 1 );*/
@@ -149,11 +149,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 // 	TQString labeltext;
 // 	labeltext.sprintf( i18n( "Data color #%d:"), i );
 // 	TQLabel* dataLA = new TQLabel( labeltext, this );
-// 	dataLA->setAlignment(AlignRight | AlignVCenter);
-// 	dataLA->resize( dataLA->sizeHint() );
+// 	dataLA->tqsetAlignment(AlignRight | AlignVCenter);
+// 	dataLA->resize( dataLA->tqsizeHint() );
 // 	grid->addWidget( dataLA, i, 2 );
 // 	_dataCB[i] = new KColorButton( this );
-// 	_dataCB[i]->resize( _dataCB[i]->sizeHint() );
+// 	_dataCB[i]->resize( _dataCB[i]->tqsizeHint() );
 // 	grid->addWidget( _dataCB[i], i, 3 );
 // 	grid->addRowSpacing(i,_textCB->height());
 // 	grid->setRowStretch(i,0);
@@ -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").arg(i+1) :m_params->legendText( i ) );
+            _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").tqarg(i+1) :m_params->legendText( i ) );
             extColor[i] =m_params->dataColor(i);
         }
     }
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 1e1dd8711..724535841 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
@@ -40,11 +40,11 @@ KChartComboPage::KChartComboPage( KChartParams* params,
 {
     //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
-    //toplevel->addLayout( layout );
+    TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
+    //toplevel->addLayout( tqlayout );
     TQButtonGroup* gb = new TQButtonGroup( i18n("HLC Style"), this );
     TQGridLayout *grid1 = new TQGridLayout(gb,7,1,KDialog::marginHint(), KDialog::spacingHint());
-    layout->addWidget(gb,0,0);
+    tqlayout->addWidget(gb,0,0);
 
     diamond=new TQRadioButton( i18n("Diamond"), gb ); ;
     grid1->addWidget(diamond,0,0);
@@ -54,7 +54,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
     grid1->addWidget(connecting,2,0);
     icap=new TQRadioButton( i18n("Icap"), gb );
     grid1->addWidget(icap,3,0);
-    gb->setAlignment(TQt::AlignLeft);
+    gb->tqsetAlignment(TQt::AlignLeft);
     grid1->addColSpacing(0,diamond->width());
     grid1->addColSpacing(0,closeconnected->width());
     grid1->addColSpacing(0,connecting->width());
@@ -63,7 +63,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
     grid1->activate();
     //it's not good but I don't know how
     //to reduce space
-    layout->addColSpacing(1,300);
+    tqlayout->addColSpacing(1,300);
 }
 
 void KChartComboPage::init()
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index 84b6e8725..3766903c3 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -82,10 +82,10 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
     TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this );
 
     m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb );
-    m_rowMajor->resize( m_rowMajor->sizeHint() );
+    m_rowMajor->resize( m_rowMajor->tqsizeHint() );
 
     m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb );
-    m_colMajor->resize( m_colMajor->sizeHint() );
+    m_colMajor->resize( m_colMajor->tqsizeHint() );
 
     grid1->addWidget(gb, 2, 0);
 
@@ -93,7 +93,7 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
     TQWhatsThis::add(m_rowMajor, i18n("By default one row is considered to be a data set and each column holds the individual values of the data series. This sets the data in rows on your chart."));
 
     TQWhatsThis::add(m_colMajor, i18n("Here you can choose to have each column hold one data set. Note that the values are not really swapped but only their interpretation."));
-    m_colMajor->resize( m_colMajor->sizeHint() );
+    m_colMajor->resize( m_colMajor->tqsizeHint() );
     grid1->addWidget(gb, 1, 0);
     grid1->setColStretch(3, 0);
 
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index b89f5256d..db1ce1f31 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -1,7 +1,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
@@ -183,16 +183,16 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
   
     // Create the Rows setting
     m_rowsLA = new TQLabel( i18n("# Rows:" ), page );
-    m_rowsLA->resize( m_rowsLA->sizeHint() );
+    m_rowsLA->resize( m_rowsLA->tqsizeHint() );
     m_rowsSB = new kchartDataSpinBox( page );
-    m_rowsSB->resize( m_rowsSB->sizeHint() );
+    m_rowsSB->resize( m_rowsSB->tqsizeHint() );
     m_rowsSB->setMinValue(1);
 
     // Create the columns setting
     m_colsLA = new TQLabel( i18n("# Columns:" ), page );
-    m_colsLA->resize( m_colsLA->sizeHint() );
+    m_colsLA->resize( m_colsLA->tqsizeHint() );
     m_colsSB = new kchartDataSpinBox( page );
-    m_colsSB->resize( m_colsSB->sizeHint() );
+    m_colsSB->resize( m_colsSB->tqsizeHint() );
     m_colsSB->setMinValue(1);
     
 #if 0
@@ -240,7 +240,7 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     connect( m_removeColButton, TQT_SIGNAL( clicked() ),
 	     this,              TQT_SLOT( removeCurrentColumn() ) );
 
-    // Start the layout.  The buttons are at the top.
+    // Start the tqlayout.  The buttons are at the top.
     TQVBoxLayout  *topLayout = new TQVBoxLayout( page );
     
     TQHBoxLayout* insertRemoveLayout = new TQHBoxLayout( );
@@ -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").arg(t.toDouble()));
+				     TQString("%1").tqarg(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 bbda1f68e..eef71cb65 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -27,7 +27,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -55,7 +55,7 @@ public:
 
     void setFont( const TQFont& font )  {
         _font = font;
-        listBox()->repaint();
+        listBox()->tqrepaint();
     }
     TQFont font() const {
         return _font;
@@ -90,14 +90,14 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params,
 
     // The listbox
     m_list = new TQListBox(this);
-    m_list->resize( m_list->sizeHint() );
+    m_list->resize( m_list->tqsizeHint() );
     grid->addWidget(m_list, 0, 0); // Row 0-0, col 0-1
 
     // The font button.
     m_fontButton = new TQPushButton( this);
     m_fontButton->setText(i18n("Font..."));
     TQWhatsThis::add(m_fontButton, i18n("Select an item in the list above and click on this button to display the KDE font dialog in order to choose a new font for this item."));
-    m_fontButton->resize( m_fontButton->sizeHint() );
+    m_fontButton->resize( m_fontButton->tqsizeHint() );
     grid->addWidget( m_fontButton, 1, 0);
 
 #if 0
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index 89ef02f43..c097c381b 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    TQGridLayout* layout = new TQGridLayout( this, 4, 3 );
-    layout->setSpacing( KDialog::spacingHint() );
-    layout->setMargin( KDialog::marginHint() );
+    TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 );
+    tqlayout->setSpacing( KDialog::spacingHint() );
+    tqlayout->setMargin( KDialog::marginHint() );
 
     TQLabel *lab=new TQLabel(i18n("Title:"), this);
     TQWhatsThis::add(lab, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    layout->addWidget(lab,0,0);
+    tqlayout->addWidget(lab,0,0);
 
     titleEdit=new TQLineEdit(this);
     TQWhatsThis::add(titleEdit, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    layout->addWidget(titleEdit,0,1);
+    tqlayout->addWidget(titleEdit,0,1);
 
     titleColorButton=new KColorButton(this);
     TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font."));
-    layout->addWidget(titleColorButton,0,2);
+    tqlayout->addWidget(titleColorButton,0,2);
 
     titleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title."));
-    layout->addWidget(titleFontButton,0,3);
+    tqlayout->addWidget(titleFontButton,0,3);
     connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont()));
 
     lab=new TQLabel(i18n("Subtitle:"),this);
     TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    layout->addWidget(lab,1,0);
+    tqlayout->addWidget(lab,1,0);
 
     subtitleEdit=new TQLineEdit(this);
     TQWhatsThis::add(subtitleEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    layout->addWidget(subtitleEdit,1,1);
+    tqlayout->addWidget(subtitleEdit,1,1);
 
     subtitleColorButton=new KColorButton(this);
     TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font."));
-    layout->addWidget(subtitleColorButton,1,2);
+    tqlayout->addWidget(subtitleColorButton,1,2);
 
     subtitleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle."));
-    layout->addWidget(subtitleFontButton,1,3);
+    tqlayout->addWidget(subtitleFontButton,1,3);
     connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont()));
 
     lab=new TQLabel(i18n("Footer:"),this);
     TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart."));
-    layout->addWidget(lab,2,0);
+    tqlayout->addWidget(lab,2,0);
 
     footerEdit=new TQLineEdit(this);
     TQWhatsThis::add(footerEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    layout->addWidget(footerEdit,2,1);
+    tqlayout->addWidget(footerEdit,2,1);
 
     footerColorButton=new KColorButton(this);
     TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font."));
-    layout->addWidget(footerColorButton,2,2);
+    tqlayout->addWidget(footerColorButton,2,2);
 
     footerFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer."));
     connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont()));
-    layout->addWidget(footerFontButton,2,3);
+    tqlayout->addWidget(footerFontButton,2,3);
 
-    layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
+    tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
 
-    layout->activate();
+    tqlayout->activate();
 }
 
 void KChartHeaderFooterConfigPage::init()
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 2c027138b..39d99963b 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -49,15 +49,15 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
     TQWidget( parent ),_params( params )
 {
   //Layout for 4 blocks
-  TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   //1. Block: General settings
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 0, 0 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 0, 0 );
 
-  TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 );
+  TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 4, 2 );
 
   TQLabel* lab = new TQLabel( i18n("Title:"), gb );
   TQWhatsThis::add(lab, i18n("Write here the title of the legend, which is displayed at the top of the legend box."));
@@ -70,11 +70,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this );
   TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by "
       "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>"));
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
   gb->setExclusive( true );
 
-  TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 );
+  TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 5, 5 );
 
   lTopLeft          = addButton( grid1, gb, i18n("Top-Left"),      "chart_legend_topleft",     0, 0 );
   lTopLeftTop       = addButton( grid1, gb, i18n("Top-Left-Top"),  "chart_legend_toplefttop",  0, 1 );
@@ -98,17 +98,17 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   lBottomRightBottom= addButton( grid1, gb, i18n("Bottom-Right-Bottom"), "chart_legend_bottomrightbottom",4, 3 );
   lBottomRight      = addButton( grid1, gb, i18n("Bottom-Right"),        "chart_legend_bottomright",      4, 4 );
 
-  gb->setAlignment( TQt::AlignLeft );
-  layout->addMultiCellWidget( gb, 1,2, 0,0 );
+  gb->tqsetAlignment( TQt::AlignLeft );
+  tqlayout->addMultiCellWidget( gb, 1,2, 0,0 );
 
   // 3. Block: Font
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this );
   TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries."));
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 0, 1 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 0, 1 );
 
-  TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 );
+  TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 4, 2 );
   titleLegendFontButton = new TQPushButton( gb );
 
   lab = new TQLabel( i18n("Legend title font:"), gb );
@@ -134,9 +134,9 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   orientationGroup = new TQVButtonGroup( i18n("Orientation"), this );
   TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other."));
   orientationGroup->setRadioButtonExclusive(true);
-  orientationGroup->layout()->setSpacing(KDialog::spacingHint());
-  orientationGroup->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( orientationGroup, 1, 1 );
+  orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  orientationGroup->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( orientationGroup, 1, 1 );
 
   TQRadioButton* orientation = new TQRadioButton( i18n("Vertically"), orientationGroup );
   orientation = new TQRadioButton( i18n("Horizontally"), orientationGroup );
@@ -145,11 +145,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   // 5. Block: Text Colors
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this );
   TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text."));
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
-  layout->addWidget( gb, 2, 1 );
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
+  tqlayout->addWidget( gb, 2, 1 );
 
-  TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 );
+  TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 6, 2 );
 
   lab = new TQLabel( i18n("Legend title color:"), gb );
   grid3->addWidget( lab, 0, 0 );
@@ -177,7 +177,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  layout->addColSpacing( 1, 300 );
+  tqlayout->addColSpacing( 1, 300 );
 }
 
 void KChartLegendConfigPage::init()
@@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply()
         _params->setLegendFontRelSize(textLegend.pointSize());
 }
 
-TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
+TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
                                                 TQButtonGroup* gb,
                                                 const TQString &toolTipText,
                                                 const TQString &icon,
@@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
                               KIcon::DefaultState,
                               KChartFactory::global() ) );
   TQToolTip::add( button, toolTipText );
-  layout->addWidget( button, posY, posX );
+  tqlayout->addWidget( button, posY, posX );
   return button;
 }
 
diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h
index efab8b318..8419baa81 100644
--- a/kchart/kchartLegendConfigPage.h
+++ b/kchart/kchartLegendConfigPage.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 class TQVButtonGroup;
 class TQRadioButton;
@@ -64,7 +64,7 @@ private:
     TQPushButton *titleLegendFontButton, *textLegendFontButton;
     TQButton::ToggleState titleLegendIsRelative, textLegendIsRelative;
 
-    TQPushButton* addButton( TQGridLayout* layout, TQButtonGroup* gb,
+    TQPushButton* addButton( TQGridLayout* tqlayout, TQButtonGroup* gb,
                             const TQString &toolTipText, const TQString &icon,
                             int posY, int posX );
 };
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index b3a3eaf53..adf56a3d3 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
@@ -67,7 +67,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
 
   tmpLabel = new TQLabel( i18n( "Rotation around the X-axis in degrees:" ), 
 			 this );
-  tmpLabel->resize( tmpLabel->sizeHint() );
+  tmpLabel->resize( tmpLabel->tqsizeHint() );
   grid1->addWidget(tmpLabel,4,0);
 
   angle3dX=new KIntNumInput(0, this, 10);
@@ -75,7 +75,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
   angle3dX->setRange(0, 90, 1);
 
   tmpLabel = new TQLabel( i18n( "Rotation around the Y-axis in degrees:" ), this );
-  tmpLabel->resize( tmpLabel->sizeHint() );
+  tmpLabel->resize( tmpLabel->tqsizeHint() );
   grid1->addWidget(tmpLabel,5,0);
 
   angle3dY=new KIntNumInput(0, this, 10);
@@ -84,11 +84,11 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
 
 
   tmpLabel = new TQLabel( i18n( "Depth:" ), this );
-  tmpLabel->resize( tmpLabel->sizeHint() );
+  tmpLabel->resize( tmpLabel->tqsizeHint() );
   grid1->addWidget(tmpLabel,6,0);
 
   depth=new KDoubleNumInput(0, this);
-  depth->resize(100,depth->sizeHint().height());
+  depth->resize(100,depth->tqsizeHint().height());
   grid1->addWidget(depth,6,1);
   depth->setRange(0,40, 0.1);
 #endif
@@ -101,7 +101,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
   grid1->activate();
   //it's not good but I don't know how
   //to reduce space
-  //layout->addColSpacing(1,300);
+  //tqlayout->addColSpacing(1,300);
 }
 
 void KChartLine3dConfigPage::slotChange3DParameter(bool b)
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index 6bb5b9fcf..8fd9c9d02 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -22,7 +22,7 @@
 #include "kchart_params.h"
 #include <knumvalidator.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
@@ -43,10 +43,10 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con
     setMainWidget(page);
 
     // FIXME: The following code is strange, since it is written to
-    // use a grid layout with a standard TQWidget.  However, with the
+    // use a grid tqlayout with a standard TQWidget.  However, with the
     // TQGroupBox, it looks better, and since it actually works, there
     // is no immediate need for rewriting.  In the sake of clarity, it
-    // should be done though, and we should use the layout
+    // should be done though, and we should use the tqlayout
     // capabilities of the groupbox instead..
 
     setButtonText( KDialogBase::User1, i18n("&Reset") );
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index 39005e29d..760c97861 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
@@ -38,17 +38,17 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
                                                           TQWidget* parent ) :
     TQWidget( parent ),m_params( params )
 {
-  TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
+  TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
 
 
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, 
 				       i18n("3D Parameters"), this );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
 
-  // The grid layout inside the buttongroup.
-  TQGridLayout *grid1 = new TQGridLayout(gb->layout(), 5, 3);
-  layout->addWidget(gb,0,0);
+  // The grid tqlayout inside the buttongroup.
+  TQGridLayout *grid1 = new TQGridLayout(gb->tqlayout(), 5, 3);
+  tqlayout->addWidget(gb,0,0);
 
   // The main on/off checkbox.
   bar3d=new TQCheckBox(i18n("3D bar"),gb);
@@ -64,7 +64,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
   grid1->addWidget(drawShadowColor,1,0);
 
   TQLabel *tmpLabel = new TQLabel( i18n( "Angle:" ), gb );
-  tmpLabel->resize( tmpLabel->sizeHint() );
+  tmpLabel->resize( tmpLabel->tqsizeHint() );
   grid1->addWidget(tmpLabel,2,0);
 
   angle3d=new KIntNumInput(0, gb, 10);
@@ -73,16 +73,16 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
   angle3d->setRange(0, 90, 1);
 
   tmpLabel = new TQLabel( i18n( "Depth:" ), gb );
-  tmpLabel->resize( tmpLabel->sizeHint() );
+  tmpLabel->resize( tmpLabel->tqsizeHint() );
   grid1->addWidget(tmpLabel,3,0);
 
   depth=new KDoubleNumInput(0, gb);
   TQWhatsThis::add(depth, i18n("You can set here the depth of the 3D effect from 0 to 2. 0 will give you no depth at all.\nDefault is 1."));
-  depth->resize(100,depth->sizeHint().height());
+  depth->resize(100,depth->tqsizeHint().height());
   grid1->addWidget(depth,3,1);
   depth->setRange(0, 2.0, 0.1);
   
-  gb->setAlignment(TQt::AlignLeft);
+  gb->tqsetAlignment(TQt::AlignLeft);
   grid1->addColSpacing(0,depth->width());
   grid1->addColSpacing(0,angle3d->width());
   grid1->setColStretch(2,1);
@@ -90,7 +90,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  //layout->addColSpacing(1,300);
+  //tqlayout->addColSpacing(1,300);
 }
 
 
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index cd9e0f038..bffa30997 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
@@ -44,17 +44,17 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    // toplevel layout
+    // toplevel tqlayout
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* layout = new TQGridLayout( 1, 3 );
-    toplevel->addLayout( layout );
+    TQGridLayout* tqlayout = new TQGridLayout( 1, 3 );
+    toplevel->addLayout( tqlayout );
 
     // The "Parameters" button group
     TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this );
-    gb1->layout()->setSpacing(KDialog::spacingHint());
-    gb1->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1);
+    gb1->tqlayout()->setSpacing(KDialog::spacingHint());
+    gb1->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid1 = new TQGridLayout(gb1->tqlayout(),9,1);
 
     grid = new TQCheckBox( i18n( "Grid" ), gb1 );
     TQWhatsThis::add(grid, i18n("If this is checked, the grid is shown. If you uncheck this option, the grid will not be displayed anymore."));
@@ -93,9 +93,9 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     // The "Settings" button group
     TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, 
 					  i18n("Settings"), this );
-    gb2->layout()->setSpacing(KDialog::spacingHint());
-    gb2->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid2 = new TQGridLayout(gb2->layout(),8,1);
+    gb2->tqlayout()->setSpacing(KDialog::spacingHint());
+    gb2->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid2 = new TQGridLayout(gb2->tqlayout(),8,1);
 
     TQBoxLayout * l = new TQVBoxLayout( grid2 );
 
@@ -160,8 +160,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     ylabel2_fmt->setMaximumWidth(130);
     grid2->addWidget(ylabel2_fmt,5,1);
 #endif
-    layout->addWidget(gb1,0,0);
-    layout->addWidget(gb2,0,1);
+    tqlayout->addWidget(gb1,0,0);
+    tqlayout->addWidget(gb2,0,1);
 
 #if 0
     grid1->activate();
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index 0921ccedd..632e46d14 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 63d5e5ee9..807cd54e5 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index 5bfd36c07..9a71b9b1f 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <kfontdialog.h>
 
@@ -50,35 +50,35 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params,
 					KDialog::spacingHint());
     // The listview
     list = new TQListView( this );
-    list->resize( list->sizeHint() );
+    list->resize( list->tqsizeHint() );
     grid->addMultiCellWidget(list,0,9,0,0);
     list->addColumn( i18n("Hide Piece") );
     list->setRootIsDecorated( TRUE );
 
     TQLabel* label = new TQLabel( i18n( "Column active:" ), this );
-    label->resize( label->sizeHint() );
+    label->resize( label->tqsizeHint() );
     grid->addWidget( label,0,1);
 
     column = new TQSpinBox(1, data->cols(), 1, this);
-    column->resize(100, column->sizeHint().height() );
+    column->resize(100, column->tqsizeHint().height() );
     grid->addWidget( column,1,1);
 
     column->setValue(col+1);
 
     label = new TQLabel( i18n( "Move piece to:" ), this );
-    label->resize( label->sizeHint() );
+    label->resize( label->tqsizeHint() );
     grid->addWidget( label,2,1);
 
     dist = new TQSpinBox(0, 400, 1, this);
-    dist->resize(100, dist->sizeHint().height() );
+    dist->resize(100, dist->tqsizeHint().height() );
     grid->addWidget( dist,3,1);
 
     label = new TQLabel( i18n( "Explode factor (%):" ), this );
-    label->resize( label->sizeHint() );
+    label->resize( label->tqsizeHint() );
     grid->addWidget( label,4,1);
 
     explose = new TQSpinBox(0, 100, 1, this);
-    explose->resize(100, explose->sizeHint().height() );
+    explose->resize(100, explose->tqsizeHint().height() );
     grid->addWidget( explose,5,1);
 
     grid->addColSpacing(0,list->width());
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index 1d69a0af6..9bd898d6c 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -21,7 +21,7 @@
 */
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -37,9 +37,9 @@ namespace KChart
   : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KChart Options" ) );
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
-  layout->setMargin( KDialog::marginHint() );
-  layout->setSpacing( KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  tqlayout->setMargin( KDialog::marginHint() );
+  tqlayout->setSpacing( KDialog::spacingHint() );
   txtSizex = new KIntNumInput(this );
   txtSizex->setSuffix("%");
   txtSizex->setMinValue(1);
@@ -51,12 +51,12 @@ namespace KChart
   txtSizey->setMaxValue(100);
   txtSizey->setValue(100);
   
-  layout->addWidget( new TQLabel(i18n("Print Size"), this) );
-  layout->addWidget( new TQLabel(i18n("Width: "), this) );
-  layout->addWidget( txtSizex );
-  layout->addWidget( new TQLabel(i18n("Height: "), this) );
-  layout->addWidget( txtSizey );
-  layout->addStretch( 1 );
+  tqlayout->addWidget( new TQLabel(i18n("Print Size"), this) );
+  tqlayout->addWidget( new TQLabel(i18n("Width: "), this) );
+  tqlayout->addWidget( txtSizex );
+  tqlayout->addWidget( new TQLabel(i18n("Height: "), this) );
+  tqlayout->addWidget( txtSizey );
+  tqlayout->addStretch( 1 );
 }
 
 void KChartPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index 01afbd1b3..13585d7a6 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -31,7 +31,7 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqhgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 
@@ -56,7 +56,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -64,7 +64,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->setAlignment( AlignCenter | AlignVCenter );
+    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -135,7 +135,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -143,7 +143,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->setAlignment( AlignCenter | AlignVCenter );
+    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -219,14 +219,14 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::BarPercent );
 
-    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
     //TQHBox   *hbox = new TQHBox( this );
     new TQLabel( i18n( "Number of lines: "), left );
     m_numLines    = new TQSpinBox( left );
-    // FIXME: Use a grid layout instead
+    // FIXME: Use a grid tqlayout instead
     new TQLabel( "", left);
     left->setStretchFactor( left, 1 );
 
@@ -234,7 +234,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->setAlignment( AlignCenter | AlignVCenter );
+    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
 }
 
 void KChartBarSubTypeChartPage::init()
@@ -309,7 +309,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -317,7 +317,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->setAlignment( AlignCenter | AlignVCenter );
+    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -388,7 +388,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -396,7 +396,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->setAlignment( AlignCenter | AlignVCenter );
+    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index 4389ce07e..396264d8f 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -8,7 +8,7 @@
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kfontdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqcolor.h>
 
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index deeca478f..74804042e 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -10,7 +10,7 @@
 #include <tqlabel.h>
 #include <tqptrcollection.h>
 #include <tqobjectlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 
 #include <kdebug.h>
@@ -44,7 +44,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, 
 					  i18n( "Chart Sub Type" ), this );
     grp->setRadioButtonExclusive( true );
-    grp->layout();
+    grp->tqlayout();
     lay1->addWidget(grp);
     m_normal  = new TQRadioButton( i18n( "Normal" ),  grp );
     m_stacked = new TQRadioButton( i18n( "Stacked" ), grp );
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index dc4cbf8af..9928c2dbf 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -28,8 +28,8 @@ KChartButton::KChartButton(TQWidget *parent, const TQString & _text, const TQPix
 
   // The text
   TQLabel *label = new TQLabel(_text, this);
-  label->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-  setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
+  label->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+  tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
 }
 
 KChartButton::~KChartButton()
diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h
index bc39b505b..2fb8d6120 100644
--- a/kchart/kchartWizardSelectChartTypePage.h
+++ b/kchart/kchartWizardSelectChartTypePage.h
@@ -1,7 +1,7 @@
 #ifndef _kchartWIZARDSELECTCHARTTYPEPAGE_H
 #define _kchartWIZARDSELECTCHARTTYPEPAGE_H
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc
index 588d16353..386062595 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cc
@@ -5,7 +5,7 @@
 
 #include <tqhbox.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -51,10 +51,10 @@ KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* pa
     TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this );
 
     m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb );
-    m_rowMajor->resize( m_rowMajor->sizeHint() );
+    m_rowMajor->resize( m_rowMajor->tqsizeHint() );
 
     m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb );
-    m_colMajor->resize( m_colMajor->sizeHint() );
+    m_colMajor->resize( m_colMajor->tqsizeHint() );
 
     grid1->addWidget(gb, 3, 0);
 
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index b3734e136..76be1f0de 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -7,7 +7,7 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kfontdialog.h>
 #include <knumvalidator.h>
diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cc
index 1d057d4ca..b2ba26ac5 100644
--- a/kchart/kchartWizardSetupDataPage.cc
+++ b/kchart/kchartWizardSetupDataPage.cc
@@ -22,7 +22,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQGroupBox = new TQButtonGroup( this, "GroupBox_1" );
   tmpTQGroupBox->setGeometry( 260, 10, 130, 80 );
   tmpTQGroupBox->setFrameStyle( 49 );
-  tmpTQGroupBox->setAlignment( 1 );
+  tmpTQGroupBox->tqsetAlignment( 1 );
 
   datarow = new TQRadioButton( this, "RadioButton_1" );
   datarow->setGeometry( 270, 40, 100, 20 );
@@ -57,7 +57,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQLabel = new TQLabel( this, "Label_4" );
   tmpTQLabel->setGeometry( 280, 110, 100, 30 );
   tmpTQLabel->setText( i18n("Use first row as description") );
-  tmpTQLabel->setAlignment( 1313 );
+  tmpTQLabel->tqsetAlignment( 1313 );
 
   rowdescript = new TQCheckBox( this, "CheckBox_4" );
   rowdescript->setGeometry( 260, 150, 20, 30 );
@@ -69,7 +69,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQLabel = new TQLabel( this, "Label_5" );
   tmpTQLabel->setGeometry( 280, 150, 100, 30 );
   tmpTQLabel->setText( i18n("Use first column as description") );
-  tmpTQLabel->setAlignment( 1313 );
+  tmpTQLabel->tqsetAlignment( 1313 );
 
   TQFrame* tmpTQFrame;
   tmpTQFrame = new TQFrame( this, "Frame_1" );
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc
index 55a158d75..ddf3d1b46 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" ).arg( chartClass );
+        errorMessage = i18n( "Unknown chart type %1" ).tqarg( 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.
 
-    // children:
+    // tqchildren:
     // chart:
     // chart:
     // chart:
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index 358f5ab75..f0fda2f07 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -30,7 +30,7 @@ using std::cerr;
 #include <kdebug.h>
 
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqbuffer.h>
 #include <tqpainter.h>
 
@@ -225,12 +225,12 @@ void KChartPart::generateBarChartTemplate()
 
 		// Fill column label, but only on the first iteration.
 		if (row == 0) {
-		    m_colLabels << i18n("Column %1").arg(col + 1);
+		    m_colLabels << i18n("Column %1").tqarg(col + 1);
 		}
             }
 
 	    // Fill row label.
-	    m_rowLabels << i18n("Row %1").arg(row + 1);
+	    m_rowLabels << i18n("Row %1").tqarg(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." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
 
         return false;
     }
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index b009e1ca5..5b1cc6b2c 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.")
-			    .arg(filename) );
+			    .tqarg(filename) );
 	inFile.close();
 	return;
     }
diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp
index 4d8fd0c81..415f013a7 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 geometry.");
+            qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry.");
             bOk = false;
         }
     }else{
@@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter )
 
 void KDChart::initProject( TQSProject* project )
 {
-    project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() );
+    project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() );
     privateInitInterpreter( project->interpreter() );
 }
 
@@ -431,20 +431,20 @@ TQString KDChart::globals()
 
     for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) {
         // This is written this way to be efficient
-        globals += TQString::fromLatin1( "const " );
+        globals += TQString::tqfromLatin1( "const " );
         globals += it.key();
         globals += " = ";
         globals += TQString::number( it.data() );
         globals += ";\n";
     }
 
-    globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
-               .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" )
-               .arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
-    globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
-               .arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
+    globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
+               .tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
+    globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
+    globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
+               .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
+    globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
+               .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
 
 
     TQMap<char*,TQColor> colorMap;
@@ -469,14 +469,14 @@ TQString KDChart::globals()
     colorMap.insert( "TQt.darkYellow", TQt::darkYellow );
     for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) {
         // This is written this way to be efficient
-        globals += TQString::fromLatin1( it2.key() );
-        globals += TQString::fromLatin1( " = new Color( " );
+        globals += TQString::tqfromLatin1( it2.key() );
+        globals += TQString::tqfromLatin1( " = new Color( " );
         globals += TQString::number( it2.data().red() );
         globals += ',';
         globals += TQString::number( it2.data().green() );
         globals += ',';
         globals += TQString::number( it2.data().blue() );
-        globals += TQString::fromLatin1( " );\n" );
+        globals += TQString::tqfromLatin1( " );\n" );
     }
     //qDebug( "%s",globals.latin1() );
     return globals;
diff --git a/kchart/kdchart/KDChartAreaPainter.cpp b/kchart/kdchart/KDChartAreaPainter.cpp
index 2fca8d621..6c47aeed5 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp
index ee9dc8791..6124abe88 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 geometry yet
+    // We cannot setup the tqgeometry yet
     // since we do not know the size of the painter.
 }
 
@@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
                                 anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) );
 
                                 // allow for shearing and/or scaling of the painter
-                                anchor = painter->worldMatrix().map( anchor );
+                                anchor = painter->tqworldMatrix().map( anchor );
 
                                 TQString text;
                                 if( cv.isDateTime ){
@@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
 				  KDDrawText::drawRotatedText(
 						painter,
 						nRotation,
-						painter->worldMatrix().map(
+						painter->tqworldMatrix().map(
                                                 TQPoint( static_cast<int>( cv.pTextsX ),
                                                         static_cast<int>( cv.pTextsY ) ) ),
                                                 label,
@@ -2823,7 +2823,7 @@ void KDChartAxesPainter::calculateLabelTexts(
                     const double secHour  = 60.0 * secMin;
                     const double secDay   = 24.0 * secHour;
                     //
-                    // we temporarily disable week alignment until bug
+                    // we temporarily disable week tqalignment 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").arg(sVal));
+    //qDebug( TQString("                     %1").tqarg(sVal));
     if ( bUseAutoDigits ) {
         int comma = sVal.find( '.' );
         if ( -1 < comma ) {
@@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
             }
         }
     }
-    //qDebug( TQString("                       -  %1").arg(trueBehindComma));
+    //qDebug( TQString("                       -  %1").tqarg(trueBehindComma));
     return sVal;
 }
 
@@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter,
     //ourClipRect.setLeft( ourClipRect.left() + 1 );
     //ourClipRect.setRight( ourClipRect.right() - 1 );
 
-    const TQWMatrix & world = painter->worldMatrix();
+    const TQWMatrix & world = painter->tqworldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
     world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp
index b24892b14..a6e337f2f 100644
--- a/kchart/kdchart/KDChartAxisParams.cpp
+++ b/kchart/kdchart/KDChartAxisParams.cpp
@@ -297,7 +297,7 @@ become wider or more narrow.
 Also the graphical representation of the date will be comparable
 since all your charts will use the same scale if you wish this.
 
-- Let the program calculate the chart layout based upon the kind
+- Let the program calculate the chart tqlayout based upon the kind
 of and width of the labels to be drawn at the axes.
 Also the program can calculate the labels for you and find the
 boundary values for start and end of the scale automatically.
diff --git a/kchart/kdchart/KDChartAxisParams.h b/kchart/kdchart/KDChartAxisParams.h
index c2f9be9c5..b58197090 100644
--- a/kchart/kdchart/KDChartAxisParams.h
+++ b/kchart/kdchart/KDChartAxisParams.h
@@ -33,7 +33,7 @@
 #include <tqcolor.h>
 #include <tqmap.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
 #include <tqvariant.h>
diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp
index 7fed7520d..9f6e5fb51 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry 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 shape for each series.
+    // Loop over the datasets, draw one box and whisker tqshape for each series.
     for ( uint dataset  = chartDatasetStart;
             dataset <= chartDatasetEnd;
             ++dataset ) {
diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp
index 8bfe1a760..f8ae89d20 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry 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 geometry values that apply to bar charts only
+    // Set some tqgeometry values that apply to bar charts only
     double totalNumberOfBars = 0.0;
     double spaceBetweenDatasets = 0.0;
     switch ( params()->barChartSubType() ) {
diff --git a/kchart/kdchart/KDChartCustomBox.cpp b/kchart/kdchart/KDChartCustomBox.cpp
index 7066e8896..9b4d78551 100644
--- a/kchart/kdchart/KDChartCustomBox.cpp
+++ b/kchart/kdchart/KDChartCustomBox.cpp
@@ -28,7 +28,7 @@
  **********************************************************************/
 #include <tqpainter.h>
 #include <tqregion.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpoint.h>
 #include <tqsimplerichtext.h>
 #include <tqpaintdevicemetrics.h>
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index 2e1edf1af..223920e43 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -30,7 +30,7 @@
 #define __KDCHARTCUSTOMBOX_H__
 
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfont.h>
 #include <tqdom.h>
 #include "KDChartGlobal.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
-      alignment settings: e.g. right means there will be a gap between the right side of
+      tqalignment 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 alignment will cause KDChart to ignore the respective delta
+      center delta tqalignment 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
-      alignment settings: e.g. TQt::AlignRight means the box will be moved to the left
+      tqalignment 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 alignment will cause KDChart to ignore the respective delta
+      center delta tqalignment 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
-      alignment settings: e.g. right means there will be a gap between the right side of
+      tqalignment 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 alignment will cause KDChart to ignore the respective delta
+      center delta tqalignment 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/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h
index fe8cfc8fb..a1d6562b3 100644
--- a/kchart/kdchart/KDChartDataIntern.h
+++ b/kchart/kdchart/KDChartDataIntern.h
@@ -231,7 +231,7 @@ public:
                 }
             }
             // Note: We do *not* compare the _propSetID here since it contains
-            //       no values but is used to handle some layout information...
+            //       no values but is used to handle some tqlayout information...
         }
         return bRet;
     }
@@ -289,7 +289,7 @@ public:
                 /* NOOP */;
             }
             // Note: We do *not* copy the _propSetID here since it contains
-            //       no values but is used to handle some layout information...
+            //       no values but is used to handle some tqlayout information...
         }
     }
 
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index 71373d561..82956e8cd 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartEnums :public TQObject
 
 public:
     /**
-      Text layout policy: what to do if text that is to be drawn would
+      Text tqlayout policy: what to do if text that is to be drawn would
       cover neighboring text or neighboring areas.
 
-      \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless.
+      \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless.
       \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space.
       \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor.
       \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor.
@@ -71,11 +71,11 @@ public:
         LayoutPolicyShrinkFontSize };
 
     /**
-      Converts the specified text layout policy enum to a
+      Converts the specified text tqlayout policy enum to a
       string representation.
 
-      \param type the text layout policy to convert
-      \return the string representation of the text layout policy enum
+      \param type the text tqlayout policy to convert
+      \return the string representation of the text tqlayout policy enum
       */
     static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
@@ -90,7 +90,7 @@ public:
             case LayoutPolicyShrinkFontSize:
                 return "ShrinkFontSize";
             default: // should not happen
-                qDebug( "Unknown text layout policy" );
+                qDebug( "Unknown text tqlayout policy" );
                 return "JustOverwrite";
         }
     }
@@ -150,10 +150,10 @@ public:
 
 
     /**
-      Converts the specified string to a text layout policy enum value.
+      Converts the specified string to a text tqlayout policy enum value.
 
       \param string the string to convert
-      \return the text layout policy enum value
+      \return the text tqlayout policy enum value
       */
     static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) {
         if( string ==      "JustOverwrite" )
@@ -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 alignment of content to be printed at (or
+      \note The position and tqalignment 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 alignment flags set:
+      share the same PositionFlag but have different tqalignment flags set:
 
-      \image html "../refman_images/alignment.png"
-      \image latex "../refman_images/alignment.png" "positioning and aligning" width=4in
+      \image html "../refman_images/tqalignment.png"
+      \image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in
 
       \sa KDChartParams::setPrintDataValues
     */
diff --git a/kchart/kdchart/KDChartHiLoPainter.cpp b/kchart/kdchart/KDChartHiLoPainter.cpp
index d8f766c27..bb8b2e39e 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp
index 9f0995e81..a7e010924 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp
index a53f84c0e..b1dac73ef 100644
--- a/kchart/kdchart/KDChartObjectFactory.cpp
+++ b/kchart/kdchart/KDChartObjectFactory.cpp
@@ -15,42 +15,42 @@
 // PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool.
 KDChartObjectFactory::KDChartObjectFactory()
 {
-    registerClass( TQString::fromLatin1( "KDChartWidget" ) );
-    registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams );
-    registerClass( TQString::fromLatin1( "KDChartTableData" ) );
-    registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
-    registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
-    registerClass( TQString::fromLatin1( "KDChartTextPiece" ) );
-    registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
-    registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
-    registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame );
-
-    registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() );
-    registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory );
+    registerClass( TQString::tqfromLatin1( "KDChartWidget" ) );
+    registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams );
+    registerClass( TQString::tqfromLatin1( "KDChartTableData" ) );
+    registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
+    registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
+    registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) );
+    registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
+    registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
+    registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame );
+
+    registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() );
+    registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory );
 }
 
 TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ )
 {
-    if ( className == TQString::fromLatin1( "KDChartWidget" ) )
+    if ( className == TQString::tqfromLatin1( "KDChartWidget" ) )
          return createKDChartWidget( args );
 
-    if ( className == TQString::fromLatin1("KDChartParams") )
+    if ( className == TQString::tqfromLatin1("KDChartParams") )
         return new KDChartParams();
 
-    else if ( className == TQString::fromLatin1("KDChartTableData") )
+    else if ( className == TQString::tqfromLatin1("KDChartTableData") )
         return createKDChartTableData( args );
 
-    else if ( className == TQString::fromLatin1("KDChartAxisParams") )
+    else if ( className == TQString::tqfromLatin1("KDChartAxisParams") )
         return new KDChartAxisParams();
 
 
-    else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) )
+    else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) )
         return createKDChartTextPiece( args );
 
-    else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
+    else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
         return createKDChartCustomBox( args );
 
-    else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) )
+    else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) )
         return createKDChartPropertySet( args );
 
     else
@@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a
 
     TQString str;
     if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0;
-    if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
     TQFont font = args[1].variant().toFont();
 
     return new KDChartTextPiece( str, font );
@@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
 
         TQColor color = TQt::black;
         if ( args.count() >= 9 ) {
-            if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+            if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
             color = args[8].variant().toColor();
         }
 
         TQBrush paper = TQt::NoBrush;
         if ( args.count() >= 10 ) {
-            if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+            if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
             paper = args[9].variant().toBrush();
         }
 
@@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
 
     TQColor color = TQt::black;
     if ( args.count() >= 8 ) {
-        if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+        if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
         color = args[7].variant().toColor();
     }
 
     TQBrush paper = TQt::NoBrush;
     if ( args.count() >= 9 ) {
-        if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+        if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
         paper = args[8].variant().toBrush();
     }
 
@@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0;
 
 
-    if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor lineColor = args[4].variant().toColor();
 
     int idLineStyle;
@@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idExtraLinesColor;
     if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor extraLinesColor = args[18].variant().toColor();
 
     int idExtraLinesStyle;
@@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idExtraMarkersSize;
     if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
     TQSize extraMarkersSize = args[24].variant().toSize();
 
     int idExtraMarkersColor;
     if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor extraMarkersColor = args[26].variant().toColor();
 
     int idExtraMarkersStyle;
@@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idBarColor;
     if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor barColor = args[32].variant().toColor();
 
     KDChartPropertySet* set = new KDChartPropertySet;
@@ -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." ).arg( className ) );
+        throwError( TQObject::tr( "Too few arguments when creating %1 object." ).tqarg( className ) );
         return false;
     }
     if ( count > max ) {
-        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).arg( className ) );
+        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).tqarg( 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" ).arg(index).arg(constructing).arg(expected) );
+        throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).tqarg(index).tqarg(constructing).tqarg(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" ).arg(index).arg(constructing) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).tqarg(index).tqarg(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" ).arg(index).arg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).tqarg(index).tqarg( 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" ).arg(index).arg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).tqarg(index).tqarg( 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").arg(index).arg(constructing).arg(variantName) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").tqarg(index).tqarg(constructing).tqarg(variantName) );
         return false;
     }
     else
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index 849d2b297..156d5d823 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 /**
@@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                 }
 
                 if ( rotation ) {
-		  anchor = painter->worldMatrix().map( anchor );
+		  anchor = painter->tqworldMatrix().map( anchor );
 
                     //   Temporary solution for fixing the data labels size
                     // bug when in TQPrinter::HighResolution mode:
@@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                                                         true,
                                                         true,
                                                         5 );
-                    //anchor = painter->worldMatrix().map( anchor );
+                    //anchor = painter->tqworldMatrix().map( anchor );
 
                     if( allowOverlapping ) {
                         drawThisOne = true;
@@ -850,7 +850,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                         /*
 
 NOTE: The following will be REMOVED again once
-the layout policy feature is implemented !!!
+the tqlayout policy feature is implemented !!!
 
 */
                         TQRect textRect( region->pTextRegion->boundingRect() );
@@ -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 alignment is allowed.
+    //    aligned to a 3rd box and so on) but NO CIRCULAR tqalignment 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 alignment flags used here match the rect calculation
+            // Note: The tqalignment 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 alignment with the X axis, we adjust the Y axis - but not for Area Charts:
+    // for micro tqalignment 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
-  geometry have been changed. It will compute the appropriate
+  tqgeometry 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 geometry that should be suitable for most chart
+  standard tqgeometry 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 repaint() being called due to params() changed signals...
+    // avoid recursion from tqrepaint() 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 e59443fb0..aac8928f9 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 alignment
+        // retrieve marker tqalignment
         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 alignment of extra lines
+        // retrieve tqalignment 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 alignment
+        // retrieve marker tqalignment
         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>alignment point</b>
+        positivePosition, resp.) -- and the internal <b>tqalignment 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>alignment point</b>
+        positivePosition, resp.) -- and the internal <b>tqalignment 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>alignment point</b> of the
+will be performed around the internal <b>tqalignment 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>alignment point</b>
+        positivePosition, resp.) -- and the internal <b>tqalignment 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>alignment point</b>
+        positivePosition, resp.) -- and the internal <b>tqalignment 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>alignment point</b> of the
+will be performed around the internal <b>tqalignment 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" )
-            .arg( KDChartEnums::AreaChartDataRegion, 5 )
-            .arg( dataRow, 5 )
-            .arg( dataCol, 5 )
-            .arg( data3rd, 5 );
+            .tqarg( KDChartEnums::AreaChartDataRegion, 5 )
+            .tqarg( dataRow, 5 )
+            .tqarg( dataCol, 5 )
+            .tqarg( data3rd, 5 );
 }
 
 
@@ -2609,7 +2609,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
 {
     if( pIterIdx )
         *pIterIdx = 0;
-    const TQString key( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
+    const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( 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/-----/-----/-----" ).arg( area, 5 ) );
+    return _areaDict.remove( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
 }
 
 
@@ -3807,9 +3807,9 @@ int KDChartParams::dataValuesRotation( uint chart, bool negative ) const
   a data text covers a neighboring data text (or a neighboring data
   area, resp.).
 
-  \note A layout policy different from LayoutJustOverwrite from does
+  \note A tqlayout policy different from LayoutJustOverwrite from does
   not mean that this policy is followed in any case. Rather than
-  giving up when the selected policy does not result in a good layout
+  giving up when the selected policy does not result in a good tqlayout
   the program will automatically try the next policy: if
   LayoutPolicyRotate did not succeed LayoutPolicyShiftVertically will
   be tried, if this did not succeed either
@@ -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 shape
+  \note Use the setLineMarkerStyle function to specify the tqshape
   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 alignment for each section when using more than
+  specify propper horizontal tqalignment 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 alignment mentioned above apply also to these three
+  restrictions regarding tqalignment 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 alignment mentioned above apply also to these three
+  restrictions regarding tqalignment 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 alignment mentioned above apply also to these
+  so the restrictions regarding tqalignment 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 alignment mentioned above apply also to these three
+  restrictions regarding tqalignment 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 alignment mentioned above apply also to these three
+  restrictions regarding tqalignment 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 2e054d81f..16722694c 100644
--- a/kchart/kdchart/KDChartParams.h
+++ b/kchart/kdchart/KDChartParams.h
@@ -37,7 +37,7 @@
 #include <tqdict.h>
 #include <tqintdict.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqsimplerichtext.h>
 #include <tqdom.h>
 #include <limits.h>
@@ -393,7 +393,7 @@ public slots:
                    bool           addFrameHeightToLayout = true )
         {
             _areaDict.setAutoDelete( TRUE );
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
                               new KDChartFrameSettings(0,0,0,
                                                        frame,
                                                        outerGapX,
@@ -436,7 +436,7 @@ public slots:
                      shadowWidth,
                            sunPos );
 
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( 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 86f37d683..4f17e6538 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" )
-                                              .arg( areaId, 5 )
-                                              .arg( frameSettings->dataRow(), 5 )
-                                              .arg( frameSettings->dataCol(), 5 )
-                                              .arg( 0, 5 );//frameSettings->data3rd(), 5 );
+                                              .tqarg( areaId, 5 )
+                                              .tqarg( frameSettings->dataRow(), 5 )
+                                              .tqarg( frameSettings->dataCol(), 5 )
+                                              .tqarg( 0, 5 );//frameSettings->data3rd(), 5 );
                                 else
-                                    str = TQString( "%1/-----/-----/-----" ).arg( areaId, 5 );
+                                    str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 );
                                 _areaDict.replace( str, frameSettings );
                             }
                         }
diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp
index a8e126cb9..ada03b44d 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
@@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter,
     TQRect ourClipRect( _dataRect );
     ourClipRect.addCoords( -1,-1,1,1 );
 
-    const TQWMatrix & world = painter->worldMatrix();
+    const TQWMatrix & world = painter->tqworldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp
index 99cee953b..23430dbd3 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
@@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
     // PENDING(khz) adjust the clip rect if neccessary...
     //
 
-    const TQWMatrix & world = painter->worldMatrix();
+    const TQWMatrix & world = painter->tqworldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
@@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
             pt2 = center + polarToXY( r2, currentAngle );
             pt3 = center + polarToXY( r3, currentAngle );
 
-            //pt3 = painter->worldMatrix().map( pt3 );
+            //pt3 = painter->tqworldMatrix().map( pt3 );
 
             if( paraSagittal.axisShowGrid() ) {
                 painter->setPen( TQPen( paraSagittal.axisGridColor(),
@@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
 
                 KDDrawText::drawRotatedText( painter,
                         currentAngle+90,
-                        painter->worldMatrix().map(pt3),
+                        painter->tqworldMatrix().map(pt3),
                         label,
                         0,
                         TQt::AlignCenter );
@@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter,
     KDDrawText::drawRotatedText(
             painter,
             rotate ? txtAngle - 90 : 0,
-            painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
+            painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
             txt,
             0,
             step
diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h
index bc618143c..cdd64f780 100644
--- a/kchart/kdchart/KDChartPropertySet.h
+++ b/kchart/kdchart/KDChartPropertySet.h
@@ -34,7 +34,7 @@
 #include <kdchart_export.h>
 #include <tqdom.h>
 #include <tqcolor.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 /**
   \file KDChartPropertySet.h
@@ -721,14 +721,14 @@ public slots:
     }
 
     /**
-      Specify the ID of the property set specifying the alignment of the
+      Specify the ID of the property set specifying the tqalignment 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 alignment
+      \param idMarkerAlign ID of the property set specifying the tqalignment
       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 alignment of the marker to be shown.
+      \param markerAlign  The tqalignment 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 ba1e6fed9..9740fa5ef 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
-    // geometry yet since we do not know the size of the painter.
+    // tqgeometry yet since we do not know the size of the painter.
 }
 
 
@@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter,
 
     TQRect ourClipRect( _dataRect );
 
-    const TQWMatrix & world = painter->worldMatrix();
+    const TQWMatrix & world = painter->tqworldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartTableBase.cpp b/kchart/kdchart/KDChartTableBase.cpp
index fcec2c53e..1ebfa9fdf 100644
--- a/kchart/kdchart/KDChartTableBase.cpp
+++ b/kchart/kdchart/KDChartTableBase.cpp
@@ -74,7 +74,7 @@
    future absicssa axis value:
    \verbatim
 
-   const TQDateTime currentTime( TQDateTime::currentDateTime() );
+   const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() );
    for( int iCell = 0;  iCell < usedValues;  ++iCell ){
    KDChartData& cell = myData.cell( 0, iCell );
    // assign special property set ID if X value is in the future
diff --git a/kchart/kdchart/KDChartTextPiece.cpp b/kchart/kdchart/KDChartTextPiece.cpp
index e986c8530..b95165f78 100644
--- a/kchart/kdchart/KDChartTextPiece.cpp
+++ b/kchart/kdchart/KDChartTextPiece.cpp
@@ -28,7 +28,7 @@
  **********************************************************************/
 #include "KDChartTextPiece.h"
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqsimplerichtext.h>
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
diff --git a/kchart/kdchart/KDChartTextPiece.h b/kchart/kdchart/KDChartTextPiece.h
index ab1916b04..adb176b21 100644
--- a/kchart/kdchart/KDChartTextPiece.h
+++ b/kchart/kdchart/KDChartTextPiece.h
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 #include <tqfont.h>
 #include <tqregion.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqobject.h>
 #include <kdchart_export.h>
 
diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp
index 8217abfca..d530ea19e 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 repaint(). Call
-  repaint() explicitly if necessary.
+  shown, data will be reported after the next tqrepaint(). Call
+  tqrepaint() 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
-  repaint.
+  tqrepaint.
 
   \param doublebuffered if true, turns double-buffering on, if false,
   turns double-buffering off
diff --git a/kchart/kdchart/KDChartWrapperFactory.cpp b/kchart/kdchart/KDChartWrapperFactory.cpp
index b42c0379a..2ff08f1aa 100644
--- a/kchart/kdchart/KDChartWrapperFactory.cpp
+++ b/kchart/kdchart/KDChartWrapperFactory.cpp
@@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory()
 
 TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr )
 {
-    if ( className == TQString::fromLatin1( "KDChartParams" ) )
+    if ( className == TQString::tqfromLatin1( "KDChartParams" ) )
         return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) );
 
-    if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) )
+    if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) )
         return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) );
 
-    if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
+    if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
         return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) );
 
-    if ( className == TQString::fromLatin1( "KDChartAxisParams" ) )
+    if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) )
         return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) );
 
     return 0;
diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp
index c09851349..70283da67 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 alignment together define one of
+            // The horizontal and vertical tqalignment 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/KDDrawText.h b/kchart/kdchart/KDDrawText.h
index 7842e9b5a..5fb9dbfdf 100644
--- a/kchart/kdchart/KDDrawText.h
+++ b/kchart/kdchart/KDDrawText.h
@@ -53,7 +53,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // useful for debugging of your layout:
+                // useful for debugging of your tqlayout:
                 bool showAnchor    = false,
                 const TQFontMetrics* fontMet = 0,
                 bool noFirstrotate = false,
@@ -81,7 +81,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font  = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // usefull for debugging of your layout:
+                // usefull for debugging of your tqlayout:
                 bool showAnchor    = false,
                 // speed-up parameters
                 // used internally by drawCircleText()
diff --git a/kchart/kdchart/KDFrame.cpp b/kchart/kdchart/KDFrame.cpp
index c760032f5..3904bf168 100644
--- a/kchart/kdchart/KDFrame.cpp
+++ b/kchart/kdchart/KDFrame.cpp
@@ -28,7 +28,7 @@
 **********************************************************************/
 
 #include <tqpainter.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include <KDFrame.h>
 #include <KDFrameProfileSection.h>
diff --git a/kchart/kdchart/KDFrame.h b/kchart/kdchart/KDFrame.h
index e3bd6a1d6..78de8ffb2 100644
--- a/kchart/kdchart/KDFrame.h
+++ b/kchart/kdchart/KDFrame.h
@@ -36,7 +36,7 @@
 #include <tqpen.h>
 #include <tqmap.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 #include <KDFrameProfileSection.h>
diff --git a/kchart/kdchart/KDFrameProfileSection.h b/kchart/kdchart/KDFrameProfileSection.h
index 48f70bb34..9fe38adf5 100644
--- a/kchart/kdchart/KDFrameProfileSection.h
+++ b/kchart/kdchart/KDFrameProfileSection.h
@@ -104,7 +104,7 @@ public:
 
 
     /**
-    Profile Curvature Mode: specifying the shape of a frame profile section.
+    Profile Curvature Mode: specifying the tqshape 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/kchart/kdchart/KDXMLTools.h b/kchart/kdchart/KDXMLTools.h
index b68f52115..4ebe68727 100644
--- a/kchart/kdchart/KDXMLTools.h
+++ b/kchart/kdchart/KDXMLTools.h
@@ -36,7 +36,7 @@
 #include <tqdom.h>
 #include <tqstring.h>
 #include <tqcolor.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqsize.h>
 #include <tqrect.h>
 #include <tqfont.h>
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 62aec4204..9ba1dbd2e 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -39,8 +39,8 @@
 #include "tqbitmap.h"
 #include "tqptrlist.h"
 #include "tqmemarray.h"
-#include "layout.h"
-#include "layoutengine_p.h"
+#include "tqlayout.h"
+#include "tqlayoutengine_p.h"
 #include "tqobjectlist.h"
 #include "tqstyle.h"
 #include "tqapplication.h" //sendPostedEvents
@@ -66,7 +66,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
     setMouseTracking( true );
 }
 
-TQSize KDGanttSplitterHandle::sizeHint() const
+TQSize KDGanttSplitterHandle::tqsizeHint() const
 {
     return TQSize(8,8);
 }
@@ -110,7 +110,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
-            repaint();
+            tqrepaint();
         updateCursor( e->pos() );
     }
 }
@@ -167,7 +167,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
             s->moveSplitter( pos, id() );
         }
     }
-    repaint();
+    tqrepaint();
 }
 
 int KDGanttSplitterHandle::onButton( const TQPoint& p )
@@ -240,16 +240,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     TQPainter p( &buffer );
 
     // Draw the splitter rectangle
-    p.setBrush( colorGroup().background() );
-    p.setPen( colorGroup().foreground() );
+    p.setBrush( tqcolorGroup().background() );
+    p.setPen( tqcolorGroup().foreground() );
     p.drawRect( rect() );
     parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
-                                           parentWidget()->colorGroup());
+                                           parentWidget()->tqcolorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
     // arrow color
-    TQColor col = colorGroup().background().dark( 200 );
+    TQColor col = tqcolorGroup().background().dark( 200 );
     p.setBrush( col );
     p.setPen( col  );
 
@@ -258,13 +258,13 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
-            p.drawPolygon( *it, true );
+            p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.tqdrawPolygon( *it, true );
             p.restore();
         }
         else {
-            p.drawPolygon( *it, true );
+            p.tqdrawPolygon( *it, true );
         }
         index++;
     }
@@ -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 children. Any number of widgets
+  dragging the boundary between the tqchildren. 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 children are side by side)
+  vertical.  The default is horizontal (the tqchildren 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 children only
+  Although KDGanttMinimizeSplitter normally resizes the tqchildren 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
-  children. It will be reinstated when you show() it again. It is also
+  tqchildren. It will be reinstated when you show() it again. It is also
   possible to reorder the widgets within the splitter using
   moveToFirst() and moveToLast().
 */
@@ -366,10 +366,10 @@ static TQSize minSize( const TQWidget* /*w*/ )
 // This is the original version of minSize
 static TQSize minSizeHint( const TQWidget* w )
 {
-    TQSize min = w->minimumSize();
+    TQSize min = w->tqminimumSize();
     TQSize s;
     if ( min.height() <= 0 || min.width() <= 0 )
-	s = w->minimumSizeHint();
+	s = w->tqminimumSizeHint();
     if ( min.height() > 0 )
 	s.setHeight( min.height() );
     if ( min.width() > 0 )
@@ -402,7 +402,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p
 }
 
 /*!
-  Destroys the splitter and any children.
+  Destroys the splitter and any tqchildren.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
@@ -415,9 +415,9 @@ void KDGanttMinimizeSplitter::init()
 {
     data = new TQSplitterData;
     if ( orient ==Qt::Horizontal )
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
     else
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
 }
 
 
@@ -435,9 +435,9 @@ void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
     orient = o;
 
     if ( orient ==Qt::Horizontal )
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
     else
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     KDGanttSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
@@ -480,7 +480,7 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo
 	s->wid = newHandle;
 	newHandle->setId(data->list.count());
 	s->isSplitter = TRUE;
-	s->sizer = pick( newHandle->sizeHint() );
+	s->sizer = pick( newHandle->tqsizeHint() );
 	if ( first )
 	    data->list.insert( 0, s );
 	else
@@ -489,8 +489,8 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo
     s = new KDGanttSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
-    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
-	s->sizer = pick( w->sizeHint() );
+    if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() )
+	s->sizer = pick( w->tqsizeHint() );
     else
 	s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
@@ -563,7 +563,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     paint.setRasterOp( XorROP );
     TQRect r = contentsRect();
     const int rBord = 3; //Themable????
-    int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     if ( orient ==Qt::Horizontal ) {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
@@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
 void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
 			      TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
 {
-    tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
+    tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
 			  (orientation() == Qt::Horizontal ?
 			   TQStyle::Style_Horizontal : 0));
 }
@@ -634,7 +634,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
   close as possible to position \a p, which is the distance from the
   left (or top) edge of the widget.
 
-  For Arabic and Hebrew the layout is reversed, and using this
+  For Arabic and Hebrew the tqlayout is reversed, and using this
   function to set the position of the splitter might lead to
   unexpected results, since in Arabic and Hebrew the position of
   splitter one is to the left of the position of splitter zero.
@@ -707,13 +707,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     } else {
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) {
-	    dd = w->geometry().right() - pos;
-	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
+	    dd = w->tqgeometry().right() - pos;
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
 	} else {
 	    dd = pos - pick( w->pos() ) + 1;
-	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	}
@@ -762,13 +762,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	int right, dd,/* newRight,*/ newLeft, nextPos;
 	if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) {
 	    dd = pos - left + 1;
-	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
-	    right = pick( w->geometry().bottomRight() );
+	    right = pick( w->tqgeometry().bottomRight() );
 	    dd = right - pos + 1;
-	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
+	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
 	    /*newRight = pos+dd-1;*/
 	    newLeft = pos;
 	    nextPos = newLeft + dd;
@@ -822,7 +822,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxB += s->sizer;
 	} else {
 	    minB += pick( minSize(s->wid) );
-	    maxB += pick( s->wid->maximumSize() );
+	    maxB += pick( s->wid->tqmaximumSize() );
 	}
     }
     for ( i = id; i < n; i++ ) {
@@ -834,12 +834,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxA += s->sizer;
 	} else {
 	    minA += pick( minSize(s->wid) );
-	    maxA += pick( s->wid->maximumSize() );
+	    maxA += pick( s->wid->tqmaximumSize() );
 	}
     }
     TQRect r = contentsRect();
     if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) {
-	int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+	int splitterWidth = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
 	if ( min )
 	    *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
@@ -881,27 +881,27 @@ void KDGanttMinimizeSplitter::doResize()
 	KDGanttSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = 0;
-	    a[i].maximumSize = 0;
+	    a[i].tqsizeHint = a[i].tqminimumSize = 0;
+	    a[i].tqmaximumSize = 0;
 	} else if ( s->isSplitter ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer;
+	    a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
 	    a[i].empty = FALSE;
 	} else if ( s->mode == KeepSize ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = pick( minSize(s->wid) );
-	    a[i].sizeHint = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = pick( minSize(s->wid) );
+	    a[i].tqsizeHint = s->sizer;
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else if ( s->mode == FollowSizeHint ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() );
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else { //proportional
 	    a[i].stretch = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
-	    a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
+	    a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) );
 	    a[i].empty = FALSE;
 	}
     }
@@ -955,9 +955,9 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 	    } else {
 		TQSize minS = minSize(s->wid);
 		minl += pick( minS );
-		maxl += pick( s->wid->maximumSize() );
+		maxl += pick( s->wid->tqmaximumSize() );
 		mint = TQMAX( mint, trans( minS ));
-		int tm = trans( s->wid->maximumSize() );
+		int tm = trans( s->wid->tqmaximumSize() );
 		if ( tm > 0 )
 		    maxt = TQMIN( maxt, tm );
 	    }
@@ -968,7 +968,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
-            // KDGanttMinimizeSplitter with no children yet
+            // KDGanttMinimizeSplitter with no tqchildren yet
             maxl = TQWIDGETSIZE_MAX;
         }
     } else {
@@ -1107,7 +1107,7 @@ void KDGanttMinimizeSplitter::recalcId()
 
 /*! Reimplemented from superclass.
 */
-TQSize KDGanttMinimizeSplitter::sizeHint() const
+TQSize KDGanttMinimizeSplitter::tqsizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1121,7 +1121,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 	    ++it;
 	    if ( o->isWidgetType() &&
 		 !((TQWidget*)o)->isHidden() ) {
-		TQSize s = ((TQWidget*)o)->sizeHint();
+		TQSize s = ((TQWidget*)o)->tqsizeHint();
 		if ( s.isValid() ) {
 		    l += pick( s );
 		    t = TQMAX( t, trans( s ) );
@@ -1137,7 +1137,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 \reimp
 */
 
-TQSize KDGanttMinimizeSplitter::minimumSizeHint() const
+TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1231,7 +1231,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const
   splitter.
 
   Giving the values to another splitter's setSizes() function will
-  produce a splitter with the same layout as this one.
+  produce a splitter with the same tqlayout as this one.
 
   Note that if you want to iterate over the list, you should
   iterate over a copy, e.g.
@@ -1311,7 +1311,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
 
 void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
 {
-    int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     KDGanttSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
@@ -1366,9 +1366,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
     int i;
     for ( i = start; i < start + count; i++ ) {
 	chain[i].done = FALSE;
-	cHint += chain[i].sizeHint;
-	cMin += chain[i].minimumSize;
-	cMax += chain[i].maximumSize;
+	cHint += chain[i].tqsizeHint;
+	cMin += chain[i].tqminimumSize;
+	cMax += chain[i].tqmaximumSize;
 	sumStretch += chain[i].stretch;
 	if ( !chain[i].empty )
 	    spacerCount++;
@@ -1381,11 +1381,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
     if ( space < cMin + spacerCount * spacer ) {
 	//	qDebug("not enough space");
 	for ( i = start; i < start+count; i++ ) {
-	    chain[i].size = chain[i].minimumSize;
+	    chain[i].size = chain[i].tqminimumSize;
 	    chain[i].done = TRUE;
 	}
     } else if ( space < cHint + spacerCount*spacer ) {
-	// Less space than sizeHint, but more than minimum.
+	// Less space than tqsizeHint, but more than minimum.
 	// Currently take space equally from each, like in TQt 2.x.
 	// Commented-out lines will give more space to stretchier items.
 	int n = count;
@@ -1393,10 +1393,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
 	int overdraft = cHint - space_left;
 	//first give to the fixed ones:
 	for ( i = start; i < start+count; i++ ) {
-	    if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) {
-		chain[i].size = chain[i].sizeHint;
+	    if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) {
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		// sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1415,13 +1415,13 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
 		// else
 		//    fp_w += (fp_over * chain[i].stretch) / sumStretch;
 		int w = fRound( fp_w );
-		chain[i].size = chain[i].sizeHint - w;
+		chain[i].size = chain[i].tqsizeHint - w;
 		fp_w -= toFixed( w ); //give the difference to the next
-		if ( chain[i].size < chain[i].minimumSize ) {
+		if ( chain[i].size < chain[i].tqminimumSize ) {
 		    chain[i].done = TRUE;
-		    chain[i].size = chain[i].minimumSize;
+		    chain[i].size = chain[i].tqminimumSize;
 		    finished = FALSE;
-		    overdraft -= chain[i].sizeHint - chain[i].minimumSize;
+		    overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize;
 		    // sumStretch -= chain[i].stretch;
 		    n--;
 		    break;
@@ -1433,11 +1433,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
 	int space_left = space - spacerCount*spacer;
 	// first give to the fixed ones, and handle non-expansiveness
 	for ( i = start; i < start + count; i++ ) {
-	    if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint
+	    if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint
 				    || wannaGrow && !chain[i].expansive) ) {
-		chain[i].size = chain[i].sizeHint;
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1469,20 +1469,20 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
 		int w = fRound( fp_w );
 		chain[i].size = w;
 		fp_w -= toFixed( w ); // give the difference to the next
-		if ( w < chain[i].sizeHint ) {
-		    deficit +=  chain[i].sizeHint - w;
-		} else if ( w > chain[i].maximumSize ) {
-		    surplus += w - chain[i].maximumSize;
+		if ( w < chain[i].tqsizeHint ) {
+		    deficit +=  chain[i].tqsizeHint - w;
+		} else if ( w > chain[i].tqmaximumSize ) {
+		    surplus += w - chain[i].tqmaximumSize;
 		}
 	    }
 	    if ( deficit > 0 && surplus <= deficit ) {
 		// give to the ones that have too little
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size < chain[i].sizeHint ) {
-			chain[i].size = chain[i].sizeHint;
+			 chain[i].size < chain[i].tqsizeHint ) {
+			chain[i].size = chain[i].tqsizeHint;
 			chain[i].done = TRUE;
-			space_left -= chain[i].sizeHint;
+			space_left -= chain[i].tqsizeHint;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
@@ -1492,10 +1492,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
 		// take from the ones that have too much
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size > chain[i].maximumSize ) {
-			chain[i].size = chain[i].maximumSize;
+			 chain[i].size > chain[i].tqmaximumSize ) {
+			chain[i].size = chain[i].tqmaximumSize;
 			chain[i].done = TRUE;
-			space_left -= chain[i].maximumSize;
+			space_left -= chain[i].tqmaximumSize;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 7a56d7ce4..557026f10 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -72,8 +72,8 @@ public:
     void moveToLast( TQWidget * );
 
     void refresh() { recalc( TRUE ); }
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     TQValueList<int> sizes() const;
     void setSizes( TQValueList<int> );
@@ -149,7 +149,7 @@ public:
 
     bool opaque() const { return s->opaqueResize(); }
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     int id() const { return myId; } // data->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index b51507f9d..8bede0d04 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -247,7 +247,7 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition(
 void KDGanttSemiSizingControl::init()
 {
     _but = new TQPushButton( this );
-    _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) );
     _layout = 0;
     TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget");
@@ -258,7 +258,7 @@ void KDGanttSemiSizingControl::init()
 
 void KDGanttSemiSizingControl::setup()
 {
-    //-------------------------------------------------- Setup layout
+    //-------------------------------------------------- Setup tqlayout
     delete _layout;
     TQBoxLayout* butLayout; // _layout will delete me
 
@@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) {
 
     TQPainter p( &pix );
     p.setPen( black );
-    p.setBrush( colorGroup().button() );
+    p.setBrush( tqcolorGroup().button() );
     p.drawPolygon( arr );
     TQBitmap bit( s, s );
     bit.fill( color0 );
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 823eddacd..34b11a234 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -36,7 +36,7 @@
 #define KDGANTTSEMISIZINGCONTROL_H
 
 #include "KDGanttSizingControl.h"
-#include <layout.h>
+#include <tqlayout.h>
 class TQPushButton;
 class TQBoxLayout;
 
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index b5d44d351..f14ac0272 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -41,7 +41,7 @@
 #include "itemAttributeDialog.h"
 #include <tqprinter.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqfile.h>
 #include <tqheader.h>
@@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
     fDropEnabled = false;
     closingBlocked = false;
    myTimeHeader->computeTicks();
-   centerTimelineAfterShow( TQDateTime::currentDateTime () );
+   centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () );
    setDisplayEmptyTasksAsLine( false );
    TQValueList<int> list;
    list.append(240);
@@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete )
 /*!
   Returns a useful size for the view.
   Returned width:
-  sizeHint().width() of the list view + width of TimeTable
+  tqsizeHint().width() of the list view + width of TimeTable
   Returned height:
   height() of TimeHeader + height() of TimeTable + height() of Legend (if shown)
 */
 
-TQSize KDGanttView::sizeHint() const
+TQSize KDGanttView::tqsizeHint() const
 {
   bool block = myTimeTable->blockUpdating();
   myTimeTable->setBlockUpdating( false );
@@ -342,9 +342,9 @@ TQSize KDGanttView::sizeHint() const
   if ( myLegend->isShown() )
     hintHeight += myLegend->legendSizeHint().height() +10;
   hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2;
-  int hintWid = myListView->sizeHint().width();
+  int hintWid = myListView->tqsizeHint().width();
   //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width();
-  hintWid += myCanvasView->sizeHint().width();
+  hintWid += myCanvasView->tqsizeHint().width();
   // add 10 for the splitter-bars
   // qDebug("sizehint %d %d ",hintWid+10, hintHeight );
   myTimeTable->setBlockUpdating( block );
@@ -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 repaint problems occur.
+                 after scrolling. Recommended, when tqrepaint 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->shape, li->color, li->text );
+      myLegend->addLegendItem(li->tqshape, li->color, li->text );
     }
   }
 }
@@ -875,7 +875,7 @@ void KDGanttView::print( TQPrinter* printer ,
   TQSize size = drawContents( 0, printListView, printTimeLine, printLegend );
 
   // at the top, we want to print current time/date
-  TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString();
+  TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString();
   int hei = p.boundingRect(0,0, 5, 5, TQt::AlignLeft, date ).height();
   p.drawText( 0, 0, date );
 
@@ -1216,7 +1216,7 @@ bool KDGanttView::showTaskLinks() const
 void KDGanttView::setFont(const TQFont& font)
 {
     myListView->setFont(font);
-    myListView->repaint();
+    myListView->tqrepaint();
     myTimeHeader->setFont(font);
     myLegend->setFont( font );
     TQWidget::setFont( font );
@@ -1306,21 +1306,21 @@ bool KDGanttView::showTimeTablePopupMenu() const
 
 
 /*!
-  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).
+  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).
 
-  This setting overrides any shape settings made on individual items.
+  This setting overrides any tqshape 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 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
+  \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
   in the individual items
-  \sa shapes()
+  \sa tqshapes()
 */
 void KDGanttView::setShapes( KDGanttViewItem::Type type,
                              KDGanttViewItem::Shape start,
@@ -1344,18 +1344,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type,
 
 
 /*!
-  Queries the shapes for a particular type of Gantt item.
+  Queries the tqshapes for a particular type of Gantt item.
 
-  \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
+  \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
   parameters are undefined.
   \sa setShapes()
 */
-bool KDGanttView::shapes( KDGanttViewItem::Type type,
+bool KDGanttView::tqshapes( 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 shape the shape to display
-  \param shapeColor the color in which to display the shape
+  \param tqshape the tqshape to display
+  \param tqshapeColor the color in which to display the tqshape
   \param text the text to display
   \sa clearLegend()
 */
-void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape,
-                                 const TQColor& shapeColor,
+void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape,
+                                 const TQColor& tqshapeColor,
                                  const TQString& text )
 {
-    myLegend->addLegendItem( shape,shapeColor,text );
+    myLegend->addLegendItem( tqshape,tqshapeColor,text );
     legendItem* item = new legendItem;
-    item->shape = shape;
-    item->color = shapeColor;
+    item->tqshape = tqshape;
+    item->color = tqshapeColor;
     item->text = text;
     myLegendItems->append( item );
 }
@@ -3412,58 +3412,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
                            showTimeTablePopupMenu() );
 
     // the Shapes element
-    TQDomElement shapesElement = doc.createElement( "Shapes" );
-    docRoot.appendChild( shapesElement );
-    TQDomElement shapesEventElement = doc.createElement( "Event" );
-    shapesElement.appendChild( shapesEventElement );
+    TQDomElement tqshapesElement = doc.createElement( "Shapes" );
+    docRoot.appendChild( tqshapesElement );
+    TQDomElement tqshapesEventElement = doc.createElement( "Event" );
+    tqshapesElement.appendChild( tqshapesEventElement );
     KDGanttViewItem::Shape start, middle, 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 ) );
+    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 ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
                                  "Undefined" );
     }
-    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 ) );
+    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 ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
                                  "Undefined" );
     }
-    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 ) );
+    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 ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "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::shapeToString( current->shape ) );
+                                 KDGanttViewItem::tqshapeToString( current->tqshape ) );
         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 shape, in the
+  This method returns the pixmap used for a certain tqshape, in the
   selected color and size.
 
-  \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
+  \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
 */
-TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
-                                const TQColor& shapeColor,
+TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
+                                const TQColor& tqshapeColor,
                                 const TQColor& backgroundColor, int itemSize)
 {
   // 10 is a good value as size
@@ -3774,11 +3774,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
   p.fill( backgroundColor );
   TQPainter paint (&p);
   TQBrush b = TQBrush ( TQt::SolidPattern );
-  b.setColor( shapeColor );
+  b.setColor( tqshapeColor );
   paint.setBrush( b );
   TQPen pen( TQt::black, 1 ) ;
   paint.setPen( pen );
-  switch (shape) {
+  switch (tqshape) {
   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 shape types
-    // currently, we take for each item for all three shapes (start, middle, end) the same default shape
+    // setting the default tqshape types
+    // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
     for (i = 0;i<3;++i) {
       myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] =  KDGanttViewItem::Diamond; //event
       myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] =  KDGanttViewItem::Square; //task
@@ -4236,7 +4236,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const
   may add as many widgets as you want. They are ordered horizontally
   from left to right.  To remove a widget from the spacer widget, call
   widget->reparent(newParent,...) or delete the widget.  Since the spacer
-  is a TQHBox, the layout of the added widgets is managed by this
+  is a TQHBox, the tqlayout of the added widgets is managed by this
   TQHBox.
 
   \param w A pointer to the widget to be added.
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 902f82dc9..02fdc5d71 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -39,7 +39,7 @@
 #include <tqwidget.h>
 #include <tqlistview.h>
 #include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfont.h>
 #include <tqdom.h>
 #include <tqvbox.h>
@@ -192,7 +192,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool shapes( KDGanttViewItem::Type type,
+    bool tqshapes( 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 shape, const TQColor& shapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, 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 shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -325,7 +325,7 @@ public:
     virtual void lvStartDrag (KDGanttViewItem*);
     virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*);
     virtual void lvDragEnterEvent (TQDragEnterEvent * e );
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     KDGanttViewItem* getItemByName( const TQString& name ) const;
     TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const;
     KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const;
@@ -409,7 +409,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape shape;
+      KDGanttViewItem::Shape tqshape;
       TQColor color;
       TQString text;
     };
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 62205b6b2..fab1b3bd0 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 shapes/colors of the item works as follows:
+  The initialization of the tqshapes/colors of the item works as follows:
 
   Shapes:
-  When a new item is created, the shapes are set to the default values
+  When a new item is created, the tqshapes 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 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.
+  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.
 
   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 shapes are set to the default color for items of this type,
+  the colors of the tqshapes 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 shapes are set to the default color for
+  the highlight colors of the tqshapes 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 children, it is displayed as usual.
-  If the item is opened (i.e., its children are displayed), the
+  If the item has no tqchildren, it is displayed as usual.
+  If the item is opened (i.e., its tqchildren are displayed), the
   start/end time of this item is computed automatically according to
-  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
+  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
   on the timeline of this item instead. To control the painting of
-  overlapping children, call \a setPriority() for the childs.
+  overlapping tqchildren, 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/shape values, you get an item with three shapes
+  without setting any color/tqshape values, you get an item with three tqshapes
   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 children of these root item in the Gantt view.
+  Insert items as tqchildren 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 children themselves.
+  Actually, you may add child items to the tqchildren themselves.
   Such a child behaves then like a parent.
-  Now set the start/end time of the children to specify a time
+  Now set the start/end time of the tqchildren 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 children are displayed instead.
+  the item itself is hidden, and all tqchildren 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 (children) as a group
+  If the item displays its subitems (tqchildren) as a group
   (displaySubitemsAsGroup() == true),
   all changes apply to all subitems as well.
 
@@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const
 
 
 /*!
-  Specifies the shapes to be used for this item.
+  Specifies the tqshapes to be used for this item.
 
-  It is advisable not to use this method, but rather set the shapes
+  It is advisable not to use this method, but rather set the tqshapes
   for all items of a type with KDGanttView::setShapes() in order to
   get a uniform Gantt view.
 
-  \param start the start shape
-  \param middle the middle shape
-  \param end the end shape
-  \sa shapes(), setColors(), colors()
+  \param start the start tqshape
+  \param middle the middle tqshape
+  \param end the end tqshape
+  \sa tqshapes(), 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 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.
+  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.
 
-  \param itemShape the foreground shape
-  \param middle itemShapeBack  the background shape
-  \param shape the type of the shape
+  \param itemShape the foreground tqshape
+  \param middle itemShapeBack  the background tqshape
+  \param tqshape the type of the tqshape
    (may be TriangleDown, TriangleUp, Diamond, Square, Circle)
-  \sa shapes(), setColors(), colors()
+  \sa tqshapes(), setColors(), colors()
 */
 void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
                                    KDCanvasPolygonItem* &itemShapeBack,
-                                   Shape shape )
+                                   Shape tqshape )
 {
   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 (shape) {
+    switch (tqshape) {
     case TriangleDown:
         {
             item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem);
@@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
             break;
         }
     default:
-        // Uninitialized shape, can e.g. be the case with free-busy
-        // items which don't have any shapes
+        // Uninitialized tqshape, can e.g. be the case with free-busy
+        // items which don't have any tqshapes
         return;
     }
     item->setBrush(Qt::SolidPattern);
@@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
 
 
 /*!
-  Returns the shapes used for this item
+  Returns the tqshapes used for this item
 
-  \param start returns the start shape
-  \param middle returns the middle shape
-  \param end returns the end shape
+  \param start returns the start tqshape
+  \param middle returns the middle tqshape
+  \param end returns the end tqshape
   \sa setShapes(), setColors(), colors()
 */
-void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
+void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
 {
     start = myStartShape;
     middle = myMiddleShape;
@@ -943,16 +943,16 @@ void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
 
 
 /*!
-  Specifies the colors in which to draw the shapes of this item.
+  Specifies the colors in which to draw the tqshapes 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 shape
-  \param middle the color for the middle shape
-  \param end the color for the end shape
-  \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
+  \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()
 */
 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(), shapes(), setDefaultColor(), defaultColor()
+  \sa setColors(), setShapes(), tqshapes(), 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 shapes of this item.
+  Specifies the highlight colors in which to draw the tqshapes 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 (children) as a group,
+  If the item displays its subitems (tqchildren) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
-  \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()
+  \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()
 */
 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(), shapes()
+  \sa setHighlightColors(), setShapes(), tqshapes()
 */
 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 (children) as a group,
+  If the item displays its subitems (tqchildren) 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 shapes of a Gantt chart
+  This enum is used in order to specify the tqshapes 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 (children) as a group,
+  If the item displays its subitems (tqchildren) 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 (children) as a group,
+  If the item displays its subitems (tqchildren) 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 children
+  \return the first child of this item, 0 if this item has no tqchildren
 */
 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 shapes
-    if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
+    // set tqshapes
+    if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
 
-        //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes");
+        //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes");
     };
 
     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 shapes
+    // set color of tqshapes
     if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) {
 
     };
     setColors(defaultColor(),defaultColor(), defaultColor());
-    // set highlight color of shapes
+    // set highlight color of tqshapes
     if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) {
 
     };
@@ -1506,9 +1506,9 @@ void KDGanttViewItem::initColorAndShapes(Type t)
 }
 
 
-TQString KDGanttViewItem::shapeToString( Shape shape )
+TQString KDGanttViewItem::tqshapeToString( Shape tqshape )
 {
-    switch( shape ) {
+    switch( tqshape ) {
     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;
-    shapes( startShape, middleShape, endShape );
+    tqshapes( startShape, middleShape, endShape );
     KDGanttXML::createStringNode( doc, itemElement, "StartShape",
-                             shapeToString( startShape ) );
+                             tqshapeToString( startShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "MiddleShape",
-                             shapeToString( middleShape ) );
+                             tqshapeToString( middleShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "EndShape",
-                             shapeToString( endShape ) );
+                             tqshapeToString( 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 children of this item.
+  Returns the start time of the tqchildren of this item.
 
-  \return the start time of the children of this item
+  \return the start time of the tqchildren of this item
 */
 TQDateTime KDGanttViewItem::myChildStartTime()
 {
@@ -1976,9 +1976,9 @@ TQDateTime KDGanttViewItem::myChildStartTime()
 
 
 /*!
-  Returns the end time of the children of this item.
+  Returns the end time of the tqchildren of this item.
 
-  \return the end time of the children of this item
+  \return the end time of the tqchildren 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 children and subchildren of
+  item with name \a name in the set of tqchildren and subtqchildren 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 shape at the beginning of the item
+  the tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShape
 
-  the shape in the middle of the item
+  the tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShape
 
-  the shape at the end of the item
+  the tqshape at the end of the item
 */
 
 /*!
   \var KDGanttViewItem::startShapeBack
 
-  the background shape at the beginning of the item
+  the background tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShapeBack
 
-  the background shape in the middle of the item
+  the background tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShapeBack
 
-  the background shape at the end of the item
+  the background tqshape at the end of the item
 */
 
 
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 70ca358ec..972aa4d63 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 shapes( Shape& start, Shape& middle, Shape& end ) const;
+    void tqshapes( 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 shapeToString( Shape shape );
+    static TQString tqshapeToString( Shape tqshape );
     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 shapeDefined;
+    bool tqshapeDefined;
     int _priority;
     static TQDict<KDGanttViewItem> sItemDict;
 };
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 158da0411..c73eff67f 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->shapes( start, middle, end );
+        item->tqshapes( start, middle, end );
         TQColor st, mi, en;
         item->colors( st, mi, en );
         pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 );
@@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
   \param c the format of the data
   \return the encoded data of the drag object
 */
-TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const
+TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const
 {
     TQString s ( c );
     if ( s == "x-application/x-KDGanttViewItemDrag" ) {
@@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode (  const TQMimeSource * e )
 bool KDGanttViewItemDrag::decode (  const TQMimeSource * e , TQString &  string)
 {
     TQByteArray arr;
-    arr = e->encodedData( "x-application/x-KDGanttViewItemDrag");
+    arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag");
     TQDataStream s( arr, IO_ReadOnly );
     s >> string;
     return true;
diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h
index 9219c9181..a4d6cb6f0 100644
--- a/kdgantt/KDGanttViewItemDrag.h
+++ b/kdgantt/KDGanttViewItemDrag.h
@@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public TQStoredDrag
 public:
   KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source,  const char * name  ) ;
 
-  TQByteArray encodedData( const char * c) const;
+  TQByteArray tqencodedData( const char * c) const;
   KDGanttViewItem* getItem();
   static bool canDecode ( const TQMimeSource * e );
   static bool decode ( const TQMimeSource * e, TQString & );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index f44b8fb56..d158c75a5 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -48,7 +48,7 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 #include <tqdrawutil.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqdragobject.h>
 #include <tqptrlist.h>
 #include <tqpen.h>
@@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
     mySizeHint = 0;
     myGanttView = gant;
     flagDoNotRecomputeAfterChange = true;
-    TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600);
+    TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600);
     setHorizonStart(start);
     setHorizonEnd( start.addSecs(3600*2));
     flagStartTimeSet = false;
     flagEndTimeSet = false;
-    myCenterDateTime = TQDateTime::currentDateTime ();
+    myCenterDateTime = TQDateTime::tqcurrentDateTime ();
     setScale(KDGanttView::Auto);
     //setScale(KDGanttView::Hour);
     myMaxScale = KDGanttView::Month;
@@ -792,7 +792,7 @@ void  KDTimeHeaderWidget::preparePopupMenu()
     if (flagZoomToFit)
         myPopupMenu->changeItem( 1, i18n("Zoom (Fit)"));
     else
-        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) );
+        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( 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();
-    repaint();
+    tqrepaint();
     moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2));
     // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
     if (myGanttView && myGanttView->myCanvasView)
@@ -2098,7 +2098,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     TQPainter p(this);
     int Width, Height;
     TQString testTextMinor,testTextMajor, tempStr;
-    TQRect itemRectMinor, itemRectMajor;
+    TQRect tqitemRectMinor, tqitemRectMajor;
     TQDate tempDate = myRealStart.date();
     myRealEnd = myRealStart;
     // preparing the testtext for the differennt scales
@@ -2121,25 +2121,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
                 testTextMinor = "12 AM";
             testTextMajor = "Mon Aug 30, x";
             if ( yearFormat() != KDGanttView::NoDate )
-                testTextMajor += getYear(TQDate::currentDate());
+                testTextMajor += getYear(TQDate::tqcurrentDate());
             minorPerMajor = 2400;
             break;
         case KDGanttView::Day:
             minorItems = minorItems/(60*24);
             testTextMinor = "88";
-            testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 700;
             break;
         case KDGanttView::Week:
             minorItems = minorItems/(60*24*7);
             testTextMinor = "88";
-            testTextMajor = "Aug x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 435; // 435 = 365days/12months/7days * 100
             break;
         case KDGanttView::Month:
             minorItems = (minorItems*12)/(60*24*365);
             testTextMinor = "M";
-            testTextMajor = "x"+getYear(TQDate::currentDate());
+            testTextMajor = "x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 1200;
             break;
         case KDGanttView::Auto:
@@ -2147,12 +2147,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             qDebug("             RealScale == Auto : This may not be! ");
             break;
         }
-    itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor);
-    itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor);
+    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor);
+    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor);
     p.end();
     //qDebug("     tempMinorScaleCount %d ", tempMinorScaleCount);
-    Height = itemRectMinor.height()+itemRectMajor.height()+11;
-    Width = (itemRectMinor.width()+5);
+    Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11;
+    Width = (tqitemRectMinor.width()+5);
     if (Width < minimumColumnWidth()) Width = minimumColumnWidth();
     // if the desired width is greater than the maximum width of this widget
     // increase the minorscalecount
@@ -2209,7 +2209,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     // checking, if enough space for majorscale
     // if not, increasing MajorScaleCount
 
-    while ((minorPerMajor*Width)/100 < itemRectMajor.width()) {
+    while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) {
         minorPerMajor = minorPerMajor/tempMajorScaleCount;
         ++tempMajorScaleCount;
         minorPerMajor = minorPerMajor*tempMajorScaleCount;
@@ -2219,13 +2219,13 @@ 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 geometry
+    // if size changed, reset tqgeometry
     if (width() != Width   || height() != Height  )
         {
             resize( Width, Height );
             emit  sizeChanged( Width );
         }
-    myMajorGridHeight = itemRectMajor.height()+5;
+    myMajorGridHeight = tqitemRectMajor.height()+5;
     TQTime tempTime = myRealStart.time();
     TQDateTime tempDateTime;
     int i;
@@ -2355,7 +2355,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGanttView->myTimeTable->setBlockUpdating( block );
     updateTimeTable();
     centerDateTime(myCenterDateTime);
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2501,7 +2501,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent *  )
         //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) );
     }
     mouseDown = false;
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2516,11 +2516,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
     if ( mouseDown ) {
         if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) {
             mouseDown = false;
-            repaint();
+            tqrepaint();
             return;
         }
         endMouseDown = e->pos().x();
-        //repaint;
+        //tqrepaint;
         int val = -1;
         if (endMouseDown <  -x() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() -
@@ -2643,7 +2643,7 @@ TQSize KDLegendWidget::legendSize()
 TQSize KDLegendWidget::legendSizeHint()
 {
     TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-    return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height());
+    return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height());
 }
 
 
@@ -2664,7 +2664,7 @@ void KDLegendWidget::clearLegend ( )
     myLegend->setFont( font() );
     scroll->addChild(  myLegend );
     scroll->setResizePolicy( TQScrollView::AutoOneFit );
-    myLegend->layout()->setMargin( 11 );
+    myLegend->tqlayout()->setMargin( 11 );
     myLegend->setFrameStyle( TQFrame::NoFrame );
     if ( dock )
         scroll->setMaximumHeight( 32000 );
@@ -2673,10 +2673,10 @@ void KDLegendWidget::clearLegend ( )
 }
 
 
-void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text )
+void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( shape,  shapeColor, TQt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, TQt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
     w->setBackgroundColor( TQt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
@@ -2896,7 +2896,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
             c = fc;
             // draw to last interesting column
 
-            const TQColorGroup &cg = ( palette().inactive() );
+            const TQColorGroup &cg = ( tqpalette().inactive() );
 
             while ( c < lc && !drawables.isEmpty() ) {
                 int i = header()->mapToLogical( c );
@@ -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 children of current need to be painted?
+        // do any tqchildren of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
         if ( ih != ith && 
             rootIsDecorated() &&
@@ -2961,7 +2961,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
                 p->translate( rleft, crtop );
                 //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl;
 
-                current->i->paintBranches( p, colorGroup(), treeStepSize(),
+                current->i->paintBranches( p, tqcolorGroup(), treeStepSize(),
                                         rtop - crtop, r.height() );
                 p->restore();
             }
@@ -3506,7 +3506,7 @@ TQString  KDGanttCanvasView::getWhatsThisText(TQPoint p)
 void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
 {
     //qDebug("mousepress! %d ", this);
-    //qDebug("focus %d ",tqApp->focusWidget());
+    //qDebug("focus %d ",tqApp->tqfocusWidget());
     setFocus();
     currentLink = 0;
     currentItem = 0;
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 618acb7ab..8b7bc2159 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -49,9 +49,9 @@
 #include <tqtimer.h>
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqvbox.h>
 #include <tqdockwindow.h>
 #include <tqtimer.h>
@@ -331,7 +331,7 @@ public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
-  void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+  void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 64ecbd84b..b51bcbd00 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 shape,
+  A calendar item in a Gantt chart has no start/end tqshape,
   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/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index db2d1ef5e..aea239441 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -33,7 +33,7 @@
  **********************************************************************/
 
 #include "KDGanttXMLTools.h"
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqbuffer.h>
 #include <tqimage.h>
 #include <zlib.h>
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 5a34dbb5e..a3616dcad 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>16</height>
@@ -383,7 +383,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>16</height>
@@ -462,7 +462,7 @@
                             <property name="text">
                                 <string>Text color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 8624d45d5..3ab24af83 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->repaint();
+    ChangeText->tqrepaint();
 }
 
 
@@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    item->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( 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->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     end = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index 15cd80de2..e87eb5de2 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -56,21 +56,21 @@
 
 
 #ifndef TQT_H
-#include "tqabstractlayout.h"
+#include "tqabstracttqlayout.h"
 #endif // TQT_H
 
 #ifndef TQT_NO_LAYOUT
 struct QLayoutStruct
 {
-    void initParameters() { minimumSize = sizeHint = 0;
-    maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
+    void initParameters() { tqminimumSize = tqsizeHint = 0;
+    tqmaximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
     //permanent storage:
     int stretch;
     //parameters:
-    TQCOORD sizeHint;
-    TQCOORD maximumSize;
-    TQCOORD minimumSize;
+    TQCOORD tqsizeHint;
+    TQCOORD tqmaximumSize;
+    TQCOORD tqminimumSize;
     bool expansive;
     bool empty;
     //temporary storage:
diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index 02e01249f..edcba8c94 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 alignment boundry for structures.
+** and 8-byte tqalignment boundry for structures.
 */
 #define ROUNDUP(X)  ((X+3) & ~3)
 
@@ -726,7 +726,7 @@ int sqliteBtreeOpen(
 }
 
 /*
-** Close an open database and invalidate all cursors.
+** Close an open database and tqinvalidate 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 children of the given page to be the given page.
+** Reparent all tqchildren 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 children then all children of pParent are taken.
+  ** has NB or fewer tqchildren then all tqchildren 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 children of all cells.
+  ** Reparent tqchildren 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 children.  Return
+** Erase the given database page and all its tqchildren.  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 children.
-**      7.  Verify that the depth of all children is the same.
+**      6.  Recursively call checkTreePage on all tqchildren.
+**      7.  Verify that the depth of all tqchildren 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 3954fe6d4..86feaa5bd 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 children are black
+ * (1) - If a node is red, both of it's tqchildren 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 children pZ has:
+   * to do this depends on how many tqchildren pZ has:
    *
-   * 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
+   * 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
    * 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 children. If pZ is black, and not the tree root, then we
+   * NULL if pZ has no tqchildren. 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/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index 85872a5ae..79eb15e5b 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 212be42ef..4ed6c51aa 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 children.  The zerodata flag means that this page carries
+** this page has no tqchildren.  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 alignment on 64-bit architectures.
+** to force 8-byte tqalignment 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 alignment of pageSize */
+  assert( (pBt->pageSize & 7)==0 );  /* 8-byte tqalignment of pageSize */
   sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize);
   *ppBtree = pBt;
   return SQLITE_OK;
 }
 
 /*
-** Close an open database and invalidate all cursors.
+** Close an open database and tqinvalidate 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 children of page pPage. Also, if
+** Set the pointer-map entries for all tqchildren 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 children of pPage to point back
+** Change the pParent pointer of all tqchildren 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 children then all children of pParent are taken.
+  ** has NB or fewer tqchildren then all tqchildren 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
-  ** alignment */
+  ** tqalignment */
   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 alignment required */
+  assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment 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 alignment required */
+    assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */
   }
   aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
-  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */
+  assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment 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
-    ** children of cells, the right-child of the page, or overflow pages
+    ** tqchildren 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 children of all cells.
+  ** Reparent tqchildren 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 children.  Return
+** Erase the given database page and all its tqchildren.  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 children.
-**      7.  Verify that the depth of all children is the same.
+**      6.  Recursively call checkTreePage on all tqchildren.
+**      7.  Verify that the depth of all tqchildren 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 67ed7975b..9818c954b 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 invalidate all pre-compiled statements.
+    ** to tqinvalidate 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 8d9cfbbdf..ac2095525 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 children
+** 0 means continue walking the tree.  1 means do not walk tqchildren
 ** 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 alignment of TK_ and OP_ constants
+  /* Verify correct tqalignment 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 83356f433..8d6acd5c6 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 invalidate all precompiled statements.
+  ** operation to continue but tqinvalidate all precompiled statements.
   */
   p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0);
   if( p && p->iPrefEnc==enc && p->nArg==nArg ){
@@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
 ** error.
 */
 const void *sqlite3_errmsg16(sqlite3 *db){
-  /* Because all the characters in the string are in the unicode
+  /* Because all the characters in the string are in the tqunicode
   ** range 0x00-0xFF, if we pad the big-endian string with a 
   ** zero byte, we can obtain the little-endian string with
   ** &big_endian[1].
@@ -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, invalidate any pre-compiled statements.
+  ** are no active VMs, tqinvalidate any pre-compiled statements.
   */
   pColl = sqlite3FindCollSeq(db, (u8)enc, zName, strlen(zName), 0);
   if( pColl && pColl->xCmp ){
diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c
index 285d0805c..f393b423b 100644
--- a/kexi/3rdparty/kexisql3/src/os_mac.c
+++ b/kexi/3rdparty/kexisql3/src/os_mac.c
@@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c
index 2b0a00ec6..8c7291364 100644
--- a/kexi/3rdparty/kexisql3/src/os_win.c
+++ b/kexi/3rdparty/kexisql3/src/os_win.c
@@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){
 ** Convert UTF-32 to UTF-8.  Space to hold the returned string is
 ** obtained from sqliteMalloc().
 */
-static char *unicodeToUtf8(const WCHAR *zWideFilename){
+static char *tqunicodeToUtf8(const WCHAR *zWideFilename){
   int nByte;
   char *zFilename;
 
@@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){
     char *zMulti;
     WCHAR zWidePath[SQLITE_TEMPNAME_SIZE];
     GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath);
-    zMulti = unicodeToUtf8(zWidePath);
+    zMulti = tqunicodeToUtf8(zWidePath);
     if( zMulti ){
       strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30);
       zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0;
@@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){
     if( zTemp==0 ) return 0;
     GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW);
     sqliteFree(zWide);
-    zFull = unicodeToUtf8(zTemp);
+    zFull = tqunicodeToUtf8(zTemp);
     sqliteFree(zTemp);
   }else{
     nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c
index 4b981350d..60cb43bde 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
-** children.  If all children are either missing or do not refer to
+** tqchildren.  If all tqchildren 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/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c
index a0c7be877..23bfa533b 100644
--- a/kexi/3rdparty/kexisql3/src/prepare.c
+++ b/kexi/3rdparty/kexisql3/src/prepare.c
@@ -527,7 +527,7 @@ int sqlite3_prepare16(
 
   if( zTail8 && pzTail ){
     /* If sqlite3_prepare returns a tail pointer, we calculate the
-    ** equivalent pointer into the UTF-16 string by counting the unicode
+    ** equivalent pointer into the UTF-16 string by counting the tqunicode
     ** characters between zSql8 and zTail8, and then returning a pointer
     ** the same number of characters into the UTF-16 string.
     */
diff --git a/kexi/3rdparty/kexisql3/src/sqlite3.h b/kexi/3rdparty/kexisql3/src/sqlite3.h
index 414c6cac6..be29db690 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 invalidate
+** Once sqlite3_open() has been called, changing this variable will tqinvalidate
 ** the current temporary database, if any.
 */
 extern char *sqlite3_temp_directory;
diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c
index d42ab759e..5efbfe781 100644
--- a/kexi/3rdparty/kexisql3/src/utf.c
+++ b/kexi/3rdparty/kexisql3/src/utf.c
@@ -43,11 +43,11 @@
 **
 ** When converting malformed UTF-8 strings to UTF-16, one instance of the
 ** replacement character U+FFFD for each byte that cannot be interpeted as
-** part of a valid unicode character.
+** part of a valid tqunicode character.
 **
 ** When converting malformed UTF-16 strings to UTF-8, one instance of the
 ** replacement character U+FFFD for each pair of bytes that cannot be
-** interpeted as part of a valid unicode character.
+** interpeted as part of a valid tqunicode character.
 **
 ** This file contains the following public routines:
 **
@@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){
 #endif /* SQLITE_OMIT_UTF16 */
 
 /*
-** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
-** return the number of unicode characters in pZ up to (but not including)
+** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero,
+** return the number of tqunicode characters in pZ up to (but not including)
 ** the first 0x00 byte. If nByte is not less than zero, return the
-** number of unicode characters in the first nByte of pZ (or up to 
+** number of tqunicode characters in the first nByte of pZ (or up to 
 ** the first 0x00, whichever comes first).
 */
 int sqlite3utf8CharLen(const char *z, int nByte){
@@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){
 
 #ifndef SQLITE_OMIT_UTF16
 /*
-** pZ is a UTF-16 encoded unicode string. If nChar is less than zero,
+** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero,
 ** return the number of bytes up to (but not including), the first pair
 ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero,
-** then return the number of bytes in the first nChar unicode characters
+** then return the number of bytes in the first nChar tqunicode characters
 ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
 */
 int sqlite3utf16ByteLen(const void *zIn, int nChar){
diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h
index 4c732b09d..891742710 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeInt.h
+++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h
@@ -133,7 +133,7 @@ typedef struct Mem Mem;
 ** No other flags may be set in this case.
 **
 ** If the MEM_Str flag is set then Mem.z points at a string representation.
-** Usually this is encoded in the same unicode encoding as the main
+** Usually this is encoded in the same tqunicode encoding as the main
 ** database (see below for exceptions). If the MEM_Term flag is also
 ** set, then the string is nul terminated. The MEM_Int and MEM_Real 
 ** flags may coexist with the MEM_Str flag.
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index c0457ffc4..5ab2e4e67 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 children that must disable us */
+  u8 nChild;              /* Number of tqchildren 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/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index be51e60e1..8ea3b0b96 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -23,20 +23,20 @@
 #include <KoUnitWidgets.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", layout );
+    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
-    m_preview->setPageLayout( layout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
+    m_preview->setPageLayout( tqlayout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index b9dcd6c26..8ebac1b2e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param layout the page layout that the preview should be initialzed with.
+     * @param tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
-     * Update the page preview widget with the param layout.
-     * @param layout the new layout
+     * Update the page preview widget with the param tqlayout.
+     * @param tqlayout the new tqlayout
      */
-    void setLayout(KoPageLayout &layout);
+    void setLayout(KoPageLayout &tqlayout);
 public slots:
 
     /**
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 07cced255..325fe45e7 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
index 5878ead52..002969573 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp
@@ -20,7 +20,7 @@
 #include <KoPageLayoutHeader.moc>
 #include <KoUnitWidgets.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index 7f36378e4..b3bd79783 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index 83cdfbb0b..649f4c26f 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -27,15 +27,15 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent) {
-    m_layout = layout;
+    m_layout = tqlayout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -60,7 +60,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
@@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
@@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
     grid1->addWidget( spacer1, 4, 0 );
     grid1->addWidget( spacer2, 4, 1 );
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 8e5035511..06c08517f 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param layout the page layout that this widget should be initialzed with.
+     * @param tqlayout the page tqlayout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -76,11 +76,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param layout the update layout structure with currently displayed info.
+     * @param tqlayout the update tqlayout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &layout);
+    void propertyChange(KoPageLayout &tqlayout);
 
 protected:
     TQComboBox *cpgUnit;
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index a88e3bcd6..3541e6ea2 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -133,7 +133,7 @@ void KoGlobal::createListOfLanguages()
     // currently have en_GB or en_US etc.
 
     const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
-                                                            TQString::fromLatin1("*/entry.desktop"));
+                                                            TQString::tqfromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
     {
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 316eba19c..7888ba7de 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const
 
 void KoPageLayout::loadOasis(const TQDomElement &style)
 {
-    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
     if ( !properties.isNull() )
     {
         ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
 
 KoPageLayout KoPageLayout::standardLayout()
 {
-    KoPageLayout layout;
-    layout.format = KoPageFormat::defaultFormat();
-    layout.orientation = PG_PORTRAIT;
-    layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
-    layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
-    layout.ptLeft = MM_TO_POINT( 20.0 );
-    layout.ptRight = MM_TO_POINT( 20.0 );
-    layout.ptTop = MM_TO_POINT( 20.0 );
-    layout.ptBottom = MM_TO_POINT( 20.0 ); 
-    return layout;
+    KoPageLayout tqlayout;
+    tqlayout.format = KoPageFormat::defaultFormat();
+    tqlayout.orientation = PG_PORTRAIT;
+    tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
+    tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
+    tqlayout.ptLeft = MM_TO_POINT( 20.0 );
+    tqlayout.ptRight = MM_TO_POINT( 20.0 );
+    tqlayout.ptTop = MM_TO_POINT( 20.0 );
+    tqlayout.ptBottom = MM_TO_POINT( 20.0 ); 
+    return tqlayout;
 }
 
 struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
             return KPrinter::A4;
     }
     else if ( format <= PG_LAST_FORMAT )
@@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
 TQString KoPageFormat::formatString( KoFormat format )
 {
     if ( format <= PG_LAST_FORMAT )
-        return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::fromLatin1( "A4" );
+        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::tqfromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
             return pageFormatInfo[ i ].format;
     }
     // We do not know the format name, so we have a custom format
diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h
index eb922846b..724f9275a 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.h
+++ b/kexi/3rdparty/kolibs/koPageLayout.h
@@ -156,7 +156,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page layout, including
+ * This structure defines the page tqlayout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -193,18 +193,18 @@ struct KoPageLayout
 
 #ifndef SIMPLE_KOLIBS
     /**
-     * Save this page layout to OASIS.
+     * Save this page tqlayout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page layout from OASIS
+     * Load this page tqlayout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 #endif
 
     /**
-     * @return a page layout with the default page size depending on the locale settings,
+     * @return a page tqlayout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index b757eef92..d81d18707 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( layout );
+    setPageLayout( tqlayout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set layout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &layout )
+/*=================== set tqlayout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = layout.ptWidth * resolutionX;
-    m_pageHeight = layout.ptHeight * resolutionY;
+    m_pageWidth = tqlayout.ptWidth * resolutionX;
+    m_pageHeight = tqlayout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &layout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = layout.ptLeft * resolutionX * z;
-    m_textFrameY = layout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
+    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
+    m_textFrameY = tqlayout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
 
-    repaint( true );
+    tqrepaint( true );
 }
 
-/*=================== set layout =================================*/
+/*=================== set tqlayout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    repaint( true );
+    tqrepaint( true );
 }
 
 /*======================== draw contents =========================*/
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& layout,
+                                  const KoPageLayout& tqlayout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = layout;
+    m_layout = tqlayout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& layout,
+                  const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = layout;
+    m_layout = tqlayout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumn
     return res;
 }
 
-/*===================== get a standard page layout ===============*/
+/*===================== get a standard page tqlayout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
-    m_layout.ptWidth = layout.ptWidth;
-    m_layout.ptHeight = layout.ptHeight;
-    m_layout.ptLeft = layout.ptLeft;
-    m_layout.ptRight = layout.ptRight;
-    m_layout.ptTop = layout.ptTop;
-    m_layout.ptBottom = layout.ptBottom;
-    m_layout.format = layout.format;
-    m_layout.orientation = layout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
+    m_layout.ptWidth = tqlayout.ptWidth;
+    m_layout.ptHeight = tqlayout.ptHeight;
+    m_layout.ptLeft = tqlayout.ptLeft;
+    m_layout.ptRight = tqlayout.ptRight;
+    m_layout.ptTop = tqlayout.ptTop;
+    m_layout.ptBottom = tqlayout.ptBottom;
+    m_layout.format = tqlayout.format;
+    m_layout.orientation = tqlayout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(layout);
+        m_columnsTab->setLayout(tqlayout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->layout()->setSpacing(KDialog::spacingHint());
-    gHead->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
+    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
+    gHead->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->layout()->setSpacing(KDialog::spacingHint());
-    gFoot->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
+    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
+    gFoot->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->layout()->setMargin(0);
+    m_columnsTab->tqlayout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->layout()->setMargin(0);
+    m_headerTab->tqlayout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 1ed23ec51..21fe7df34 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page layout
+     *  set page tqlayout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the layout of the paper during printing.
+ *  With this dialog the user can specify the tqlayout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param layout   The layout.
+     *  @param tqlayout   The tqlayout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& layout,
+             const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param layout     The layout.
+     *  @param tqlayout     The tqlayout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& layout,
+             const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page layout.
+     *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the layout
+     *  Returns the tqlayout
      */
-    const KoPageLayout& layout() const { return m_layout; }
+    const KoPageLayout& tqlayout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // layout
+    // tqlayout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &layout);
+    void sizeUpdated(KoPageLayout &tqlayout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index e8dd16ff6..506e24e15 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 {
     if ( ok )
         *ok = true;
-    if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM;
-    if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM;
-    if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM;
-    if ( _unitName == TQString::fromLatin1( "in" )
-         || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH;
-    if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI;
-    if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD;
-    if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC;
-    if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT;
+    if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM;
+    if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM;
+    if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM;
+    if ( _unitName == TQString::tqfromLatin1( "in" )
+         || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH;
+    if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI;
+    if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD;
+    if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC;
+    if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT;
     if ( ok )
         *ok = false;
     return U_PT;
@@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 
 TQString KoUnit::unitName( Unit _unit )
 {
-    if ( _unit == U_MM ) return TQString::fromLatin1( "mm" );
-    if ( _unit == U_CM ) return TQString::fromLatin1( "cm" );
-    if ( _unit == U_DM ) return TQString::fromLatin1( "dm" );
-    if ( _unit == U_INCH ) return TQString::fromLatin1( "in" );
-    if ( _unit == U_PI ) return TQString::fromLatin1( "pi" );
-    if ( _unit == U_DD ) return TQString::fromLatin1( "dd" );
-    if ( _unit == U_CC ) return TQString::fromLatin1( "cc" );
-    return TQString::fromLatin1( "pt" );
+    if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" );
+    if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" );
+    if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" );
+    if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" );
+    if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" );
+    if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" );
+    if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" );
+    return TQString::tqfromLatin1( "pt" );
 }
 
 #ifndef SIMPLE_KOLIBS
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 9943ee7ef..16ec9a557 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 // ----------------------------------------------------------------
@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -222,7 +222,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -234,7 +234,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( unit );
@@ -286,7 +286,7 @@ double KoUnitDoubleLineEdit::value( void ) const
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    lineEdit()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -299,7 +299,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    lineEdit()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
@@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index e297ee523..24cd08e83 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -172,47 +172,47 @@ TQString Kexi::msgYouCanImproveData() {
 
 //--------------------------------------------------------------------------------
 
-ObjectStatus::ObjectStatus()
+ObjecttqStatus::ObjecttqStatus()
 : msgHandler(0)
 {
 }
 
-ObjectStatus::ObjectStatus(const TQString& message, const TQString& description)
+ObjecttqStatus::ObjecttqStatus(const TQString& message, const TQString& description)
 : msgHandler(0)
 {
-	setStatus(message, description);
+	settqStatus(message, description);
 }
 
-ObjectStatus::ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
+ObjecttqStatus::ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
 : msgHandler(0)
 {
-	setStatus(dbObject, message, description);
+	settqStatus(dbObject, message, description);
 }
 
-ObjectStatus::~ObjectStatus()
+ObjecttqStatus::~ObjecttqStatus()
 {
 	delete msgHandler;
 }
 
-const ObjectStatus& ObjectStatus::status() const
+const ObjecttqStatus& ObjecttqStatus::status() const
 {
 	return *this;
 }
 
-bool ObjectStatus::error() const
+bool ObjecttqStatus::error() const
 {
 	return !message.isEmpty() 
 		|| (dynamic_cast<KexiDB::Object*>((TQObject*)dbObj) && dynamic_cast<KexiDB::Object*>((TQObject*)dbObj)->error());
 }
 
-void ObjectStatus::setStatus(const TQString& message, const TQString& description)
+void ObjecttqStatus::settqStatus(const TQString& message, const TQString& description)
 {
 	this->dbObj=0;
 	this->message=message;
 	this->description=description;
 }
 
-void ObjectStatus::setStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
+void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description)
 {
 	if (dynamic_cast<TQObject*>(dbObject)) {
 		dbObj = dynamic_cast<TQObject*>(dbObject);
@@ -221,7 +221,7 @@ void ObjectStatus::setStatus(KexiDB::Object* dbObject, const TQString& message,
 	this->description=description;
 }
 
-void ObjectStatus::setStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description)
+void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description)
 {
 	if (result) {
 		if (message.isEmpty())
@@ -235,41 +235,41 @@ void ObjectStatus::setStatus(KexiDB::ResultInfo* result, const TQString& message
 			this->description = description + " " + result->desc;
 	}
 	else
-		clearStatus();
+		cleartqStatus();
 }
 
-void ObjectStatus::setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
+void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
 	const TQString& message, const TQString& description)
 {
 	if (!dbObject)
-		setStatus(result, message, description);
+		settqStatus(result, message, description);
 	else if (!result)
-		setStatus(dbObject, message, description);
+		settqStatus(dbObject, message, description);
 	else {
-		setStatus(dbObject, message, description);
-		setStatus(result, this->message, this->description);
+		settqStatus(dbObject, message, description);
+		settqStatus(result, this->message, this->description);
 	}
 }
 
-void ObjectStatus::clearStatus()
+void ObjecttqStatus::cleartqStatus()
 {
 	message=TQString();
 	description=TQString();
 }
 
-TQString ObjectStatus::singleStatusString() const { 
+TQString ObjecttqStatus::singleStatusString() const { 
 	if (message.isEmpty() || description.isEmpty())
 		return message;
 	return message + " " + description;
 }
 
-void ObjectStatus::append( const ObjectStatus& otherStatus ) {
+void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) {
 	if (message.isEmpty()) {
-		message = otherStatus.message;
-		description = otherStatus.description;
+		message = othertqStatus.message;
+		description = othertqStatus.description;
 		return;
 	}
-	const TQString s( otherStatus.singleStatusString() );
+	const TQString s( othertqStatus.singleStatusString() );
 	if (s.isEmpty())
 		return;
 	if (description.isEmpty()) {
@@ -283,7 +283,7 @@ void ObjectStatus::append( const ObjectStatus& otherStatus ) {
 class ObjectStatusMessageHandler : public KexiDB::MessageHandler
 {
 	public:
-		ObjectStatusMessageHandler(ObjectStatus *status) 
+		ObjectStatusMessageHandler(ObjecttqStatus *status) 
 			: KexiDB::MessageHandler()
 			, m_status(status)
 		{
@@ -295,18 +295,18 @@ class ObjectStatusMessageHandler : public KexiDB::MessageHandler
 		virtual void showErrorMessage(const TQString &title, 
 			const TQString &details = TQString())
 		{
-			m_status->setStatus(title, details);
+			m_status->settqStatus(title, details);
 		}
 		
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString())
 		{
-			m_status->setStatus(obj, msg);
+			m_status->settqStatus(obj, msg);
 		}
 
-		ObjectStatus *m_status;
+		ObjecttqStatus *m_status;
 };
 
-ObjectStatus::operator KexiDB::MessageHandler*()
+ObjecttqStatus::operator KexiDB::MessageHandler*()
 {
 	if (!msgHandler)
 		msgHandler = new ObjectStatusMessageHandler(this);
@@ -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.")
-			.arg(KEXI_VERSION_STRING)
-			.arg(KEXI_APP_NAME); 
+			.tqarg(KEXI_VERSION_STRING)
+			.tqarg(KEXI_APP_NAME); 
 	else {
 		TQString feature_name_(feature_name);
 		msg = i18n("\"%1\" function is not available for version %2 of %3 application.")
-			.arg(feature_name_.replace("&",""))
-			.arg(KEXI_VERSION_STRING)
-			.arg(KEXI_APP_NAME);
+			.tqarg(feature_name_.replace("&",""))
+			.tqarg(KEXI_VERSION_STRING)
+			.tqarg(KEXI_APP_NAME);
 	}
 
 	TQString extra_text_(extra_text);
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 5a6804a53..426854e64 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -87,43 +87,43 @@ namespace Kexi
 	KEXICORE_EXPORT TQFont smallFont(TQWidget *init = 0);
 
 	/*! Helper class for storing object status. */
-	class KEXICORE_EXPORT ObjectStatus
+	class KEXICORE_EXPORT ObjecttqStatus
 	{
 		public:
-			ObjectStatus();
+			ObjecttqStatus();
 
-			ObjectStatus(const TQString& message, const TQString& description);
+			ObjecttqStatus(const TQString& message, const TQString& description);
 
-			ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description);
+			ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description);
 
-			~ObjectStatus();
+			~ObjecttqStatus();
 
-			const ObjectStatus& status() const;
+			const ObjecttqStatus& status() const;
 
 			bool error() const;
 
-			void setStatus(const TQString& message, const TQString& description);
+			void settqStatus(const TQString& message, const TQString& description);
 
 			//! Note: for safety, \a dbObject needs to be derived from TQObject, 
 			//! otherwise it won't be assigned
-			void setStatus(KexiDB::Object* dbObject, 
+			void settqStatus(KexiDB::Object* dbObject, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void setStatus(KexiDB::ResultInfo* result, 
+			void settqStatus(KexiDB::ResultInfo* result, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
+			void settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, 
 				const TQString& message = TQString(), const TQString& description = TQString());
 
-			void clearStatus();
+			void cleartqStatus();
 
 			TQString singleStatusString() const;
 
-			void append( const ObjectStatus& otherStatus );
+			void append( const ObjecttqStatus& othertqStatus );
 
 			KexiDB::Object *dbObject() const { return dynamic_cast<KexiDB::Object*>((TQObject*)dbObj); }
 
-			//! Helper returning pseudo handler that just updates this ObjectStatus object 
+			//! Helper returning pseudo handler that just updates this ObjecttqStatus object 
 			//! by receiving a message
 			operator KexiDB::MessageHandler*();
 
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 851a4d3a9..49cbeb3b7 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 children...
+		//try in tqchildren...
 		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 children...
+		//not supported explicitly - try in tqchildren...
 		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 children...
+		//not supported explicitly - try in tqchildren...
 		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 163efced6..facb09b3d 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 children (in unspecified order) to and call 
+		 we start to iterate over proxy tqchildren (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/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp
index aeb621c41..a4c57791c 100644
--- a/kexi/core/kexiblobbuffer.cpp
+++ b/kexi/core/kexiblobbuffer.cpp
@@ -289,7 +289,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored)
 		KexiDB::RowData rowData;
 		tristate res = d->conn->querySingleRecord(
 			schema,
-//			TQString::fromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=")
+//			TQString::tqfromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=")
 //			+TQString::number(id), 
 			rowData); 
 		if (res!=true || rowData.size()<4) {
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index 4ec99e530..e806aaafb 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 01f0adb33..451eb66a9 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\".").arg(group).arg(type)
+		//ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").tqarg(group).tqarg(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.arg(number))) //a new group key couldn't exist
+			while (config.hasGroup(groupPrefix.tqarg(number))) //a new group key couldn't exist
 				number++;
-			groupKey = groupPrefix.arg(number);
+			groupKey = groupPrefix.tqarg(number);
 		}
 		if (_groupKey) //return this one (generated or found)
 			*_groupKey = groupKey;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 67e81a5da..ff642741a 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -117,20 +117,20 @@ void KexiDialogBase::removeView(int mode)
 	m_openedViewModes ^= mode;
 }
 
-TQSize KexiDialogBase::minimumSizeHint() const
+TQSize KexiDialogBase::tqminimumSizeHint() const
 {
 	KexiViewBase *v = selectedView();
 	if (!v)
-		return KMdiChildView::minimumSizeHint();
-	return v->minimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0);
+		return KMdiChildView::tqminimumSizeHint();
+	return v->tqminimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0);
 }
 
-TQSize KexiDialogBase::sizeHint() const
+TQSize KexiDialogBase::tqsizeHint() const
 {
 	KexiViewBase *v = selectedView();
 	if (!v)
-		return KMdiChildView::sizeHint();
-	return v->preferredSizeHint( v->sizeHint() );
+		return KMdiChildView::tqsizeHint();
+	return v->preferredSizeHint( v->tqsizeHint() );
 }
 
 /*
@@ -377,9 +377,9 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 		delete newView;
 		kdDebug() << "Switching to mode " << newViewMode << " failed. Previous mode "
 			<< prevViewMode << " restored." << endl;
-		const Kexi::ObjectStatus status(*this);
-		setStatus(mainWin()->project()->dbConnection(), 
-			i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(newViewMode)),"");
+		const Kexi::ObjecttqStatus status(*this);
+		settqStatus(mainWin()->project()->dbConnection(), 
+			i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),"");
 		append( status );
 		m_currentViewMode = prevViewMode;
 		return false;
@@ -517,7 +517,7 @@ tristate KexiDialogBase::storeNewData()
 	if (cancel)
 		return cancelled;
 	if (!m_schemaData) {
-		setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),"");
+		settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),"");
 		return false;
 	}
 
@@ -594,7 +594,7 @@ tristate KexiDialogBase::storeData(bool dontAsk)
 		return false;
 
 #define storeData_ERR \
-	setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),"");
+	settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),"");
 
 	//save changes using transaction
 	KexiDB::Transaction transaction = m_parentWindow->project()->dbConnection()->beginTransaction();
@@ -624,8 +624,8 @@ tristate KexiDialogBase::storeData(bool dontAsk)
 void KexiDialogBase::activate()
 {
 	KexiViewBase *v = selectedView();
-	//kdDebug() << "focusWidget(): " << focusWidget()->name() << endl;
-	if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget()))
+	//kdDebug() << "tqfocusWidget(): " << tqfocusWidget()->name() << endl;
+	if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//tqfocusWidget()))
 		KMdiChildView::activate();
 	else {//ah, focused widget is not in this view, move focus:
 		if (v)
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index d98e9d04f..6449004b8 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiDialogTempData : public TQObject
 class KEXICORE_EXPORT KexiDialogBase :
 	public KMdiChildView,
 	public KexiActionProxy,
-	public Kexi::ObjectStatus
+	public Kexi::ObjecttqStatus
 {
 	Q_OBJECT
   TQ_OBJECT
@@ -101,10 +101,10 @@ class KEXICORE_EXPORT KexiDialogBase :
 //		virtual TQWidget* mainWidget() = 0;
 
 		/*! reimplemented: minimum size hint is inherited from currently visible view. */
-		virtual TQSize minimumSizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 
 		/*! reimplemented: size hint is inherited from currently visible view. */
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		KexiMainWindow *mainWin() const { return m_parentWindow; }
 
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 5b2b2791b..4121543e4 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -77,13 +77,13 @@ void KexiGUIMessageHandler::showErrorMessage(const TQString &msg, const TQString
 }
 
 void
-KexiGUIMessageHandler::showErrorMessage(Kexi::ObjectStatus *status)
+KexiGUIMessageHandler::showErrorMessage(Kexi::ObjecttqStatus *status)
 {
 	showErrorMessage("", status);
 }
 
 void
-KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjectStatus *status)
+KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status)
 {
 	if (status && status->error()) {
 		TQString msg(message);
@@ -106,7 +106,7 @@ KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjectSta
 	else {
 		showErrorMessage(message);
 	}
-	status->clearStatus();
+	status->cleartqStatus();
 }
 
 void
diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h
index 362884dcf..af407ab16 100644
--- a/kexi/core/kexiguimsghandler.h
+++ b/kexi/core/kexiguimsghandler.h
@@ -32,8 +32,8 @@ class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler
 		virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString());
 
 		void showErrorMessage(const TQString&,const TQString&,KexiDB::Object *obj);
-		void showErrorMessage(Kexi::ObjectStatus *status);
-		void showErrorMessage(const TQString &message, Kexi::ObjectStatus *status);
+		void showErrorMessage(Kexi::ObjecttqStatus *status);
+		void showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status);
 
 		/*! Displays a "Sorry" message with \a title text and optional \a details. */
 		void showSorryMessage(const TQString &title, const TQString &details = TQString());
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 49b3c46d4..93d73cacc 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.").arg(partName));
+						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName));
 				}
 				else
 					m_parts.insert(partName, part);
@@ -118,8 +118,8 @@ KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
 	dlg->addView(view);
 	dlg->setCaption( view->caption() );
 	dlg->setTabCaption( view->caption() );
-	dlg->resize(view->sizeHint());
-	dlg->setMinimumSize(view->minimumSizeHint().width(),view->minimumSizeHint().height());
+	dlg->resize(view->tqsizeHint());
+	dlg->setMinimumSize(view->tqminimumSizeHint().width(),view->tqminimumSizeHint().height());
 	dlg->setId( mainWin->generatePrivateID() );
 	dlg->registerDialog();
 	return dlg;
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 49f1aeab2..ba54fea71 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.").arg(item.name())
+					? i18n("Object \"%1\" could not be opened in Design View.").tqarg(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()))
@@ -242,11 +242,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 		d->instanceActionsInitialized = true;
 	}
 
-	m_status.clearStatus();
+	m_status.cleartqStatus();
 //	KexiDialogBase *dlg = createInstance(win,item,viewMode);
 //	if (!dlg)
 //		return 0;
-//	TQString capt = TQString("%1 : %2").arg(item.name()).arg(instanceName());
+//	TQString capt = TQString("%1 : %2").tqarg(item.name()).tqarg(instanceName());
 	KexiDialogBase *dlg = new KexiDialogBase(win);
 	dlg->m_supportedViewModes = m_supportedViewModes;
 //	dlg->m_neverSaved = item.neverSaved();
@@ -289,11 +289,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 		}
 		if (!dlg->m_schemaData) {
 			if (!m_status.error())
-				m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), 
+				m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), 
 					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.")
-				.arg(item.name()), TQString()) );
+				Kexi::ObjecttqStatus(i18n("You can delete \"%1\" object and create it again.")
+				.tqarg(item.name()), TQString()) );
 
 			dlg->close();
 			delete dlg;
@@ -339,9 +339,9 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
 	dlg->show();
 
 	if (dlg->mdiParent() && dlg->mdiParent()->state()==KMdiChildFrm::Normal) //only resize dialog if it is in normal state
-		dlg->resize(dlg->sizeHint());
+		dlg->resize(dlg->tqsizeHint());
 
-	dlg->setMinimumSize(dlg->minimumSizeHint().width(),dlg->minimumSizeHint().height());
+	dlg->setMinimumSize(dlg->tqminimumSizeHint().width(),dlg->tqminimumSizeHint().height());
 
 	//dirty only if it's a new object
 	if (dlg->selectedView())
@@ -366,8 +366,8 @@ KexiDB::SchemaData* Part::loadSchemaData(KexiDialogBase * /*dlg*/, const KexiDB:
 bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQString& dataID)
 {
 	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\".").arg(dataID) );
+		m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), 
+			i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) );
 		m_status.append( *dlg );
 		return false;
 	}
@@ -431,11 +431,11 @@ 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").arg(nameSuffix) : TQString())).latin1() )
+    + (nameSuffix ? TQString(":%1").tqarg(nameSuffix) : TQString())).latin1() )
  , KXMLGUIClient(win)
 {
 	if(!win->project()->data()->userMode())
-		setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName()
+		setXMLFile(TQString::tqfromLatin1("kexi")+part->info()->objectName()
 			+"part"+(partInstanceClient?"inst":"")+"ui.rc");
 
 //	new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, 
diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h
index c448b8bf9..f1168fd46 100644
--- a/kexi/core/kexipart.h
+++ b/kexi/core/kexipart.h
@@ -186,7 +186,7 @@ class KEXICORE_EXPORT Part : public TQObject
 		/*! \return action collection for mode \a viewMode. */
 		KActionCollection* actionCollectionForMode(int viewMode) const;
 
-		const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; }
+		const Kexi::ObjecttqStatus& lastOperationtqStatus() const { return m_status; }
 
 		/*! \return i18n'd message translated from \a englishMessage.
 		 This method is useful for messages like: 
@@ -309,7 +309,7 @@ class KEXICORE_EXPORT Part : public TQObject
 		GUIClient *m_guiClient;
 		TQIntDict<GUIClient> m_instanceGuiClients;
 		KexiMainWindow* m_mainWin;
-		Kexi::ObjectStatus m_status;
+		Kexi::ObjecttqStatus m_status;
 
 		/*! If you're implementing a new part, set this to value >0 in your ctor 
 		 if you have well known (ie registered ID) for your part.
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index d651f8d0e..f6fcd7d89 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\"").arg(i->objectName()));
+			i->setBroken(true, i18n("Error while loading plugin \"%1\"").tqarg(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\"").arg(mimeType));
+	setError(i18n("No plugin for mime type \"%1\"").tqarg(mimeType));
 	return 0;
 }
 
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 1dbe4eefa..159de7506 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\".").arg(d->data->databaseName()));
+		i18n("Could not open project \"%1\".").tqarg(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\".").arg(d->data->databaseName()));
+		i18n("Could not create project \"%1\".").tqarg(d->data->databaseName()));
 		
 	if (!createConnection())
 		return false;
@@ -381,10 +381,10 @@ bool KexiProject::createInternalStructures(bool insideTransaction)
 			}
 			// 2.1 copy data (insert 0's into o_folder_id column)
 			if (!d->connection->executeSQL(
-					TQString::fromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) "
+					TQString::tqfromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) "
 					"SELECT o_data, o_name, o_caption, o_mime, 0 FROM kexi__blobs") )
 				// 2.2 remove the original kexi__blobs
-				|| !d->connection->executeSQL(TQString::fromLatin1("DROP TABLE kexi__blobs")) //lowlevel
+				|| !d->connection->executeSQL(TQString::tqfromLatin1("DROP TABLE kexi__blobs")) //lowlevel
 				// 2.3 rename the copy back into kexi__blobs
 				|| !d->connection->drv_alterTableName(*kexi__blobsCopy, "kexi__blobs")
 				)
@@ -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.arg("project_caption"), data ) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.tqarg("project_caption"), data ) && !data[0].toString().isEmpty())
 		d->data->setCaption(data[0].toString());
-	if (d->connection->querySingleRecord( sql.arg("project_desc"), data) && !data[0].toString().isEmpty())
+	if (d->connection->querySingleRecord( sql.tqarg("project_desc"), data) && !data[0].toString().isEmpty())
 		d->data->setDescription(data[0].toString());*/
 
 	return true;
@@ -735,10 +735,10 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite
 		return 0;
 	KexiDialogBase *dlg  = part->openInstance(wnd, item, viewMode, staticObjectArgs);
 	if (!dlg) {
-		if (part->lastOperationStatus().error())
-			setError(i18n("Opening object \"%1\" failed.").arg(item.name())+"<br>"
-				+part->lastOperationStatus().message, 
-				part->lastOperationStatus().description);
+		if (part->lastOperationtqStatus().error())
+			setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>"
+				+part->lastOperationtqStatus().message, 
+				part->lastOperationtqStatus().description);
 		return 0;
 	}
 	return dlg;
@@ -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.")
-				.arg(newName) );
+				.tqarg(newName) );
 			return false;
 		}
 	}
 
 	KexiDB::MessageTitle et(this, 
-		i18n("Could not rename object \"%1\".").arg(item.name()) );
+		i18n("Could not rename object \"%1\".").tqarg(item.name()) );
 	if (!checkWritable())
 		return false;
 	KexiPart::Part *part = findPartFor(item);
@@ -835,7 +835,7 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const
 		return false;
 	}
 	if (!part->rename(wnd, item, newName)) {
-		setError(part->lastOperationStatus().message, part->lastOperationStatus().description);
+		setError(part->lastOperationtqStatus().message, part->lastOperationtqStatus().description);
 		return false;
 	}
 	if (!d->connection->executeSQL( "update kexi__objects set o_name="
@@ -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?")
-				.arg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
+				.tqarg(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\"?").arg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
+		i18n("Do you want to drop the project \"%1\"?").tqarg(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 9b9203c8f..9f0106bcf 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\"").arg(databaseName()) + (nobr ? "</nobr>" : "")
+		return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").tqarg(databaseName()) + (nobr ? "</nobr>" : "")
 			+ (nobr ? " <nobr>" : " ") + i18n("database connection", "(connection %1)")
-			.arg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
+			.tqarg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
 	}
 	//file-based
 	return TQString(nobr ? "<nobr>" : "") 
-		+ TQString("\"%1\"").arg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
+		+ TQString("\"%1\"").tqarg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
 }
 
 void KexiProjectData::setReadOnly(bool set)
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 1ba85265b..6a696461f 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -42,7 +42,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h
 
 void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
 {
-	TQWidget *w = host->focusWindow(); //focusWidget();
+	TQWidget *w = host->focusWindow(); //tqfocusWidget();
 //	while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase"))
 //		w = w->parentWidget();
 
@@ -111,7 +111,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
 	}*/
 	if (!d)
 		return; //sanity
-	TQWidget *fw = d->mainWin->focusWidget();
+	TQWidget *fw = d->mainWin->tqfocusWidget();
 	while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
 		fw = fw->parentWidget();
 	if (!fw)
@@ -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 invalidate action if it comes from mainwindow's KActionCollection
+			// only tqinvalidate action if it comes from mainwindow's KActionCollection
 			// (thus part-actions are untouched when the focus is e.g. in the Property Editor)
 			continue;
 		}
@@ -205,7 +205,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
 		TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow());
 		if (!aw)
 			aw = d->mainWin;
-		fw = aw->focusWidget();
+		fw = aw->tqfocusWidget();
 	}
 	while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
 		fw = fw->parentWidget();
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index c7fcb1814..91cc09f4e 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -69,7 +69,7 @@ class KEXICORE_EXPORT KexiSharedActionHost
 		 */
 		virtual bool acceptsSharedActions(TQObject *o);
 
-		/*! \return window widget that is currently focused (using TQWidget::focusWidget())
+		/*! \return window widget that is currently focused (using TQWidget::tqfocusWidget())
 		 and matches acceptsSharedActions(). If focused widget does not match,
 		 it's parent, grandparent, and so on is checked. If all this fails, 
 		 or no widget has focus, NULL is returned. 
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index 65f2e68fe..e89f4a4ea 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -214,26 +214,26 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 //		//hp==true if currently focused widget is a child of this table view
-//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget());
+//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
 		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
-			if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) {
+			if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) {
 				//focus out: when currently focused widget is not a parent of this view
 				emit focus(false);
 			} else if (e->type()==TQEvent::FocusIn) {
 				emit focus(true);
 			}
-			if (e->type()==TQEvent::FocusOut) { // && focusWidget() && Kexi::hasParent( this, focusWidget())) { // && focusWidget()->inherits("KexiViewBase")) {
-//				kdDebug() << focusWidget()->className() << " " << focusWidget()->name()<< endl;
+			if (e->type()==TQEvent::FocusOut) { // && tqfocusWidget() && Kexi::hasParent( this, tqfocusWidget())) { // && tqfocusWidget()->inherits("KexiViewBase")) {
+//				kdDebug() << tqfocusWidget()->className() << " " << tqfocusWidget()->name()<< endl;
 //				kdDebug() << o->className() << " " << o->name()<< endl;
 				KexiViewBase *v = KexiUtils::findParent<KexiViewBase>(o, "KexiViewBase") ;
-//				TQWidget *www=v->focusWidget();
+//				TQWidget *www=v->tqfocusWidget();
 				if (v) {
 					while (v->m_parentView)
 						v = v->m_parentView;
-					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) ))
-						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget());
-//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget();
+					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->tqfocusWidget()) ))
+						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->tqfocusWidget());
+//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //tqfocusWidget();
 				}
 			}
 
@@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy)
 
 void KexiViewBase::addChildView( KexiViewBase* childView )
 {
-	m_children.append( childView );
+	m_tqchildren.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 children :)
- 	for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) {
+	//do the same for tqchildren :)
+ 	for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) {
 		it.current()->updateActions(activated);
 	}
 }
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 564f5a207..139f0b2d0 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 
 		/*! \return preferred size hint, that can be used to resize the view.
 		 It is computed using maximum of (a) \a otherSize and (b) current KMDI dock area's size,
-		 so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::sizeHint().
+		 so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::tqsizeHint().
 		 If you reimplement this method, do not forget to return value of
 		 yoursize.boundedTo( KexiViewBase::preferredSizeHint(otherSize) ). */
 		virtual TQSize preferredSizeHint(const TQSize& otherSize);
@@ -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_children;
+		TQPtrList<KexiViewBase> m_tqchildren;
 
 		bool m_dirty : 1;
 
diff --git a/kexi/doc/common/kde-default.css b/kexi/doc/common/kde-default.css
index 032a00db5..59366d386 100644
--- a/kexi/doc/common/kde-default.css
+++ b/kexi/doc/common/kde-default.css
@@ -90,7 +90,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
 TABLE.programlisting
 TABLE.screen { border-style: none;
                background-color: rgb(224,224,224);
-               table-layout: auto; /* 100%? */
+               table-tqlayout: auto; /* 100%? */
                color: rgb(0,0,0); /* should be inherit */
                }
 
@@ -99,7 +99,7 @@ TABLE.screen { border-style: none;
 TABLE[class~=programlisting]
 TABLE[class~=screen] { border-style: none;
                        background-color: rgb(224,224,224);
-                       table-layout: auto;
+                       table-tqlayout: auto;
                        color: inherit;
                        }
 */
diff --git a/kexi/doc/common/kde-web.css b/kexi/doc/common/kde-web.css
index e61fa32a0..dfd98e8b2 100644
--- a/kexi/doc/common/kde-web.css
+++ b/kexi/doc/common/kde-web.css
@@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
 TABLE.programlisting
 TABLE.screen { border-style: none;
                background-color: rgb(224,224,224);
-               table-layout: auto; /* 100%? */
+               table-tqlayout: auto; /* 100%? */
                color: rgb(0,0,0); /* should be inherit */
                }
 
@@ -94,7 +94,7 @@ TABLE.screen { border-style: none;
 TABLE[class~=programlisting]
 TABLE[class~=screen] { border-style: none;
                        background-color: rgb(224,224,224);
-                       table-layout: auto;
+                       table-tqlayout: auto;
                        color: inherit;
                        }
 */
diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt
index 7c2dfaba3..ab713e34c 100644
--- a/kexi/doc/dev/kexi_guidelines.txt
+++ b/kexi/doc/dev/kexi_guidelines.txt
@@ -19,7 +19,7 @@ Focus on:
   convert to QString only on data displaying)
 
 Idea 3
-Directories layout:
+Directories tqlayout:
 dialogs/
 +-altertable/
 +-datatable/
diff --git a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
index e7959df74..b7b62ab97 100644
--- a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
+++ b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
@@ -168,7 +168,7 @@ In this case the very way the spreadsheet works is problematic. Fields for data
 <a name="reports"></a>
 <h4>Reports</h4>
 <p>
-Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the layout of fields.
+Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the tqlayout of fields.
 </p>
 
 <a name="programming"></a>
diff --git a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
index 14c0b5113..2953a0f05 100644
--- a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
+++ b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html
@@ -2,7 +2,7 @@
 <H2>5.1. Designing Database Tables</H2>
 
 <p>
-First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A layout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter.
+First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A tqlayout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter.
 </p>
 
 <p>
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 9cb671d13..bfab0a724 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
@@ -196,7 +196,7 @@ It is right moment for testing your form. Click the <nobr><img src="icons/state_
 To make it easier for the form's user to identify meaning of every field widget, these should have added text labels with appropriate titles. To create text labels <nobr><img src="icons/label.png" class="icon"> <em>Label</em></nobr> widget is used.
 </p>
 <p>
-Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left layout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. &quot;Persons&quot;. Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -&gt; Font</a> menu command.
+Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left tqlayout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. &quot;Persons&quot;. Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -&gt; Font</a> menu command.
 </p>
 <p>
  <br><img src="img/05_04_06_form_with_labels.png">
@@ -256,50 +256,50 @@ The following example presents a form where text fields and labels were placed b
  <br>An example form with widgets that cannot not fit in the window<br><br>
 </p>
 <p>
-Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget layout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
+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 layout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
+Using tqlayout in this form improves tqalignment. 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 layout used<br><br>
+ <br>Example form with tqlayout used<br><br>
 </p>
 <p>
-There are two methods to create widget layout.
+There are two methods to create widget tqlayout.
 <ul>
-<li>Select two or more widgets that should be placed in a common layout, and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li>
-<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common layout.</li>
+<li>Select two or more widgets that should be placed in a common tqlayout, and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li>
+<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.</li>
 </ul>
 In each of these cases you can also use <em>Format -&gt; Layout Widgets</em> menu. 
 </p>
 <p>
  <img src="img/05_04_08_form_layout_selecting.png">
- <br>Selecting widgets that will be put into a layout<br>
+ <br>Selecting widgets that will be put into a tqlayout<br>
  <br><img src="img/05_04_08_form_layout_selected.png">
  <br>Four widgets are selected<br><br>
  <br><img src="img/05_04_08_form_layout_popup.png"><br>
- <br>Using the context menu for putting the widgets into a grid layout<br><br>
+ <br>Using the context menu for putting the widgets into a grid tqlayout<br><br>
 </p>
 <p>
-Widget layout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
+Widget tqlayout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
 </p>
 <p>
  <br>
  <br><img src="img/05_04_08_form_layout_grid.png">
- <br>Widgets within a grid layout<br><br>
+ <br>Widgets within a grid tqlayout<br><br>
 </p>
 <p>
-Besides the grid type, there are other widget layout types.
+Besides the grid type, there are other widget tqlayout types.
 <ul>
 <li>vertical
  <br>
  <br><img src="img/05_04_08_form_layout_vertical.png">
- <br>Vertical widget layout<br><br>
+ <br>Vertical widget tqlayout<br><br>
 </li>
 <li>horizontal
  <br>
  <br><img src="img/05_04_08_form_layout_horizontal.png">
- <br>Horizontal widget layout<br><br>
+ <br>Horizontal widget tqlayout<br><br>
 </li>
 <!-- TODO podzia³ poziomy / pionowy 
  <br><img src="img/05_04_08_form_layout_vertical_splitter.png">
@@ -322,12 +322,12 @@ A <em>spring</em> in widget layouts is a special, invisible element allowing to
 </ol>
 </p>
 <p>
-For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal layout with the label.
+For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal tqlayout with the label.
  <br><img src="img/05_04_08_form_spring.png">
- <br>Horizontal layout containing a spring and a text label<br><br>
+ <br>Horizontal tqlayout containing a spring and a text label<br><br>
 </p>
 <p>
-To make springs work you need to create a global widget layout i.e. a layout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
+To make springs work you need to create a global widget tqlayout i.e. a tqlayout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
 </p>
 
 <a name="advanced_form_layouts"></a>
@@ -337,21 +337,21 @@ Widget layouts can be combined (or nested). On the following example you can ide
 </p>
 <p>
 <ol>
-<li>horizontal layout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
-<li>grid layout grouping widgets on the whole form</li>
+<li>horizontal tqlayout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
+<li>grid tqlayout grouping widgets on the whole form</li>
 </ol>
 </p>
 <p>
  <img src="img/05_04_08_form_advanced_layout.png">
- <br>Two widget layouts combined: horizontal layout inside of a grid layout<br><br>
+ <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
 </p>
 <p>
-The horizontal layout is treat in the example as a single widget by the grid layout - it takes exactly one &quot;cell&quot; of the grid.
+The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one &quot;cell&quot; of the grid.
 After opening a form designed this way in the data view, you can notice (by resizing the form) that:
 </p>
 <ul>
 <li>&quot;Persons&quot; text label thanks to the spring used is constantly aligned to the to the right side of the form</li>
-<li>text fields take all of the available width thanks to putting them into the grid layout</li>
+<li>text fields take all of the available width thanks to putting them into the grid tqlayout</li>
 <li>all the form's widgets are pushed to the top thanks to the spring used at the bottom of the form</li>
 </ul>
 <p>
@@ -362,24 +362,24 @@ After opening a form designed this way in the data view, you can notice (by resi
 <a name="layout_breaking"></a>
 <H4>Removing widget layouts</H4>
 <p>
-To remove widget layout without removing widgets, perform one of these actions:
+To remove widget tqlayout without removing widgets, perform one of these actions:
 <ul>
-<li>click with the &RMB; on the layout's border and select <em>Break Layout</em> command from the context menu</li>
-<li>click with the &LMB; on the layout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
+<li>click with the &RMB; on the tqlayout's border and select <em>Break Layout</em> command from the context menu</li>
+<li>click with the &LMB; on the tqlayout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
 </ul>
 </p>
 
 <H4>Notes</H4>
-<p>Removing widget layout using the <em>Break Layout</em> command will not remove widgets contained in the layout. If you want to remove the widgets as well, just select the layout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
+<p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
 </p>
 
 <a name="layout_size_types"></a>
-<H4>Size policies for widgets within a layout</H4>
+<H4>Size policies for widgets within a tqlayout</H4>
 <p>
 Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form.
 </p>
 <p>
-After putting widgets into a <em>layout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire layout itself. For example, three buttons put into the horizontal layout will be resized to fit their visible text.
+After putting widgets into a <em>tqlayout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire tqlayout itself. For example, three buttons put into the horizontal tqlayout will be resized to fit their visible text.
 </p>
 <p>
 For each widget inserted into the form, there are settings for size policy available in the <em>Property Editor</em>. The settings are presented as a group of properties called <em>Size Policy</em>.
@@ -403,12 +403,12 @@ There are following values available on the drop down list for <em>Horizontal Si
 <li><b>Fixed</b> value means that the widget cannot be automatically resized; it should maintain the constant size defined on design time (width or height),</li>
 <li><p><b>Minimum</b> value means that the original size of the widget is set as minimal allowed, it is sufficient and there is no need for expanding the widget, but the widget will be expanded if needed. This type of policy can be used to force widget to be expanded to the whole width or height, especially if you set a <em>stretch</em> value greater than 0.
  <br><img src="img/05_04_09_size_policy_minimum.png">
- <br>Text field and two buttons within a grid layout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
+ <br>Text field and two buttons within a grid tqlayout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
 </p></li>
 <li><b>Maximum</b> value means that the original size of the widget is set as maximum allowed and can be decreased without breaking the widget's usability and readability if other widgets need more space,</li>
 <li><p><b>Preferred</b> value means that the original size of the widget is the best and preferred; the widget can be shrunk or expanded however and it will stay readable,
  <br><img src="img/05_04_09_size_policy_preferred.png">
- <br>Text field and two buttons within a grid layout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
+ <br>Text field and two buttons within a grid tqlayout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
 </p></li>
 <li><b>Expanding</b> value means that the original size of the widget is reasonable but the widget can be also shrunk; it can be expanded as well to take as much space as possible,</li>
 <li><b>Minimum Expanding</b> value means that the original size of the widget is allowed; it can be expanded to take as much space as possible,</li>
@@ -432,7 +432,7 @@ The most frequently used size policies are <em>Preferred</em>, <em>Minimum</em>
 <a name="widget_adjusting"></a>
 <H3>5.4.10. Setting widgets size and position by hand</H3>
 <p>
-In case when your form has no main layout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
+In case when your form has no main tqlayout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
 </p>
 <ul>
 <li><p>Adjusting sizes of selected widgets. The commands are available in the <em>Format -&gt; Adjust Widgets Size</em> submenu of the Menubar and in the <em>Adjust Widgets Size</em> submenu of the context menu. Toolbar's drop down button <nobr><img src="icons/aogrid.png" class="icon"> <em>Adjust Widgets Size</em></nobr> is also available.
@@ -497,7 +497,7 @@ To change tab order, either:
 <li>Click a selected widget name on the widgets list and drag it to a desired position (up or down) using the mouse.
 </li>
 <li>Click a selected widget name on the widgets list and use <em>Move Up</em> or <em>Move Down</em> buttons, to move the widgets to a desired position.</li>
-<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left layout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
+<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left tqlayout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
  <br><img src="img/05_04_11_auto_tab_stop.png">
  <br>Automatic tab order for a form<br><br>
 </li>
diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt
index acc00d000..65aa60081 100644
--- a/kexi/doc/handbook/translation-status.txt
+++ b/kexi/doc/handbook/translation-status.txt
@@ -72,7 +72,7 @@ DONE    5.4.9. Widget layouts
 DONE      * Springs in widget layouts
 DONE      * Advanced widget layouts
 DONE      * Removing widget layouts
-DONE      * Size policies for widgets within a layout
+DONE      * Size policies for widgets within a tqlayout
 DONE    5.4.10. Setting widgets size and position by hand
 DONE    5.4.11. Setting the tab order
 DONE  5.5. Entering data using forms
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index 7ac415e11..b7712aa87 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="alignment" >
+<property name="tqalignment" >
 <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="alignment" >
+<property name="tqalignment" >
 <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="alignment" >
+<property name="tqalignment" >
 <set>AlignTop|AlignRight</set>
 </property>
 <property name="storedPixmapId" >
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 9f6f4cfd1..c9bad809b 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -19,7 +19,7 @@
 */
 #include <tqdom.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 #include <tqmetaobject.h>
@@ -127,7 +127,7 @@ PropertyCommand::unexecute()
 
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg);
 		TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg;
-		if (-1!=subWidget->metaObject()->findProperty( m_property, true ))
+		if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true ))
 			subWidget->setProperty(m_property, it.data());
 	}
 
@@ -139,9 +139,9 @@ TQString
 PropertyCommand::name() const
 {
 	if(m_oldvalues.count() >= 2)
-		return i18n("Change \"%1\" property for multiple widgets" ).arg(TQString(m_property));
+		return i18n("Change \"%1\" property for multiple widgets" ).tqarg(TQString(m_property));
 	else
-		return i18n("Change \"%1\" property for widget \"%2\"" ).arg(TQString(m_property)).arg(TQString(m_oldvalues.begin().key()));
+		return i18n("Change \"%1\" property for widget \"%2\"" ).tqarg(TQString(m_property)).tqarg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -435,10 +435,10 @@ AdjustSizeCommand::execute()
 		{
 			for(TQWidget *w = list.first(); w; w = list.next()) {
 				ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
-				if(item && !item->children()->isEmpty()) { // container
+				if(item && !item->tqchildren()->isEmpty()) { // container
 					TQSize s;
-					if(item->container() && item->container()->layout())
-						s = w->sizeHint();
+					if(item->container() && item->container()->tqlayout())
+						s = w->tqsizeHint();
 					else
 						s = getSizeFromChildren(item);
 					// minimum size for containers
@@ -457,9 +457,9 @@ AdjustSizeCommand::execute()
 				else if(item && item->container()) // empty container
 					w->resize(item->container()->form()->gridSize() * 5, item->container()->form()->gridSize() * 5); // basic size
 				else {
-					TQSize sizeHint(w->sizeHint());
-					if (sizeHint.isValid())
-						w->resize(sizeHint);
+					TQSize tqsizeHint(w->tqsizeHint());
+					if (tqsizeHint.isValid())
+						w->resize(tqsizeHint);
 				}
 			}
 			break;
@@ -545,17 +545,17 @@ AdjustSizeCommand::getSizeFromChildren(ObjectTreeItem *item)
 	{
 		TQSize s;
 		// get size for each container, and keep the biggest one
-		for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next())
+		for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next())
 			s = s.expandedTo(getSizeFromChildren(tree));
 		return s;
 	}
 
 	int tmpw = 0, tmph = 0;
-	for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) {
+	for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) {
 		if(!tree->widget())
 			continue;
-		tmpw = TQMAX(tmpw, tree->widget()->geometry().right());
-		tmph = TQMAX(tmph, tree->widget()->geometry().bottom());
+		tmpw = TQMAX(tmpw, tree->widget()->tqgeometry().right());
+		tmph = TQMAX(tmph, tree->widget()->tqgeometry().bottom());
 	}
 
 	return TQSize(tmpw, tmph) + TQSize(10, 10);
@@ -614,16 +614,16 @@ AdjustSizeCommand::debug()
 
 LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, 
 	const TQVariant &oldValue, const TQVariant &value)
- : PropertyCommand(buf, wname, oldValue, value, "layout")
+ : PropertyCommand(buf, wname, oldValue, value, "tqlayout")
 {
 	m_form = FormManager::self()->activeForm();
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(wname);
 	if (!titem)
 		return; //better this than a crash
 	Container *m_container = titem->container();
-	// 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());
+	// 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());
 }
 
 void
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
 TQString
 LayoutPropertyCommand::name() const
 {
-	return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
+	return i18n("Change tqlayout of widget \"%1\"").tqarg(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.")
-				.arg(winfo ? winfo->name() : TQString()));
+				.tqarg(winfo ? winfo->name() : TQString()));
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
@@ -755,7 +755,7 @@ InsertWidgetCommand::execute()
 	// if the insertRect is invalid (ie only one point), we use widget' size hint
 	if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21)))
 	{
-		TQSize s = w->sizeHint();
+		TQSize s = w->tqsizeHint();
 
 		if(s.isEmpty())
 			s = TQSize(20, 20); // Minimum size to avoid creating a (0,0) widget
@@ -802,7 +802,7 @@ InsertWidgetCommand::execute()
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it)
 		item->addModifiedProperty(*it, w->property(*it));
 
-	m_container->reloadLayout(); // reload the layout to take the new wigdet into account
+	m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account
 
 	m_container->setSelectedWidget(w, false);
 	if (m_container->form()->library()->internalProperty(w->className(), 
@@ -830,7 +830,7 @@ TQString
 InsertWidgetCommand::name() const
 {
 	if(!m_name.isEmpty())
-		return i18n("Insert widget \"%1\"").arg(TQString(m_name));
+		return i18n("Insert widget \"%1\"").tqarg(TQString(m_name));
 	else
 		return i18n("Insert widget");
 }
@@ -864,10 +864,10 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	}
 	for(TQWidget *w = list.first(); w; w = list.next())
 		m_list->append(w);
-	m_list->sort(); // we sort them now, before creating the layout
+	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->geometry());
+		m_pos.insert(w->name(), w->tqgeometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
 	if(item && item->parent()->container())
 		m_containername = item->parent()->name();
@@ -911,8 +911,8 @@ CreateLayoutCommand::execute()
 		return;
 
 	container->setSelectedWidget(0, false);
-	w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget
-	// sizeHint of these widgets depends on geometry, so give them appropriate geometry
+	w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
+	// tqsizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry
 	if(m_type == Container::HFlow)
 		w->resize( TQSize(700, 20) );
 	else if(m_type == Container::VFlow)
@@ -938,7 +938,7 @@ CreateLayoutCommand::execute()
 		((TQSplitter*)w)->setOrientation(Qt::Vertical);
 	else if(tree->container()) {
 		tree->container()->setLayout((Container::LayoutType)m_type);
-		w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size
+		w->resize(tree->container()->tqlayout()->tqsizeHint()); // the tqlayout doesn't have its own size
 	}
 
 	container->setSelectedWidget(w, false);
@@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute()
 	if(!parent)
 		parent = m_form->objectTree();
 
-	// We reparent every widget to the Container and take them out of the layout
+	// We reparent every widget to the Container and take them out of the tqlayout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
 	for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it)
 	{
@@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute()
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	parent->container()->deleteWidget(w); // delete the layout widget
+	parent->container()->deleteWidget(w); // delete the tqlayout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }
 
@@ -1019,7 +1019,7 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_form = container->form();
 	m_type = container->layoutType();
 
-	for(ObjectTreeItem *tree = container->objectTree()->children()->first(); tree; tree = container->objectTree()->children()->next())
+	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->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\"").arg(m_name);
+	return i18n("Break Layout: \"%1\"").tqarg(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 geometry if there is one
+	// Find the widget tqgeometry if there is one
 	for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		if((n.toElement().tagName() == "property") && (n.toElement().attribute("name") == "geometry"))
@@ -1249,13 +1249,13 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container)
 	int rh = h.text().toInt();
 	TQRect r(rx, ry, rw, rh);
 
-	TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false);
+	TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false);
 	if(!w)
 		return;
 
-	while((w->geometry() == r) && (w != 0))// there is already a widget there, with the same size
+	while((w->tqgeometry() == 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);
+		w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
 	}
 
@@ -1300,11 +1300,11 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T
 	TQRect r(rx + p.x(), ry + p.y(), rw, rh);
 	kdDebug() << "Moving widget by " << p << " from " << rx << "  " << ry << " to " << r.topLeft() << endl;
 
-	TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false);
+	TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false);
 
-	while(w && (w->geometry() == r))// there is already a widget there, with the same size
+	while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size
 	{
-		w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false);
+		w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false);
 		r.moveBy(10,10);
 	}
 
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index 41da4b60e..64e5a2536 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 alignment (see the enum for possible values). */
+  type of tqalignment (see the enum for possible values). */
 class KFORMEDITOR_EXPORT AlignWidgetsCommand : public Command
 {
 	public:
@@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command
 		TQMap<TQCString, TQSize> m_sizes;
 };
 
-/*! This command is used when switching the layout of a Container. It remembers the old pos
+/*! This command is used when switching the tqlayout of a Container. It remembers the old pos
  of every widget inside the Container. */
 class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
 {
@@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 		TQRect m_insertRect;
 };
 
-/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item.
+/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item.
  It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need
  to supply a WidgetList of the selected widgets. */
 class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 3fe0ac615..f683ce744 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
@@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 , m_buffer(0)
 {
 	TQFrame *frame = makeMainWidget();
-	TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6);
 
 	// Setup the details widget /////////
 	TQHBox *details = new TQHBox(frame);
@@ -60,10 +60,10 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 
 	m_pixmapLabel = new TQLabel(details);
 	m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) );
-	m_pixmapLabel->setAlignment(AlignHCenter | AlignTop);
+	m_pixmapLabel->tqsetAlignment(AlignHCenter | AlignTop);
 
 	m_textLabel = new TQLabel(details);
-	m_textLabel->setAlignment(AlignLeft | AlignTop);
+	m_textLabel->tqsetAlignment(AlignLeft | AlignTop);
 	//setStatusOk();
 
 	// And the KexiTableView ////////
@@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 	initTable();
 	m_table->setData(m_data, false);
 	m_table->adjustColumnWidthToContents(0);
-	layout->addWidget(m_table);
+	tqlayout->addWidget(m_table);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
 	KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame);
-	vlayout->addWidget(newItem);
+	vtqlayout->addWidget(newItem);
 	m_buttons.insert(BAdd, newItem);
 	connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
 
 	KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame);
-	vlayout->addWidget(delItem);
+	vtqlayout->addWidget(delItem);
 	m_buttons.insert(BRemove, delItem);
 	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
 
-	vlayout->addStretch();
+	vtqlayout->addStretch();
 
 	setInitialSize(TQSize(600, 300));
 	//setWFlags(WDestructiveClose);
@@ -289,7 +289,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item)
 	TQString signalArg(signal);
 	signalArg = signalArg.remove( TQRegExp(".*[(]|[)]") );
 
-	TQStrList slotList = tree->widget()->metaObject()->slotNames(true);
+	TQStrList slotList = tree->widget()->tqmetaObject()->slotNames(true);
 	TQStrListIterator it(slotList);
 	for(; it.current() != 0; ++it)
 	{
@@ -297,7 +297,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item)
 		TQString slotArg(*it);
 		slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") );
 
-		if(!signalArg.startsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible
+		if(!signalArg.tqstartsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible
 			continue;
 
 		KexiTableItem *item = m_slotsColumnData->createItem(); //new KexiTableItem(2);
@@ -315,7 +315,7 @@ ConnectionDialog::updateSignalList(KexiTableItem *item)
 		return;
 
 	m_signalsColumnData->deleteAllRows();
-	TQStrList signalList = tree->widget()->metaObject()->signalNames(true);
+	TQStrList signalList = tree->widget()->tqmetaObject()->signalNames(true);
 	TQStrListIterator it(signalList);
 	for(; it.current() != 0; ++it)
 	{
@@ -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>").arg(m_data->column(i)->captionAliasOrName()),
+			setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").tqarg(m_data->column(i)->captionAliasOrName()),
 				item);
 			return;
 		}
@@ -346,7 +346,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item)
 	TQString slot = (*item)[4].toString();
 	slot = slot.remove( TQRegExp(".*[(]|[)]") );
 
-	if(!signal.startsWith(slot, true))
+	if(!signal.tqstartsWith(slot, true))
 	{
 		setStatusError( i18n("The signal/slot arguments are not compatible."), item);
 		return;
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 366f6a6db..d1275adc2 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -23,7 +23,7 @@
 #include <tqrect.h>
 #include <tqevent.h>
 #include <tqvaluevector.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcursor.h>
 
 #include <kdebug.h>
@@ -73,7 +73,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev)
 		}
 	}
 //	else if(ev->type() == TQEvent::ChildInserted) {
-		// widget's children have changed, we need to reinstall filter
+		// widget's tqchildren 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->geometry();
+						//m_copyRect = m_moving->tqgeometry();
 						m_state = CopyingWidget;
 						if(m_form->formWidget())
 							m_form->formWidget()->initBuffer();
@@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			return false;
 		}
 
-		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse
+		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse
 		{
 			if(m_form->interactiveMode())
 				m_state = MovingWidget;
@@ -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()->children();
+				ObjectTreeList *list = item->parent()->tqchildren();
 				if(list->count() == 1)
 					return true;
 				int index = list->findRef(item);
@@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
 
 		//m_initialPos = TQPoint();
 	}
-	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout
+	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout
 		reloadLayout();
 
 	// cancel copying as user released Ctrl before releasing mouse button
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
 			return;
 		}
 	}
-	m_container->setGeometry(m_container->geometry()); // just update layout
+	m_container->setGeometry(m_container->tqgeometry()); // just update tqlayout
 	m_layout->activate();
 }
 
@@ -654,14 +654,14 @@ Container::reloadLayout()
 void
 Container::createBoxLayout(WidgetList *list)
 {
-	TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout);
+	TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
 
-	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
+	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
 		list->append( tree->widget());
 	list->sort();
 
 	for(TQWidget *obj = list->first(); obj; obj = list->next())
-		layout->addWidget(obj);
+		tqlayout->addWidget(obj);
 	delete list;
 }
 
@@ -669,7 +669,7 @@ void
 Container::createFlowLayout()
 {
 	KexiFlowLayout *flow = dynamic_cast<KexiFlowLayout*>(m_layout);
-	if(!flow || m_tree->children()->isEmpty())
+	if(!flow || m_tree->tqchildren()->isEmpty())
 		return;
 
 	const int offset = 15;
@@ -684,7 +684,7 @@ Container::createFlowLayout()
 	}
 
 	// fill the list
-	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
+	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->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->children()->first(); tree; tree = m_tree->children()->next())
+	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
 		vlist->append( tree->widget());
 	vlist->sort();
 
-	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
+	for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next())
 		hlist->append( tree->widget());
 	hlist->sort();
 
@@ -759,30 +759,30 @@ Container::createGridLayout(bool testOnly)
 
 			for(; it2.current() != 0; ++it2) {
 				TQWidget *nextw = it2.current();
-				if((w->y() >= nextw->y()) || (nextw->y() >= w->geometry().bottom()))
+				if((w->y() >= nextw->y()) || (nextw->y() >= w->tqgeometry().bottom()))
 					break;
 
-				if(!w->geometry().intersects(nextw->geometry()))
+				if(!w->tqgeometry().intersects(nextw->tqgeometry()))
 					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->geometry().bottom()+1);
+					nextw->move(nextw->x(), w->tqgeometry().bottom()+1);
 				else if(nextw->x() >= w->x())
-					nextw->move(w->geometry().right()+1, nextw->y());
+					nextw->move(w->tqgeometry().right()+1, nextw->y());
 				else
-					w->move(nextw->geometry().right()+1, nextw->y());
+					w->move(nextw->tqgeometry().right()+1, nextw->y());
 			}
 		}
 	}
 
-	// Then we count the number of rows in the layout, and set their beginnings
+	// Then we count the number of rows in the tqlayout, and set their beginnings
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
 		WidgetListIterator it2 = it;
 		if(!same) { // this widget will make a new row
-			end = w->geometry().bottom();
+			end = w->tqgeometry().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->geometry().bottom()));
+			same = !(same && (nextw->y() >= w->tqgeometry().bottom()));
 			if(!same)
-				end = w->geometry().bottom();
+				end = w->tqgeometry().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->geometry().right();
+			end = w->tqgeometry().right();
 			cols.append(w->x());
 		}
 
@@ -823,25 +823,25 @@ Container::createGridLayout(bool testOnly)
 		if(nextw->x() >= end)
 			same = false;
 		else {
-			same = !(same && (nextw->x() >= w->geometry().right()));
+			same = !(same && (nextw->x() >= w->tqgeometry().right()));
 			if(!same)
-				end = w->geometry().right();
+				end = w->tqgeometry().right();
 		}
 	}
 	kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
 
-	// We create the layout ..
-	TQGridLayout *layout=0;
+	// We create the tqlayout ..
+	TQGridLayout *tqlayout=0;
 	if(!testOnly) {
-		layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
-		m_layout = (TQLayout*)layout;
+		tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
+		m_layout = (TQLayout*)tqlayout;
 	}
 
 	// .. and we fill it with widgets
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
-		TQRect r = w->geometry();
+		TQRect r = w->tqgeometry();
 		uint wcol=0, wrow=0, endrow=0, endcol=0;
 		uint i = 0;
 
@@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly)
 		ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
 		if(!endrow && !endcol) {
 			if(!testOnly)
-				layout->addWidget(w, wrow, wcol);
+				tqlayout->addWidget(w, wrow, wcol);
 			item->setGridPos(wrow, wcol, 0, 0);
 		}
 		else {
 			if(!endcol)  endcol = wcol;
 			if(!endrow)  endrow = wrow;
 			if(!testOnly)
-				layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
+				tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
 			item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1);
 		}
 	}
@@ -971,7 +971,7 @@ Container::drawConnection(TQMouseEvent *mev)
 	{
 		FormManager::self()->createdConnection()->setReceiver(m_moving->name());
 		FormManager::self()->createSlotMenu(m_moving);
-		m_container->repaint();
+		m_container->tqrepaint();
 		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->children()->first(); item; item = m_tree->children()->next())
+	for(ObjectTreeItem *item = m_tree->tqchildren()->first(); item; item = m_tree->tqchildren()->next())
 	{
 		TQWidget *w = item->widget();
 		if(!w)
 			continue;
-		if(w->geometry().intersects(r) && w != m_container) {
+		if(w->tqgeometry().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->repaint();
+	m_container->tqrepaint();
 }
 
 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->repaint();
+			m_container->tqrepaint();
 			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->geometry();
+			TQRect drawRect = w->tqgeometry();
 			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/container.h b/kexi/formeditor/container.h
index bd46c7a1d..36f35e822 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		void setObjectTree(ObjectTreeItem *t) { m_tree = t; }
 
 		//! \return a pointer to the TQLayout of this Container, or 0 if there is not.
-		TQLayout* layout() const { return m_layout; }
+		TQLayout* tqlayout() const { return m_layout; }
 
-		//! \return the type of the layout associated to this Container's widget (see LayoutType enum).
+		//! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
 		LayoutType layoutType() const { return m_layType; }
 
 		//! \return the margin of this Container.
@@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! \return the spacing of this Container.
 		int layoutSpacing() { return m_spacing; }
 
-		/*! Sets this Container to use \a type of layout. The widget are inserted
-		 automatically in the layout following their positions.
+		/*! Sets this Container to use \a type of tqlayout. The widget are inserted
+		 automatically in the tqlayout following their positions.
 		  \sa createBoxLayout(), createGridLayout() */
 		void setLayout(LayoutType type);
 
@@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! \return the string representing the layoutType \a type.
 		static TQString layoutTypeToString(int type);
 
-		//! \return the LayoutType (an int) for a given layout name.
+		//! \return the LayoutType (an int) for a given tqlayout name.
 		static LayoutType stringToLayoutType(const TQString &name);
 
 		/*! Stops the inline editing of the current widget (as when you click
@@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		 to Container's widget. */
 		void deleteWidget(TQWidget *w);
 
-		/*! Recreates the Container layout. Calls this when a widget has been moved
-		 or added to update the layout. */
+		/*! Recreates the Container tqlayout. Calls this when a widget has been moved
+		 or added to update the tqlayout. */
 		void reloadLayout();
 
 	protected slots:
@@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		/*! Internal function to create a KexiFlowLayout. */
 		void createFlowLayout();
 
-		/*! Internal function to create a GridLayout. if \a testOnly is true, the layout
+		/*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout
 		  is simulated, and only the widget's grid info aris filled. */
 		void createGridLayout(bool testOnly=false);
 
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 5bfdfbfe1..d073b43d5 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klistview.h>
 #include <ktabwidget.h>
@@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_contents = addPage(i18n("Contents"));
 
 	///////// Setup the "Contents" page /////////////////////////////
-	TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
 	TQToolButton *newRow = new TQToolButton(m_contents);
 	newRow->setIconSet(BarIconSet("edit_add"));
 	newRow->setTextLabel(i18n("&Add Item"), true);
-	vlayout->addWidget(newRow);
+	vtqlayout->addWidget(newRow);
 	m_buttons.insert(BNewRow, newRow);
 	connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
 
 	TQToolButton *newChild = new TQToolButton(m_contents);
 	newChild->setIconSet(BarIconSet("1rightarrow"));
 	newChild->setTextLabel(i18n("New &Subitem"), true);
-	vlayout->addWidget(newChild);
+	vtqlayout->addWidget(newChild);
 	m_buttons.insert(BNewChild, newChild);
 	connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
 
 	TQToolButton *delRow = new TQToolButton(m_contents);
 	delRow->setIconSet(BarIconSet("edit_remove"));
 	delRow->setTextLabel(i18n("&Remove Item"), true);
-	vlayout->addWidget(delRow);
+	vtqlayout->addWidget(delRow);
 	m_buttons.insert(BRemRow, delRow);
 	connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
 
 	TQToolButton *rowUp = new TQToolButton(m_contents);
 	rowUp->setIconSet(BarIconSet("1uparrow"));
 	rowUp->setTextLabel(i18n("Move Item &Up"), true);
-	vlayout->addWidget(rowUp);
+	vtqlayout->addWidget(rowUp);
 	m_buttons.insert(BRowUp, rowUp);
 	connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
 
 	TQToolButton *rowDown = new TQToolButton(m_contents);
 	rowDown->setIconSet(BarIconSet("1downarrow"));
 	rowDown->setTextLabel(i18n("Move Item &Down"), true);
-	vlayout->addWidget(rowDown);
+	vtqlayout->addWidget(rowDown);
 	m_buttons.insert(BRowDown, rowDown);
 	connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
-	vlayout->addStretch();
+	vtqlayout->addStretch();
 
 	//// The listview ///////////
 	m_listview = new KListView(m_contents, "editlistview_listview");
@@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listview->setDropVisualizer(true);
 	m_listview->setAcceptDrops(true);
 	m_listview->setSorting(-1);
-	layout->addWidget(m_listview);
+	tqlayout->addWidget(m_listview);
 	m_listview->setFocus();
 	connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
 	connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index c1056b3b2..acc72c240 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -36,7 +36,7 @@
 #include <tqscrollview.h>
 #include <tqtabbar.h>
 #include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kiconloader.h>
 #include <kgenericfactory.h>
@@ -73,7 +73,7 @@ ContainerWidget::~ContainerWidget()
 {
 }
 
-TQSize ContainerWidget::sizeHint() const
+TQSize ContainerWidget::tqsizeHint() const
 {
 	return TQSize(30,30); //default
 }
@@ -125,7 +125,7 @@ KFDTabWidget::~KFDTabWidget()
 }
 
 TQSize
-KFDTabWidget::sizeHint() const
+KFDTabWidget::tqsizeHint() const
 {
 	TQSize s(30,30); // default min size
 	for(int i=0; i < count(); i++)
@@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
 	emit handleDropEvent(e);
 }
 
-/// Various layout widgets /////////////////:
+/// Various tqlayout widgets /////////////////:
 
 HBox::HBox(TQWidget *parent, const char *name)
  : TQFrame(parent, name), m_preview(false)
@@ -218,10 +218,10 @@ VFlow::paintEvent(TQPaintEvent *)
 }
 
 TQSize
-VFlow::sizeHint() const
+VFlow::tqsizeHint() const
 {
-	if(layout())
-		return layout()->sizeHint();
+	if(tqlayout())
+		return tqlayout()->tqsizeHint();
 	else
 		return TQSize(700, 50); // default
 }
@@ -256,7 +256,7 @@ InsertPageCommand::execute()
 	if(classname == "KFDTabWidget")
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
-		TQString n = i18n("Page %1").arg(tab->count() + 1);
+		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
 
@@ -318,7 +318,7 @@ SubForm::SubForm(TQWidget *parent, const char *name)
 : TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
 }
 
 void
@@ -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 children"));
+	wSplitter->setDescription(i18n("A container that enables user to resize its tqchildren"));
 	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)->children()->count() == 4) // == the stack has only one page
+//		if( ((TQWidgetStack*)m_widget)->tqchildren()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
@@ -860,7 +860,7 @@ void ContainerFactory::renameTabPage()
 #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9)
 	       TQLineEdit::Normal,
 #endif
-	       tab->tabLabel(w), &ok, w->topLevelWidget());
+	       tab->tabLabel(w), &ok, w->tqtopLevelWidget());
 	if(ok)
 		tab->changeTab(w, name);
 }
@@ -872,8 +872,8 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos)
 	if(!tab)
 		return;
 
-	KFormDesigner::ObjectTreeItem *item = tab->children()->take(oldpos);
-	tab->children()->insert(newpos, item);
+	KFormDesigner::ObjectTreeItem *item = tab->tqchildren()->take(oldpos);
+	tab->tqchildren()->insert(newpos, item);
 }
 
 void ContainerFactory::addStackPage()
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index 6f013e9cd..b88b437f8 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -126,7 +126,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	protected:
 		bool  m_preview;
@@ -144,7 +144,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
@@ -170,7 +170,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
 		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 2607fcca7..24827e131 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -431,13 +431,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 		w = new KProgress(p, n);
 
 	else if(c == "KDateWidget")
-		w = new KDateWidget(TQDate::currentDate(), p, n);
+		w = new KDateWidget(TQDate::tqcurrentDate(), p, n);
 
 	else if(c == "KTimeWidget")
 		w = new KTimeWidget(TQTime::currentTime(), p, n);
 
 	else if(c == "KDateTimeWidget")
-		w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n);
+		w = new KDateTimeWidget(TQDateTime::tqcurrentDateTime(), p, n);
 
 	else if(c == "Line")
 		w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n);
@@ -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->geometry(), lineedit->alignment(), true);
+		createEditor(classname, lineedit->text(), lineedit, container, lineedit->tqgeometry(), lineedit->tqalignment(), 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->geometry(), label->alignment());
+			createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
 		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->geometry());
+		//TQRect r(check->tqgeometry());
 		//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());
@@ -605,13 +605,13 @@ StdWidgetFactory::changeText(const TQString &text)
 	else
 		changeProperty("text", text, m_container->form());
 
-	/* By-hand method not needed as sizeHint() can do that for us
+	/* By-hand method not needed as tqsizeHint() can do that for us
 	TQFontMetrics fm = w->fontMetrics();
 	TQSize s(fm.width( text ), fm.height());
 	int width;
 	if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text
 	{
-		w->resize(w->sizeHint());
+		w->resize(w->tqsizeHint());
 		WidgetFactory::m_editor->resize(w->size());
 		return;
 	}
@@ -624,7 +624,7 @@ StdWidgetFactory::changeText(const TQString &text)
 		width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width();
 	else
 		return;
-	int width = w->sizeHint().width();*/
+	int width = w->tqsizeHint().width();*/
 
 #if 0 //not needed here, size hint is used on creation in InsertWidgetCommand::execute()
 	if(w->width() < width)
@@ -860,7 +860,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
 	}
 	else if(classname == "KexiPictureLabel")
 	{
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
 			return false;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
@@ -956,7 +956,7 @@ StdWidgetFactory::editText()
 	}
 
 	if(classname == TQLABEL_OBJECT_NAME_STRING)
-		widget()->resize(widget()->sizeHint());
+		widget()->resize(widget()->tqsizeHint());
 }
 
 void
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 52d449666..b5b209365 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -364,10 +364,10 @@ Form::changeName(const TQCString &oldname, const TQCString &newname)
 		return;
 	if(!d->topTree->rename(oldname, newname)) // rename failed
 	{
-		KMessageBox::sorry(widget()->topLevelWidget(),
-			i18n("Renaming widget \"%1\" to \"%2\" failed.").arg(TQString(oldname)).arg(TQString(newname)));
+		KMessageBox::sorry(widget()->tqtopLevelWidget(),
+			i18n("Renaming widget \"%1\" to \"%2\" failed.").tqarg(TQString(oldname)).tqarg(TQString(newname)));
 //moved to WidgetPropertySet::slotChangeProperty()
-//		KMessageBox::sorry(widget()->topLevelWidget(),
+//		KMessageBox::sorry(widget()->tqtopLevelWidget(),
 //		i18n("A widget with this name already exists. "
 //			"Please choose another name or rename existing widget."));
 		kdDebug() << "Form::changeName() : ERROR : A widget named " << newname << " already exists" << endl;
@@ -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->children()); it.current(); ++it)
+	for (ObjectTreeListIterator it(*item->tqchildren()); it.current(); ++it)
 		collectContainers(it.current(), containers);
 }
 
@@ -528,7 +528,7 @@ Form::autoAssignTabStops()
 	d->tabstops.clear();
 
 	/// We automatically sort widget from the top-left to bottom-right corner
-	//! \todo Handle RTL layout (ie from top-right to bottom-left)
+	//! \todo Handle RTL tqlayout (ie from top-right to bottom-left)
 	foreach_list(WidgetListIterator, it, list) {
 		TQWidget *w = it.current();
 		hlist.append(w);
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index a8bd6dc0b..7df731c6c 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 repaint the Form. */
+		/*! Clears the form, ie pastes the whole buffer to tqrepaint 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 shapes before inserting (so we can restore them later)
+		//! This map is used to store cursor tqshapes 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)
@@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 //! @todo make gridSize configurable at global level
 		int gridSize() { return 10; }
 
-		//! \return the default margin for all the layout inside this Form.
+		//! \return the default margin for all the tqlayout inside this Form.
 		int defaultMargin() { return 11;}
 
-		//! \return the default spacing for all the layout inside this Form.
+		//! \return the default spacing for all the tqlayout inside this Form.
 		int defaultSpacing() { return 6;}
 
 		/*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */
@@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		    (which are by default in order of creation).*/
 		void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;}
 
-		/*! Tells the Form to reassign the tab stops because the widget layout has changed
+		/*! Tells the Form to reassign the tab stops because the widget tqlayout has changed
 		 (called for example before saving or displaying the tab order dialog).
 		 Automatically sorts widget from the top-left to bottom-right corner.
 		 Widget can be grouped with containers. In paticular, for tab widgets,
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 23c67fb4a..2759fe985 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -23,11 +23,11 @@
 #include <tqmetaobject.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcursor.h>
 #include <tqbuffer.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqdatetime.h>
 #include <tqlabel.h>
@@ -66,7 +66,7 @@ void
 CustomWidget::paintEvent(TQPaintEvent *)
 {
 	TQPainter p(this);
-	p.setPen(palette().active().text());
+	p.setPen(tqpalette().active().text());
 	TQRect r(rect());
 	r.setX(r.x()+2);
 	p.drawText(r, TQt::AlignTop, m_className);
@@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = w;
 	bool addSubwidgetFlag = false;
-	int propertyId = w->metaObject()->findProperty(name, true);
+	int propertyId = w->tqmetaObject()->findProperty(name, true);
 	if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget
 		subwidget = subpropIface->subwidget();
-		propertyId = subpropIface->subwidget()->metaObject()->findProperty(name, true);
+		propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true);
 		addSubwidgetFlag = true;
 	}
 	if(propertyId == -1)
@@ -420,7 +420,7 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 		return;
 	}
 
-	const TQMetaProperty *meta = subwidget->metaObject()->property(propertyId, true);
+	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true);
 	if (!meta->stored( subwidget )) //not storable
 		return;
 	TQDomElement propertyE = parent.createElement("property");
@@ -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().shape()));
+			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
 			type.appendChild(valueE);
 			break;
 		}
@@ -880,8 +880,8 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 	{
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj);
 		TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj;
-		const int count = subobject->metaObject()->findProperty(name.latin1(), true);
-		const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0;
+		const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true);
+		const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0;
 
 		if (meta) {
 			if (meta->isSetType()) {
@@ -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 "alignment"
+	// Important: save dataSource property FIRST before properties like "tqalignment"
 	// - 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"))
+//	if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example)
+	// We don't want to save the tqgeometry 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,14 +992,14 @@ 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 == "alignment") {
+		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "tqalignment") {
 			if(!savedAlignment) // not to save it twice
 			{
-				savePropertyValue(tclass, domDoc, "alignment", item->widget()->property("alignment"), item->widget());
+				savePropertyValue(tclass, domDoc, "tqalignment", item->widget()->property("tqalignment"), item->widget());
 				savedAlignment = true;
 			}
 		}
-		else if(name == "name" || name == "geometry" || name == "layout") {
+		else if(name == "name" || name == "geometry" || name == "tqlayout") {
 			// these have already been saved
 		}
 		else {
@@ -1017,80 +1017,80 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		}
 
 	}
-	// Saving container 's layout if there is one
-	TQDomElement layout;
+	// Saving container 's tqlayout if there is one
+	TQDomElement tqlayout;
 	if(item->container() && item->container()->layoutType() != Container::NoLayout)
 	{
-		if(item->container()->layout()) // there is a layout
+		if(item->container()->tqlayout()) // there is a tqlayout
 		{
-			layout = domDoc.createElement("temp");
-			savePropertyValue(layout, domDoc, "name", "unnamed", item->widget());
+			tqlayout = domDoc.createElement("temp");
+			savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
 			if(item->modifiedProperties()->contains("layoutMargin"))
-				savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin());
+				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
 			if(item->modifiedProperties()->contains("layoutSpacing"))
-				savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing());
-			tclass.appendChild(layout);
+				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
+			tclass.appendChild(tqlayout);
 		}
 	}
 
 	int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
 	switch(layoutType) {
-		case Container::Grid: // grid layout
+		case Container::Grid: // grid tqlayout
 		{
-			layout.setTagName("grid");
-			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
-				saveWidget(objIt, layout, domDoc, true);
+			tqlayout.setTagName("grid");
+			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+				saveWidget(objIt, tqlayout, domDoc, true);
 			break;
 		}
 		case Container::HBox: case Container::VBox:
 		{
-			// as we don't save geometry, we need to sort widgets in the right order, not creation order
+			// as we don't save tqgeometry, we need to sort widgets in the right order, not creation order
 			WidgetList *list;
-			if(layout.tagName() == "hbox") {
+			if(tqlayout.tagName() == "hbox") {
 				list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
-				layout.setTagName("hbox");
+				tqlayout.setTagName("hbox");
 			}
 			else {
 				list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget());
-				layout.setTagName("vbox");
+				tqlayout.setTagName("vbox");
 			}
 
-			for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
+			for(ObjectTreeItem *objTree = item->tqchildren()->first(); objTree; objTree = item->tqchildren()->next())
 				list->append(objTree->widget());
 			list->sort();
 
 			for(TQWidget *obj = list->first(); obj; obj = list->next()) {
 				ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
 				if(item)
-					saveWidget(titem, layout, domDoc);
+					saveWidget(titem, tqlayout, domDoc);
 			}
 			delete list;
 			break;
 		}
 		case Container::HFlow: case Container::VFlow:
 		{
-			layout.setTagName("grid");
-			KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
+			tqlayout.setTagName("grid");
+			KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
 			if(!flow)  break;
 			WidgetList *list = (WidgetList*)flow->widgetList();
 
 			// save some special properties
-			savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
-			savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) );
+			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
+			savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
 
-			// fill the widget's grid info, ie just simulate grid layout
+			// fill the widget's grid info, ie just simulate grid tqlayout
 			item->container()->createGridLayout(true);
 			for(TQWidget *obj = list->first(); obj; obj = list->next()) {
 				ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
 				if(item)
-					saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner
+					saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner
 			}
 			delete list;
 			break;
 		}
 		default:
 		{
-			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
+			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
 				saveWidget(objIt, tclass, domDoc);
 		}
 	}
@@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 			else if(tagName == "vbox")
 				classname = "VBox";
 			else if(tagName == "grid") {
-				// first, see if it is flow layout
+				// first, see if it is flow tqlayout
 				for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling())  {
 					if((child.toElement().tagName() == "property") 
 						&& (child.toElement().attribute("name") == "customLayout"))
@@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 	m_currentItem = item;
 	// if we are inside a Grid, we need to insert the widget in the good cell
 	if(container->layoutType() == Container::Grid)  {
-		TQGridLayout *layout = (TQGridLayout*)container->layout();
+		TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
 		if(el.hasAttribute("rowspan")) { // widget spans multiple cells
-			if(layout)
-				layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
+			if(tqlayout)
+				tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
 					 el.attribute("column").toInt(),  el.attribute("column").toInt() + el.attribute("colspan").toInt()-1);
 			 item->setGridPos(el.attribute("row").toInt(),  el.attribute("column").toInt(), el.attribute("rowspan").toInt(),
 			   el.attribute("colspan").toInt());
 		}
 		else  {
-			if(layout)
-				layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
+			if(tqlayout)
+				tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
 			item->setGridPos(el.attribute("row").toInt(),  el.attribute("column").toInt(), 0, 0);
 		}
 	}
-	else if(container->layout())
-		container->layout()->add(w);
+	else if(container->tqlayout())
+		container->tqlayout()->add(w);
 
 	readChildNodes(item, container, el, w);
 
-	if(item->container() && item->container()->layout())
-		item->container()->layout()->activate();
+	if(item->container() && item->container()->tqlayout())
+		item->container()->tqlayout()->activate();
 
 	// We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later
 	TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className()));
@@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 		= dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) {
-		if(subwidget->metaObject()->findProperty(*it, true) != -1)
+		if(subwidget->tqmetaObject()->findProperty(*it, true) != -1)
 			item->addModifiedProperty(*it, subwidget->property(*it));
 	}
 
@@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			//if(name == "geometry")
 			//	hasGeometryProp = true;
 			if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
-			      (name == "name")) // we don't care about layout names
+			      (name == "name")) // we don't care about tqlayout names
 				continue;
 
 			if (node.attribute("subwidget")=="true") {
@@ -1355,30 +1355,30 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			if(name == "buddy")
 				m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w);
 			else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
-			  item->container() && item->container()->layout()) {
+			  item->container() && item->container()->tqlayout()) {
 			  // We load the margin of a Layout
 				if(name == "margin")  {
 					int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 					item->container()->setLayoutMargin(margin);
-					item->container()->layout()->setMargin(margin);
+					item->container()->tqlayout()->setMargin(margin);
 				}
 				// We load the spacing of a Layout
 				else if(name == "spacing")  {
 					int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 					item->container()->setLayoutSpacing(spacing);
-					item->container()->layout()->setSpacing(spacing);
+					item->container()->tqlayout()->setSpacing(spacing);
 				}
 				else if((name == "justify")){
 					bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool();
-					KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
+					KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
 					if(flow)
 						flow->setJustified(justify);
 				}
 			}
 			// If the object doesn't have this property, we let the Factory handle it (maybe a special property)
-			else if(subwidget->metaObject()->findProperty(name.latin1(), true) == -1)
+			else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1)
 			{
-				if(w->className() == TQString::fromLatin1("CustomWidget"))
+				if(w->className() == TQString::tqfromLatin1("CustomWidget"))
 					item->storeUnknownProperty(node);
 				else {
 					bool read = container->form()->library()->readSpecialProperty(
@@ -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 geometry if needed - this is top level form widget
+					//fix tqgeometry if needed - this is top level form widget
 					TQRect r( val.toRect() );
 					if (r.left()<0) //negative X!
 						r.moveLeft(0);
@@ -1400,8 +1400,8 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 					val = r;
 				}
 				subwidget->setProperty(name.latin1(), val);
-//				int count = w->metaObject()->findProperty(name, true);
-//				const TQMetaProperty *meta = w->metaObject()->property(count, true);
+//				int count = w->tqmetaObject()->findProperty(name, true);
+//				const TQMetaProperty *meta = w->tqmetaObject()->property(count, true);
 //				if(meta && meta->isEnumType()) {
 //					val = w->property(name.latin1()); //update: we want a numeric value of enum
 //				}
@@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			loadWidget(container, node, w);
 		}
 		else if(tag == "grid") {
-			// first, see if it is flow layout
+			// first, see if it is flow tqlayout
 			TQString layoutName;
 			for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling())  {
 				if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout"))  {
@@ -1430,37 +1430,37 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 
 			 if(layoutName == "HFlow") {
 				item->container()->m_layType = Container::HFlow;
-				KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
-				layout->setOrientation(Qt::Horizontal);
-				item->container()->m_layout = (TQLayout*)layout;
+				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
+				tqlayout->setOrientation(Qt::Horizontal);
+				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
 			else if(layoutName == "VFlow") {
 				item->container()->m_layType = Container::VFlow;
-				KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
-				layout->setOrientation(Qt::Vertical);
-				item->container()->m_layout = (TQLayout*)layout;
+				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
+				tqlayout->setOrientation(Qt::Vertical);
+				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
-			else { // grid layout
+			else { // grid tqlayout
 				item->container()->m_layType = Container::Grid;
-				TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1);
-				item->container()->m_layout = (TQLayout*)layout;
+				TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1);
+				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
 			readChildNodes(item, container, node, w);
 		}
 		else if(tag == "vbox")  {
 			item->container()->m_layType = Container::VBox;
-			TQVBoxLayout *layout = new TQVBoxLayout(item->widget());
-			item->container()->m_layout = (TQLayout*)layout;
+			TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget());
+			item->container()->m_layout = (TQLayout*)tqlayout;
 			readChildNodes(item, container, node, w);
 		}
 		else if(tag == "hbox") {
 			item->container()->m_layType = Container::HBox;
-			TQHBoxLayout *layout = new TQHBoxLayout(item->widget());
-			item->container()->m_layout = (TQLayout*)layout;
+			TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget());
+			item->container()->m_layout = (TQLayout*)tqlayout;
 			readChildNodes(item, container, node, w);
 		}
 		else {// unknown tag, we let the Factory handle it
-			if(w->className() == TQString::fromLatin1("CustomWidget"))
+			if(w->className() == TQString::tqfromLatin1("CustomWidget"))
 				item->storeUnknownProperty(node);
 			else {
 				bool read = container->form()->library()->readSpecialProperty(
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 75846dd3a..a2ed0dac0 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
 	m_style->setEditable(false);
 
 	KGlobal::config()->setGroup("General");
-	TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower();
+	TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower();
 	const TQStringList styles = TQStyleFactory::keys();
 	m_style->setItems(styles);
 	m_style->setCurrentItem(0);
@@ -413,7 +413,7 @@ FormManager::resetCreatedConnection()
 		m_active->formWidget()->clearForm();
 	}
 	if (m_active && m_active->widget())
-		m_active->widget()->repaint();
+		m_active->widget()->tqrepaint();
 }
 
 void
@@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w)
 	m_sigSlotMenu = new KPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals"));
 
-	TQStrList list = w->metaObject()->signalNames(true);
+	TQStrList list = w->tqmetaObject()->signalNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 		m_sigSlotMenu->insertItem(*it);
@@ -813,14 +813,14 @@ FormManager::createSlotMenu(TQWidget *w)
 
 	TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) );
 
-	TQStrList list = w->metaObject()->slotNames(true);
+	TQStrList list = w->tqmetaObject()->slotNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 	{
 		// we add the slot only if it is compatible with the signal
 		TQString slotArg(*it);
 		slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") );
-		if(!signalArg.startsWith(slotArg, true)) // args not compatible
+		if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible
 			continue;
 
 		m_sigSlotMenu->insertItem(*it);
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	const uint widgetsCount = container->form()->selectedWidgets()->count();
 	const bool multiple = widgetsCount > 1;
 	//const bool enableRemove = w != m_active->widget();
-	// We only enablelayout creation if more than one widget with the same parent are selected
+	// We only enabletqlayout creation if more than one widget with the same parent are selected
 	const bool enableLayout = multiple || w == container->widget();
 
 	m_menuWidget = w;
@@ -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").arg(w->name()) );
+			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").tqarg(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)").arg(widgetsCount));
+		+ TQString(" (%1)").tqarg(widgetsCount));
 
 	KAction *a;
 #define PLUG_ACTION(_name, forceVisible) \
@@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		// We create the signals menu
 		KPopupMenu *sigMenu = new KPopupMenu();
-		TQStrList list = w->metaObject()->signalNames(true);
+		TQStrList list = w->tqmetaObject()->signalNames(true);
 		TQStrListIterator it(list);
 		for(; it.current() != 0; ++it)
 			sigMenu->insertItem(*it);
@@ -1095,7 +1095,7 @@ void
 FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
-	// if only one widget is selected (a container), we modify its layout
+	// if only one widget is selected (a container), we modify its tqlayout
 	if (list->isEmpty()) {//sanity check
 		kdWarning() << "FormManager::createLayout(): list is empty!" << endl;
 		return;
@@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType)
 	if(list->count() == 1)
 	{
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
-		if(!item || !item->container() || !m_propSet->contains("layout"))
+		if(!item || !item->container() || !m_propSet->contains("tqlayout"))
 			return;
-		(*m_propSet)["layout"] = Container::layoutTypeToString(layoutType);
+		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
@@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType)
 		kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
 		if(w->parentWidget() != parent)
 		{
-			KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n"
+			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
 		   "All selected widgets must have the same parent."));
 			kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
 			return;
@@ -1143,7 +1143,7 @@ FormManager::breakLayout()
 	else // normal container
 	{
 		if(activeForm()->selectedWidgets()->count() == 1)
-			(*m_propSet)["layout"] = "NoLayout";
+			(*m_propSet)["tqlayout"] = "NoLayout";
 		else
 			container->setLayout(Container::NoLayout);
 	}
@@ -1188,7 +1188,7 @@ FormManager::editTabOrder()
 {
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
-	TQWidget *topLevel = m_active->widget()->topLevelWidget();
+	TQWidget *topLevel = m_active->widget()->tqtopLevelWidget();
 	TabStopDialog dlg(topLevel);
 	//const bool oldAutoTabStops = m_active->autoTabStops();
 	if (dlg.exec(m_active) == TQDialog::Accepted) {
@@ -1222,7 +1222,7 @@ FormManager::editFormPixmapCollection()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->topLevelWidget());
+	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget());
 	dialog.exec();
 }
 
@@ -1234,7 +1234,7 @@ FormManager::editConnections()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	ConnectionDialog dialog(activeForm()->widget()->topLevelWidget());
+	ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget());
 	dialog.exec(activeForm());
 }
 
@@ -1380,9 +1380,9 @@ FormManager::selectAll()
 		return;
 
 	activeForm()->selectFormWidget();
-	uint count = activeForm()->objectTree()->children()->count();
-	for(ObjectTreeItem *it = activeForm()->objectTree()->children()->first(); it; 
-		it = activeForm()->objectTree()->children()->next(), count--)
+	uint count = activeForm()->objectTree()->tqchildren()->count();
+	for(ObjectTreeItem *it = activeForm()->objectTree()->tqchildren()->first(); it; 
+		it = activeForm()->objectTree()->tqchildren()->next(), count--)
 	{
 		activeForm()->setSelectedWidget(it->widget(), /*add*/true, /*raise*/false, /*moreWillBeSelected*/count>1);
 	}
@@ -1493,14 +1493,14 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	WidgetList *wlist = form->selectedWidgets();
 	bool fontEnabled = false;
 	for (WidgetListIterator it(*wlist); it.current(); ++it) {
-		if (-1 != it.current()->metaObject()->findProperty("font", true)) {
+		if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) {
 			fontEnabled = true;
 			break;
 		}
 	}
 	enableAction("format_font", fontEnabled);
 
-	// If the widgets selected is a container, we enable layout actions
+	// If the widgets selected is a container, we enable tqlayout actions
 	bool containerSelected = false;
 	if(!multiple)
 	{
@@ -1550,7 +1550,7 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->children()->isEmpty();
+	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
 	enableAction("layout_menu", hasChildren);
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index 677a3e7ba..a43100fff 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 children. */
+		/*! Deletes the selected widget in active Form and all of its tqchildren. */
 		void deleteWidget();
 
-		/*! Copies the slected widget and all its children of the active Form using an XML representation. */
+		/*! Copies the slected widget and all its tqchildren of the active Form using an XML representation. */
 		void copyWidget();
 
-		/*! Cuts (ie Copies and deletes) the selected widget and all its children of
+		/*! Cuts (ie Copies and deletes) the selected widget and all its tqchildren of
 		 the active Form using an XML representation. */
 		void cutWidget();
 
@@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		/*! Creates a dialog to edit the Connection of \ref activeForm(). */
 		void editConnections();
 
-		//! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand).
+		//! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
 		void layoutHBox();
-		//! Lay out selected widgets using VBox layout.
+		//! Lay out selected widgets using VBox tqlayout.
 		void layoutVBox();
-		//! Lay out selected widgets using Grid layout.
+		//! Lay out selected widgets using Grid tqlayout.
 		void layoutGrid();
 		//! Lay out selected widgets in an horizontal splitter
 		void  layoutHSplitter();
 		//! Lay out selected widgets in a verticak splitter
 		void  layoutVSplitter();
-		//! Lay out selected widgets using HFlow layout
+		//! Lay out selected widgets using HFlow tqlayout
 		void layoutHFlow();
-		//! Lay out selected widgets using VFlow layout.
+		//! Lay out selected widgets using VFlow tqlayout.
 		void layoutVFlow();
 
-		//! Breaks selected layout(calls \ref BreakLayoutCommand).
+		//! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
 		void breakLayout();
 
 		void alignWidgetsToLeft();
@@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		 Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */
 		virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
 #endif
-		/*! Function called by the "Lay out in..." menu items. It creates a layout from the
+		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
 		  currently selected widgets (that must have the same parent).
 		  Calls \ref CreateLayoutCommand. */
 		void createLayout(int layoutType);
diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp
index 64e65f1ec..db9a726e6 100644
--- a/kexi/formeditor/kfdpixmapedit.cpp
+++ b/kexi/formeditor/kfdpixmapedit.cpp
@@ -48,7 +48,7 @@ KFDPixmapEdit::selectPixmap()
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
 	TQString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
 	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index a9b507f7e..e2ada7143 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -22,7 +22,7 @@
 #include <tqwidget.h>
 #include <tqvariant.h>
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "form.h"
 #include "container.h"
@@ -64,14 +64,14 @@ ObjectTreeItem::rename(const TQString &name)
 void
 ObjectTreeItem::addChild(ObjectTreeItem *c)
 {
-	m_children.append(c);
+	m_tqchildren.append(c);
 	c->setParent(this);
 }
 
 void
 ObjectTreeItem::removeChild(ObjectTreeItem *c)
 {
-	m_children.remove(c);
+	m_tqchildren.remove(c);
 }
 
 void
@@ -141,10 +141,10 @@ ObjectTree::ObjectTree(const TQString &classn, const TQString &name, TQWidget *w
 
 ObjectTree::~ObjectTree()
 {
-//	for(ObjectTreeItem *it = children()->first(); it; it = children()->next())
+//	for(ObjectTreeItem *it = tqchildren()->first(); it; it = tqchildren()->next())
 //		removeItem(it->name());
-	while (children()->first()) {
-		removeItem(children()->first());
+	while (tqchildren()->first()) {
+		removeItem(tqchildren()->first());
 	}
 }
 
@@ -216,7 +216,7 @@ ObjectTree::removeItem(ObjectTreeItem *c)
 	if (m_container && m_container->form())
 		m_container->form()->emitChildRemoved(c);
 
-	for(ObjectTreeItem *it = c->children()->first(); it; it = c->children()->next())
+	for(ObjectTreeItem *it = c->tqchildren()->first(); it; it = c->tqchildren()->next())
 		removeItem(it->name());
 
 	m_treeDict.remove(c->name());
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index eaa95a0c9..b37d7caa8 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, children ..).
+ Holds the properties of a widget (classname, name, parent, tqchildren ..).
  @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* children() { return &m_children; }
+		ObjectTreeList* tqchildren() { return &m_tqchildren; }
 
 		/*! \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_children;
+		ObjectTreeList	m_tqchildren;
 		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 82cb67bb7..049df3a56 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -191,10 +191,10 @@ ObjectTreeView::~ObjectTreeView()
 }
 
 TQSize
-ObjectTreeView::sizeHint() const
+ObjectTreeView::tqsizeHint() const
 {
 	return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+"   "),
-		KListView::sizeHint().height());
+		KListView::tqsizeHint().height());
 }
 
 TQString
@@ -367,7 +367,7 @@ ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent)
 		last = last->nextSibling();
 	treeItem->moveItem(last);
 
-	ObjectTreeList *list = item->children();
+	ObjectTreeList *list = item->tqchildren();
 	for(ObjectTreeItem *it = list->first(); it; it = list->next())
 		loadTree(it, treeItem);
 
diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h
index 2ddf867c4..b625c0ad2 100644
--- a/kexi/formeditor/objecttreeview.h
+++ b/kexi/formeditor/objecttreeview.h
@@ -73,7 +73,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 		ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false);
 		virtual ~ObjectTreeView();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		/*! Sets \a form as the current Form in the list. The list will automatically 
 		 be filled with an item for each widget in the Form, and selection will be synced. 
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 9c4a41129..168102b02 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <ktoolbar.h>
 #include <kfontcombo.h>
@@ -146,10 +146,10 @@ RichTextDialog::buttonToggled(int id)
 			if(!isOn)  break;
 			switch(id)
 			{
-				case TBLeft:  m_edit->setAlignment(TQt::AlignLeft); break;
-				case TBCenter:  m_edit->setAlignment(TQt::AlignCenter); break;
-				case TBRight:  m_edit->setAlignment(TQt::AlignRight); break;
-				case TBJustify:  m_edit->setAlignment(TQt::AlignJustify); break;
+				case TBLeft:  m_edit->tqsetAlignment(TQt::AlignLeft); break;
+				case TBCenter:  m_edit->tqsetAlignment(TQt::AlignCenter); break;
+				case TBRight:  m_edit->tqsetAlignment(TQt::AlignRight); break;
+				case TBJustify:  m_edit->tqsetAlignment(TQt::AlignJustify); break;
 				default: break;
 			}
 		}
@@ -168,7 +168,7 @@ RichTextDialog::cursorPositionChanged(int, int)
 	m_toolbar->setButton(TBUnder, m_edit->underline());
 
 	int id = 0;
-	switch(m_edit->alignment())
+	switch(m_edit->tqalignment())
 	{
 		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 f5ae41ea7..25150873a 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, alignment. */
+/*! It allows to change font name, style and color, tqalignment. */
 class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
 {
 	Q_OBJECT
diff --git a/kexi/formeditor/scripting/formscript.cpp b/kexi/formeditor/scripting/formscript.cpp
index aa32bc029..1123e0934 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'").arg(e.type()).arg(e.description()) << endl;
+		kdDebug() << TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) << endl;
 		return false;
 	}
 	return true;
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 3e0651b19..1ec9a2b4f 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -47,25 +47,25 @@ Spring::setOrientation(Qt::Orientation orient)
 	SizeType type = sizeType();
 	m_orient = orient;
 	setSizeType(type);
-	repaint();
+	tqrepaint();
 }
 
 Spring::SizeType
 Spring::sizeType() const
 {
 	if(m_orient ==Qt::Vertical)
-		return (SizeType)sizePolicy().verData();
+		return (SizeType)tqsizePolicy().verData();
 	else
-		return (SizeType)sizePolicy().horData();
+		return (SizeType)tqsizePolicy().horData();
 }
 
 void
 Spring::setSizeType(SizeType size)
 {
 	if(m_orient ==Qt::Vertical)
-		setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size);
+		tqsetSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size);
 	else
-		setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum);
+		tqsetSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum);
 }
 
 void
@@ -144,10 +144,10 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode
 	if(parentNode.tagName() == "widget")
 		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
-	if(!item->widget()->sizeHint().isValid())
-		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("size"), item->widget());
+	if(!item->widget()->tqsizeHint().isValid())
+		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("size"), item->widget());
 	else
-		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("sizeHint"), item->widget());
+		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("tqsizeHint"), item->widget());
 
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "orientation", item->widget()->property("orientation"), item->widget());
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeType", item->widget()->property("sizeType"), item->widget());
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index 20d81b9e1..f28c8e2a9 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 79f1b05ff..0cfe04833 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -276,7 +276,7 @@ void
 KFormDesignerKDevPart::open()
 {
 	m_openingFile = true;
-	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget());
+	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget());
 	if(!url.isEmpty())
 		ReadWritePart::openURL(url);
 	m_openingFile = false;
@@ -321,9 +321,9 @@ KFormDesignerKDevPart::saveAs()
 bool
 KFormDesignerKDevPart::closeForm(Form *form)
 {
-	int res = KMessageBox::warningYesNoCancel( m_workspace->topLevelWidget(),
+	int res = KMessageBox::warningYesNoCancel( m_workspace->tqtopLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 	ENABLE_ACTION("format_raise", true);
 	ENABLE_ACTION("format_lower", true);
 
-	// If the widgets selected is a container, we enable layout actions
+	// If the widgets selected is a container, we enable tqlayout actions
 	if(!multiple)
 	{
 		KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() );
@@ -535,13 +535,13 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart()
 
 //////  FormWidgetBase : helper widget to draw rects on top of widgets
 
-//repaint all children widgets
+//tqrepaint all tqchildren 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)->repaint();
+		static_cast<TQWidget*>(obj)->tqrepaint();
 	}
 	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->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().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 029965801..cd51817a7 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -296,7 +296,7 @@ void
 KFormDesignerPart::open()
 {
 	m_openingFile = true;
-	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget());
+	KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget());
 	if(!url.isEmpty())
 		ReadWritePart::openURL(url);
 	m_openingFile = false;
@@ -332,7 +332,7 @@ void
 KFormDesignerPart::saveAs()
 {
 	KURL url = KFileDialog::getSaveURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), 
-		m_workspace->topLevelWidget());
+		m_workspace->tqtopLevelWidget());
 	if(url.isEmpty())
 		return;
 	else
@@ -342,9 +342,9 @@ KFormDesignerPart::saveAs()
 bool
 KFormDesignerPart::closeForm(Form *form)
 {
-	int res = KMessageBox::questionYesNoCancel( m_workspace->topLevelWidget(),
+	int res = KMessageBox::questionYesNoCancel( m_workspace->tqtopLevelWidget(),
 		i18n( "The form \"%1\" has been modified.\n"
-		"Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ),
+		"Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ),
 		i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() );
 
 	if(res == KMessageBox::Yes)
@@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
 	ENABLE_ACTION("format_raise", true);
 	ENABLE_ACTION("format_lower", true);
 
-	// If the widgets selected is a container, we enable layout actions
+	// If the widgets selected is a container, we enable tqlayout actions
 	bool containerSelected = false;
 	if(!multiple)
 	{
@@ -451,7 +451,7 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->children()->isEmpty();
+	const bool hasChildren = !form->objectTree()->tqchildren()->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
 
-//repaint all children widgets
+//tqrepaint all tqchildren widgets
 static void repaintAll(TQWidget *w)
 {
-	w->repaint();
+	w->tqrepaint();
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->repaint();
+		static_cast<TQWidget*>(obj)->tqrepaint();
 	}
 	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->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().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 53a9a15b9..6ce4bcaef 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->children()->isEmpty())
+	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->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)->geometry();
+		TQRect  r = ((TQWidget*)o)->tqgeometry();
 		tmpw = TQMAX(tmpw, r.right());
 		tmph = TQMAX(tmph, r.bottom());
 	}
@@ -119,9 +119,9 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 
 // -----------------
 
-HorWidgetList::HorWidgetList(TQWidget *topLevelWidget)
+HorWidgetList::HorWidgetList(TQWidget *tqtopLevelWidget)
 	: WidgetList()
-	, m_topLevelWidget(topLevelWidget)
+	, m_tqtopLevelWidget(tqtopLevelWidget)
 {
 }
 
@@ -133,14 +133,14 @@ int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 {
 	TQWidget *w1 = TQT_TQWIDGET(item1);
 	TQWidget *w2 = TQT_TQWIDGET(item2);
-	return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x();
+	return w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x();
 }
 
 // -----------------
 
-VerWidgetList::VerWidgetList(TQWidget *topLevelWidget)
+VerWidgetList::VerWidgetList(TQWidget *tqtopLevelWidget)
 	: WidgetList()
-	, m_topLevelWidget(topLevelWidget)
+	, m_tqtopLevelWidget(tqtopLevelWidget)
 {
 }
 
@@ -157,9 +157,9 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	TQObject *page1 = 0;
 	TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1);
 	if (tw1) // special case
-		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
+		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
 	else
-		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
+		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
 
 	TQObject *page2 = 0;
 	TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2);
@@ -169,16 +169,16 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	}
 
 	if (tw2) // special case
-		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
+		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
 	else
-		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
+		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
 	
 	kdDebug() << w1->name() << ": " << y1 << " " 
 		<< " | " << w2->name() << ": " << y2 << endl;
 
 
-	//kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, TQPoint(0,0)) << " " << w1->y()
-		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
+	//kdDebug() << w1->name() << ": " << w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)) << " " << w1->y()
+		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_tqtopLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
 	return y1 - y2;
 }
 
diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h
index d6d56acbb..3d078401a 100644
--- a/kexi/formeditor/utils.h
+++ b/kexi/formeditor/utils.h
@@ -71,22 +71,22 @@ typedef TQPtrListIterator<TQWidget> WidgetListIterator;
 class HorWidgetList : public WidgetList
 {
 	public:
-		HorWidgetList(TQWidget *topLevelWidget);
+		HorWidgetList(TQWidget *tqtopLevelWidget);
 		virtual ~HorWidgetList();
 	protected:
 		virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
-		TQWidget *m_topLevelWidget;
+		TQWidget *m_tqtopLevelWidget;
 };
 
 //! @short A helper for sorting widgets vertically
 class VerWidgetList : public WidgetList
 {
 	public:
-		VerWidgetList(TQWidget *topLevelWidget);
+		VerWidgetList(TQWidget *tqtopLevelWidget);
 		virtual ~VerWidgetList();
 	protected:
 		virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
-		TQWidget *m_topLevelWidget;
+		TQWidget *m_tqtopLevelWidget;
 };
 
 /*! This function is used to remove all the child widgets from a list, and
@@ -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
-  children, directed to \a container.
+  tqchildren, 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 children.
+  on \a object and all of its tqchildren.
   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 children. This can be used eg to get widget's sizeHint. */
+/*! \return the size of \a w tqchildren. This can be used eg to get widget's tqsizeHint. */
 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 9bec64ba4..178e2b748 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -183,14 +183,14 @@ void WidgetFactory::hideClass(const char *classname)
 
 void
 WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
-	TQWidget *w, Container *container, TQRect geometry,
+	TQWidget *w, Container *container, TQRect tqgeometry,
 	int align, bool useFrame, bool multiLine, BackgroundMode background)
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
 		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
-		textedit->setAlignment(align);
+		textedit->tqsetAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
 			textedit->setWordWrap(dynamic_cast<TQTextEdit*>(w)->wordWrap());
 			textedit->setWrapPolicy(dynamic_cast<TQTextEdit*>(w)->wrapPolicy());
@@ -198,12 +198,12 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->setPalette(w->palette());
 		textedit->setFont(w->font());
 		textedit->setResizePolicy(TQScrollView::Manual);
-		textedit->setGeometry(geometry);
+		textedit->setGeometry(tqgeometry);
 		if(background == TQt::NoBackground)
 			textedit->setBackgroundMode(w->backgroundMode());
 		else
 			textedit->setBackgroundMode(background);
-//		textedit->setPaletteBackgroundColor(textedit->colorGroup().color( TQColorGroup::Base ));
+//		textedit->setPaletteBackgroundColor(textedit->tqcolorGroup().color( TQColorGroup::Base ));
 		textedit->setPaletteBackgroundColor(w->paletteBackgroundColor());
 		for(int i =0; i <= textedit->paragraphs(); i++)
 			textedit->setParagraphBackgroundColor(i, w->paletteBackgroundColor());
@@ -229,10 +229,10 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	}
 	else {
 		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
-		editor->setAlignment(align);
+		editor->tqsetAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
-		editor->setGeometry(geometry);
+		editor->setGeometry(tqgeometry);
 		if(background == TQt::NoBackground)
 			editor->setBackgroundMode(w->backgroundMode());
 		else
@@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	//copy properties if available
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
-	if (-1!=m_editor->metaObject()->findProperty("margin", true) && -1!=subwidget->metaObject()->findProperty("margin", true))
+	if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true))
 		m_editor->setProperty("margin", subwidget->property("margin"));
 //#endif
 //js	m_handles = new ResizeHandleSet(w, container->form(), true);
@@ -314,10 +314,10 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container)
 bool
 WidgetFactory::editList(TQWidget *w, TQStringList &list)
 {
-	KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
+	KDialogBase dialog(w->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(w->name()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist");
 	dialog.setMainWidget(edit);
 	edit->insertStringList(list);
 //	edit->show();
@@ -345,7 +345,7 @@ WidgetFactory::editRichText(TQWidget *w, TQString &text)
 void
 WidgetFactory::editListView(TQListView *listview)
 {
-	EditListViewDialog dlg(((TQWidget*)listview)->topLevelWidget());
+	EditListViewDialog dlg(((TQWidget*)listview)->tqtopLevelWidget());
 	//dlg.exec(listview);
 }
 
@@ -376,7 +376,7 @@ WidgetFactory::eventFilter(TQObject *obj, TQEvent *ev)
 		if(obj != (TQObject *)w)
 			return false;
 
-		TQWidget *focus = w->topLevelWidget()->focusWidget();
+		TQWidget *focus = w->tqtopLevelWidget()->tqfocusWidget();
 		if(focus && w != focus && !w->child(focus->name(), focus->className()))
 			resetEditor();
 	}
@@ -456,7 +456,7 @@ WidgetFactory::resetEditor()
 	if(m_widget)
 	{
 		disconnect(m_widget, 0, this, 0);
-		m_widget->repaint();
+		m_widget->tqrepaint();
 	}
 
 //js	delete m_handles;
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 7c9c5ceb1..9e5856255 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 geometry is the geometry the new line
+		  in the line edit, \a w is the edited widget, \a tqgeometry is the tqgeometry 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 geometry,
+			TQWidget *w, Container *container, TQRect tqgeometry,
 			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 alignment,
+		/*! This function creates a little editor to modify rich text. It supports tqalignment,
 		 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 55f8cde64..c9f9bd9bd 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -79,10 +79,10 @@ class WidgetLibraryPrivate
 /*! @todo: reenable */ advancedProperties.insert("palette", (char*)1);
 			advancedProperties.insert("backgroundOrigin", (char*)1);
 			advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless
-			advancedProperties.insert("layout", (char*)1);// too large risk to break things
+			advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things
 			                                              // by providing this in propeditor
-			advancedProperties.insert("minimumSize", (char*)1);
-			advancedProperties.insert("maximumSize", (char*)1);
+			advancedProperties.insert("tqminimumSize", (char*)1);
+			advancedProperties.insert("tqmaximumSize", (char*)1);
 #ifdef KEXI_NO_UNFINISHED
 /*! @todo reenable */
 			advancedProperties.insert("paletteBackgroundPixmap", (char*)1);
@@ -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!").arg(ptr->library()).arg(factoryVersion)
-				.arg(KFormDesigner::version()) << endl;
+				" -- skipping this factory!").tqarg(ptr->library()).tqarg(factoryVersion)
+				.tqarg(KFormDesigner::version()) << endl;
 			continue;
 		}
 		d->services.insert(ptr->library().latin1(), new KService::Ptr( ptr ));
@@ -532,7 +532,7 @@ WidgetLibrary::iconName(const TQCString &classname)
 	if(wi)
 		return wi->pixmap();
 
-	return TQString::fromLatin1("unknown_widget");
+	return TQString::tqfromLatin1("unknown_widget");
 }
 
 bool
@@ -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").arg(wclass->name()));
+	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(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 b76d326ad..d06a5c2e9 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -24,7 +24,7 @@
 #include <tqmetaobject.h>
 #include <tqvariant.h>
 #include <tqevent.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqapplication.h>
 #include <tqeventloop.h>
 
@@ -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)").arg(d->widgets.count()) );
+			i18n("Multiple Widgets") + TQString(" (%1)").tqarg(d->widgets.count()) );
 		d->set["this:iconName"].setValue("multiple_obj");
 		//name doesn't make sense for now
 		d->set["name"].setValue("");
@@ -287,7 +287,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 		return;
 	}
 
-	TQStrList pList = w->metaObject()->propertyNames(true);
+	TQStrList pList = w->tqmetaObject()->propertyNames(true);
 	TQStrListIterator it(pList);
 
 	// add subproperties if available
@@ -309,7 +309,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 		const TQMetaProperty *subMeta = // special case - subproperty
 			subpropIface ? subpropIface->findMetaSubproperty(it.current()) : 0;
 		const TQMetaProperty *meta = subMeta ? subMeta 
-			 : w->metaObject()->property( w->metaObject()->findProperty(*it, true), true);
+			 : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true);
 		if (!meta)
 			continue;
 		const char* propertyName = meta->name();
@@ -328,7 +328,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd();
 
 			if(meta->isEnumType()) {
-				if(qstrcmp(propertyName, "alignment") == 0)  {
+				if(qstrcmp(propertyName, "tqalignment") == 0)  {
 					createAlignProperty(meta, w, subwidget);
 					continue;
 				}
@@ -393,7 +393,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 	/*!  let's forget it for now, until we have new complete events editor
 	if (m_manager->lib()->advancedPropertiesVisible()) {
 		// add the signals property
-		TQStrList strlist = w->metaObject()->signalNames(true);
+		TQStrList strlist = w->tqmetaObject()->signalNames(true);
 		TQStrListIterator strIt(strlist);
 		TQStringList list;
 		for(; strIt.current() != 0; ++strIt)
@@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			));
 	}*/
 
-	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property
+	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property
 		createLayoutProperty(tree);
 }
 
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
+	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -621,7 +621,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget,
 		else {
 			WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widget);
 			TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widget;
-			if (-1 != subwidget->metaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) {
+			if (-1 != subwidget->tqmetaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) {
 				ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name());
 				if (tree)
 					tree->addModifiedProperty(it.key(), subwidget->property(it.key()));
@@ -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")
-			.arg(w->name()).arg(name).arg(name));
+			.tqarg(w->name()).tqarg(name).tqarg(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")
-			.arg(w->name()).arg(name).arg(name));
+			.tqarg(w->name()).tqarg(name).tqarg(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)->geometry();
+			d->set["geometry"] = TQT_TQWIDGET(o)->tqgeometry();
 		}
 	}
 	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 alignment = subwidget->property("alignment").toInt();
-	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(alignment) ) );
+	const int tqalignment = subwidget->property("tqalignment").toInt();
+	const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(tqalignment) ) );
 
 	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 alignment property
+		// Create the horizontal tqalignment 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 alignment property
+		// Create the ver tqalignment 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(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );
+			TQVariant(tqalignment & 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("alignment", true);
-	const TQMetaProperty *meta = subwidget->metaObject()->property(count, true);
-	subwidget->setProperty("alignment", meta->keysToValue(list));
+	int count = subwidget->tqmetaObject()->findProperty("tqalignment", true);
+	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true);
+	subwidget->setProperty("tqalignment", 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() == "alignment")
+	if(d->lastCommand && d->lastCommand->property() == "tqalignment")
 		d->lastCommand->setValue(meta->keysToValue(list));
 	else {
 		d->lastCommand = new PropertyCommand(this, d->widgets.first()->name(),
-			subwidget->property("alignment"), meta->keysToValue(list), "alignment");
+			subwidget->property("tqalignment"), meta->keysToValue(list), "tqalignment");
 		KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 	}
 }
@@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 	if (!container || !KFormDesigner::FormManager::self()->activeForm() ||
 		!KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget())
 		return;
-	// special containers have no 'layout' property, as it should not be changed
+	// special containers have no 'tqlayout' property, as it should not be changed
 	TQCString className = container->widget()->className();
 	if((className == "HBox") || (className == "VBox") || (className == "Grid"))
 		return;
@@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
-	KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value,
+	KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value,
 		i18n("Container's Layout"), i18n("Container's Layout"));
 	p->setVisible( container->form()->library()->advancedPropertiesVisible() );
 	d->set.addProperty(p);
 
-	updatePropertyValue(item, "layout");
+	updatePropertyValue(item, "tqlayout");
 
 	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
@@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	container = item->container();
 
-	if(prop == "layout") {
+	if(prop == "tqlayout") {
 		Container::LayoutType type = Container::stringToLayoutType(value.toString());
 
-		if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing)
+		if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing)
 			d->lastCommand->setValue(value);
 		else if(!d->isUndoing)  {
 			d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(),
-				d->set["layout"].oldValue(), value);
+				d->set["tqlayout"].oldValue(), value);
 			KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 		}
 
@@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	}
 
-	if(prop == "layoutMargin" && container->layout()) {
+	if(prop == "layoutMargin" && container->tqlayout()) {
 		container->setLayoutMargin(value.toInt());
-		container->layout()->setMargin(value.toInt());
+		container->tqlayout()->setMargin(value.toInt());
 	}
-	else if(prop == "layoutSpacing" && container->layout())  {
+	else if(prop == "layoutSpacing" && container->tqlayout())  {
 		container->setLayoutSpacing(value.toInt());
-		container->layout()->setSpacing(value.toInt());
+		container->tqlayout()->setSpacing(value.toInt());
 	}
 
 	ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name());
@@ -1000,8 +1000,8 @@ WidgetPropertySet::initPropertiesDescription()
 	d->propCaption["enabled"] = i18n("Enabled");
 	d->propCaption["geometry"] = i18n("Geometry");
 	d->propCaption["sizePolicy"] = i18n("Size Policy");
-	d->propCaption["minimumSize"] = i18n("Minimum Size");
-	d->propCaption["maximumSize"] = i18n("Maximum Size");
+	d->propCaption["tqminimumSize"] = i18n("Minimum Size");
+	d->propCaption["tqmaximumSize"] = i18n("Maximum Size");
 	d->propCaption["font"] = i18n("Font");
 	d->propCaption["cursor"] = i18n("Cursor");
 	d->propCaption["paletteForegroundColor"] = i18n("Foreground Color");
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index 896d309c3..afb303d1a 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -157,21 +157,21 @@ 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 alignment (ie hAlign, vAlign and WordBreak) for
+		/*! Creates the properties related to tqalignment (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 "alignment" property" of subwidget.  */
+		 \a meta  is the TQMetaProperty for "tqalignment" property" of subwidget.  */
 		void createAlignProperty(const TQMetaProperty *meta, TQWidget *widget, TQWidget *subwidget);
 
-		/*! Saves the properties related to alignment (ie hAlign, vAlign and WordBreak)
-		 and modifies the "alignment" property of  the widget.*/
+		/*! Saves the properties related to tqalignment (ie hAlign, vAlign and WordBreak)
+		 and modifies the "tqalignment" property of  the widget.*/
 		void saveAlignProperty(const TQString &property);
 
-		/*! Creates the "layout" property, for the Container representing \a item. */
+		/*! Creates the "tqlayout" property, for the Container representing \a item. */
 		void createLayoutProperty(ObjectTreeItem *item);
 
-		/*! Saves the "layout" property and changes the Container 's layout (
+		/*! Saves the "tqlayout" property and changes the Container 's tqlayout (
 		using Container::setLayout() ).*/
 		void saveLayoutProperty(const TQString &property, const TQVariant &value);
 
diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
index 362214a14..aa84f8313 100644
--- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
+++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp
@@ -41,11 +41,11 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget)
 	TQAsciiDict<char> addedSubproperies(1024);
 	if (m_subwidget) {
 		//remember properties in the subwidget that are not present in the parent
-		for( TQMetaObject *metaObject = m_subwidget->metaObject(); metaObject; metaObject = metaObject->superClass()) {
-			const int numProperties = metaObject->numProperties();
+		for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) {
+			const int numProperties = tqmetaObject->numProperties();
 			for (int i = 0; i < numProperties; i++) {
-				const char *propertyName = metaObject->property( i )->name();
-				if (dynamic_cast<TQObject*>(this)->metaObject()->findProperty( propertyName, true )==-1
+				const char *propertyName = tqmetaObject->property( i )->name();
+				if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1
 						&& !addedSubproperies.find( propertyName ) )
 				{
 					m_subproperies.append( propertyName );
@@ -73,10 +73,10 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons
 	if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) {
 		return 0;
 	}
-	const int index = m_subwidget->metaObject()->findProperty( name, true );
+	const int index = m_subwidget->tqmetaObject()->findProperty( name, true );
 	if (index==-1)
 		return 0;
-	return m_subwidget->metaObject()->property( index, true );
+	return m_subwidget->tqmetaObject()->property( index, true );
 }
 
 TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const
diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp
index f4a1346f7..5386d3d6d 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!")
-			.arg(propertyName.data()) << endl;
+			.tqarg(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\"")
-		.arg(m_propertyName).arg(fieldName()).arg(m_newValue.toString());
+		.tqarg(m_propertyName).tqarg(fieldName()).tqarg(m_newValue.toString());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").tqarg(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):")
-		.arg(fieldName).arg(dict->count()).arg(fieldUID);
+		.tqarg(fieldName).tqarg(dict->count()).tqarg(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\"").arg(fieldName());
+	TQString s = TQString("Remove table field \"%1\"").tqarg(fieldName());
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").arg(uid()));
+		s.append(TQString(" (UID=%1)").tqarg(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")
-		.arg(m_field->name()).arg(m_index);
+		.tqarg(m_field->name()).tqarg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").arg(m_fieldUID));
+		s.append(TQString(" (UID=%1)").tqarg(m_fieldUID));
 	if (debugOptions.showFieldDebug)
-		s.append(TQString(" (%1)").arg(m_field->debugString()));
+		s.append(TQString(" (%1)").tqarg(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")
-		.arg(fieldName()).arg(m_index);
+		.tqarg(fieldName()).tqarg(m_index);
 	if (debugOptions.showUID)
-		s.append(TQString(" (UID=%1)").arg(uid()));
+		s.append(TQString(" (UID=%1)").tqarg(uid()));
 	return s;
 }
 
@@ -878,7 +878,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu
 		}
 	}
 	// - Debug
-	TQString dbg = TQString("** Overall altering requirements: %1").arg(args.requirements);
+	TQString dbg = TQString("** Overall altering requirements: %1").tqarg(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):").arg(currentActionsCount).arg(allActionsCount);
+	dbg = TQString("** Ordered, simplified actions (%1, was %2):").tqarg(currentActionsCount).tqarg(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: ").arg(i+1), args.debugString);
+		debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").tqarg(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").arg(newTable->name()).arg(TQString::number(rand(), 16)).arg(TQString::number(rand(), 16));
+			tempDestTableName = TQString("%1_temp%2%3").tqarg(newTable->name()).tqarg(TQString::number(rand(), 16)).tqarg(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 (").arg(d->conn->escapeIdentifier(newTable->name()));
+		TQString sql = TQString("INSERT INTO %1 (").tqarg(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 017e75e4c..4af6cae6d 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.").arg(TQDir::convertSeparators(d->conn_data->fileName()))
-			: i18n("Could not connect to \"%1\" database server.").arg(d->conn_data->serverInfoString()) );
+			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()) );
 	}
 	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.").arg(dbName));
+			setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(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.")
-				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isReadable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not readable.")
-				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.tqarg(TQDir::convertSeparators(d->conn_data->fileName())) );
 			return false;
 		}
 		if (!file.isWritable()) {
 			if (!ignoreErrors)
 				setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not writable.")
-				.arg(TQDir::convertSeparators(d->conn_data->fileName())) );
+				.tqarg(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.").arg(dbName) ); \
+		setError(i18n("Database \"%1\" created but could not be closed after creation.").tqarg(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.").arg(dbName) );
+		setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").tqarg(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.").arg(dbName) );
+			i18n("Cannot create database \"%1\". This name is reserved for system database.").tqarg(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.").arg(dbName) );
+		setError(i18n("Error creating database \"%1\" on the server.").tqarg(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.").arg(dbName) );
+			setError(i18n("Database \"%1\" created but could not be opened.").tqarg(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.").arg( my_dbName ));
+		TQString msg(i18n("Opening database \"%1\" failed.").tqarg( 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.arg("kexidb_major_ver"));
+			d->errorInvalidDBContents(notfound_str.tqarg("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.arg("kexidb_minor_ver"));
+			d->errorInvalidDBContents(notfound_str.tqarg("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)")
-				.arg( TQString("%1.%2").arg(versionMajor()).arg(versionMinor()) )
-				.arg( TQString("%1.%2").arg(KexiDB::versionMajor()).arg(KexiDB::versionMinor()) ) );
+				.tqarg( TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()) )
+				.tqarg( TQString("%1.%2").tqarg(KexiDB::versionMajor()).tqarg(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.")
-				.arg(tmpdbName) );
+				.tqarg(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\".").arg(dbToDrop) );
+		setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").tqarg(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").arg(objType);
+		sql = TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(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").arg(objType));
+		TQString::tqfromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(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)").arg(field->precision()).arg(field->scale());
+					v += TQString::tqfromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale());
 				else
-					v += TQString::fromLatin1("(%1)").arg(field->precision());
+					v += TQString::tqfromLatin1("(%1)").tqarg(field->precision());
 			}
 			else if (field->type()==Field::Text && field->length()>0)
-				v += TQString::fromLatin1("(%1)").arg(field->length());
+				v += TQString::tqfromLatin1("(%1)").tqarg(field->length());
 
 			if (autoinc)
 				v += (" " +
@@ -925,7 +925,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem
 			if (field->defaultValue().isValid()) {
 				TQString valToSQL( m_driver->valueToSQL( field, field->defaultValue() ) );
 				if (!valToSQL.isEmpty()) //for sanity
-					v += TQString::fromLatin1(" DEFAULT ") + valToSQL;
+					v += TQString::tqfromLatin1(" DEFAULT ") + valToSQL;
 			}
 		}
 		sql += v;
@@ -1106,14 +1106,14 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 	for (Field::ListIterator it = querySchema.fieldsIterator(); (f = it.current()); ++it, number++) {
 		if (querySchema.isColumnVisible(number)) {
 			if (!sql.isEmpty())
-				sql += TQString::fromLatin1(", ");
+				sql += TQString::tqfromLatin1(", ");
 
 			if (f->isQueryAsterisk()) {
 				if (!singleTable && static_cast<QueryAsterisk*>(f)->isSingleTableAsterisk()) //single-table *
 					sql += escapeIdentifier(f->table()->name(), options.identifierEscaping) +
-					       TQString::fromLatin1(".*");
+					       TQString::tqfromLatin1(".*");
 				else //all-tables * (or simplified table.* when there's only one table)
-					sql += TQString::fromLatin1("*");
+					sql += TQString::tqfromLatin1("*");
 			}
 			else {
 				if (f->isExpression()) {
@@ -1137,7 +1137,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 				}
 				TQString aliasString = TQString(querySchema.columnAlias(number));
 				if (!aliasString.isEmpty())
-					sql += (TQString::fromLatin1(" AS ") + aliasString);
+					sql += (TQString::tqfromLatin1(" AS ") + aliasString);
 //! @todo add option that allows to omit "AS" keyword
 			}
 			LookupFieldSchema *lookupFieldSchema = (options.addVisibleLookupColumns && f->table())
@@ -1159,16 +1159,16 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 					{
 						//add LEFT OUTER JOIN
 						if (!s_additional_joins.isEmpty())
-							s_additional_joins += TQString::fromLatin1(" ");
+							s_additional_joins += TQString::tqfromLatin1(" ");
 						TQString internalUniqueTableAlias( TQString("__kexidb_") + lookupTable->name() + "_"
 							+ TQString::number(internalUniqueTableAliasNumber++) );
 						s_additional_joins += TQString("LEFT OUTER JOIN %1 AS %2 ON %3.%4=%5.%6")
-							.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));
+							.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));
 
 						//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() )) {
@@ -1177,13 +1177,13 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 /* not true
 							//table should be added after FROM
 							if (!s_from_additional.isEmpty())
-								s_from_additional += TQString::fromLatin1(", ");
+								s_from_additional += TQString::tqfromLatin1(", ");
 							s_from_additional += escapeIdentifier(visibleField->table()->name(), options.identifierEscaping);
 							*/
 						}
 #endif
 						if (!s_additional_fields.isEmpty())
-							s_additional_fields += TQString::fromLatin1(", ");
+							s_additional_fields += TQString::tqfromLatin1(", ");
 //							s_additional_fields += (internalUniqueTableAlias + "." //escapeIdentifier(visibleField->table()->name(), options.identifierEscaping) + "."
 //									escapeIdentifier(visibleField->name(), options.identifierEscaping));
 //! @todo Add lookup schema option for separator other than ' ' or even option for placeholders like "Name ? ?"
@@ -1216,20 +1216,20 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 					}
 					//add LEFT OUTER JOIN
 					if (!s_additional_joins.isEmpty())
-						s_additional_joins += TQString::fromLatin1(" ");
+						s_additional_joins += TQString::tqfromLatin1(" ");
 					TQString internalUniqueQueryAlias( 
 						kexidb_subquery_prefix + lookupQuery->name() + "_"
 						+ TQString::number(internalUniqueQueryAliasNumber++) );
 					s_additional_joins += TQString("LEFT OUTER JOIN (%1) AS %2 ON %3.%4=%5.%6")
-						.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));
+						.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));
 
 					if (!s_additional_fields.isEmpty())
-						s_additional_fields += TQString::fromLatin1(", ");
+						s_additional_fields += TQString::tqfromLatin1(", ");
 					const TQValueList<uint> visibleColumns( lookupFieldSchema->visibleColumns() );
 					TQString expression;
 					foreach (TQValueList<uint>::ConstIterator, visibleColumnsIt, visibleColumns) {
@@ -1260,12 +1260,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 
 	//add lookup fields
 	if (!s_additional_fields.isEmpty())
-		sql += (TQString::fromLatin1(", ") + s_additional_fields);
+		sql += (TQString::tqfromLatin1(", ") + s_additional_fields);
 
 	if (options.alsoRetrieveROWID) { //append rowid column
 		TQString s;
 		if (!sql.isEmpty())
-			s = TQString::fromLatin1(", ");
+			s = TQString::tqfromLatin1(", ");
 		if (querySchema.masterTable())
 			s += (escapeIdentifier(querySchema.masterTable()->name())+".");
 		s += m_driver->beh->ROW_ID_FIELD_NAME;
@@ -1275,7 +1275,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 	sql.prepend("SELECT ");
 	TableSchema::List* tables = querySchema.tables();
 	if ((tables && !tables->isEmpty()) || !subqueries_for_lookup_data.isEmpty()) {
-		sql += TQString::fromLatin1(" FROM ");
+		sql += TQString::tqfromLatin1(" FROM ");
 		TQString s_from;
 		if (tables) {
 			TableSchema *table;
@@ -1284,15 +1284,15 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 				++it, number++)
 			{
 				if (!s_from.isEmpty())
-					s_from += TQString::fromLatin1(", ");
+					s_from += TQString::tqfromLatin1(", ");
 				s_from += escapeIdentifier(table->name(), options.identifierEscaping);
 				TQString aliasString = TQString(querySchema.tableAlias(number));
 				if (!aliasString.isEmpty())
-					s_from += (TQString::fromLatin1(" AS ") + aliasString);
+					s_from += (TQString::tqfromLatin1(" AS ") + aliasString);
 			}
 	/*unused	if (!s_from_additional.isEmpty()) {//additional tables list needed for lookup fields
 				if (!s_from.isEmpty())
-					s_from += TQString::fromLatin1(", ");
+					s_from += TQString::tqfromLatin1(", ");
 				s_from += s_from_additional;
 			}*/
 		}
@@ -1302,11 +1302,11 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 			subqueries_for_lookup_data.current();	++it, subqueries_for_lookup_data_counter++)
 		{
 			if (!s_from.isEmpty())
-				s_from += TQString::fromLatin1(", ");
-			s_from += TQString::fromLatin1("(");
+				s_from += TQString::tqfromLatin1(", ");
+			s_from += TQString::tqfromLatin1("(");
 			s_from += selectStatement( *it.current(), params, options );
-			s_from += TQString::fromLatin1(") AS %1%2")
-				.arg(kexidb_subquery_prefix).arg(subqueries_for_lookup_data_counter);
+			s_from += TQString::tqfromLatin1(") AS %1%2")
+				.tqarg(kexidb_subquery_prefix).tqarg(subqueries_for_lookup_data_counter);
 		}
 		sql += s_from;
 	}
@@ -1315,7 +1315,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 
 	//JOINS
 	if (!s_additional_joins.isEmpty()) {
-		sql += TQString::fromLatin1(" ") + s_additional_joins + TQString::fromLatin1(" ");
+		sql += TQString::tqfromLatin1(" ") + s_additional_joins + TQString::tqfromLatin1(" ");
 	}
 
 //@todo: we're using WHERE for joins now; use INNER/LEFT/RIGHT JOIN later
@@ -1328,24 +1328,24 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 			wasWhere = true;
 		}
 		else
-			s_where += TQString::fromLatin1(" AND ");
+			s_where += TQString::tqfromLatin1(" AND ");
 		Field::Pair *pair;
 		TQString s_where_sub;
 		for (TQPtrListIterator<Field::Pair> p_it(*rel->fieldPairs()); (pair = p_it.current()); ++p_it) {
 			if (!s_where_sub.isEmpty())
-				s_where_sub += TQString::fromLatin1(" AND ");
+				s_where_sub += TQString::tqfromLatin1(" AND ");
 			s_where_sub += (
 				escapeIdentifier(pair->first->table()->name(), options.identifierEscaping) +
-				TQString::fromLatin1(".") +
+				TQString::tqfromLatin1(".") +
 				escapeIdentifier(pair->first->name(), options.identifierEscaping) +
-				TQString::fromLatin1(" = ")  +
+				TQString::tqfromLatin1(" = ")  +
 				escapeIdentifier(pair->second->table()->name(), options.identifierEscaping) +
-				TQString::fromLatin1(".") +
+				TQString::tqfromLatin1(".") +
 				escapeIdentifier(pair->second->name(), options.identifierEscaping));
 		}
 		if (rel->fieldPairs()->count()>1) {
 			s_where_sub.prepend("(");
-			s_where_sub += TQString::fromLatin1(")");
+			s_where_sub += TQString::tqfromLatin1(")");
 		}
 		s_where += s_where_sub;
 	}
@@ -1362,7 +1362,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema,
 		}
 	}
 	if (!s_where.isEmpty())
-		sql += TQString::fromLatin1(" WHERE ") + s_where;
+		sql += TQString::tqfromLatin1(" WHERE ") + s_where;
 //! \todo (js) add other sql parts
 	//(use wasWhere here)
 	
@@ -1424,8 +1424,8 @@ TQ_ULLONG Connection::lastInsertedAutoIncValue(const TQString& aiFieldName, cons
 	}
 	RowData rdata;
 	if (row_id<=0 || true!=querySingleRecord(
-		TQString::fromLatin1("SELECT ") + tableName + TQString::fromLatin1(".") + aiFieldName + TQString::fromLatin1(" FROM ") + tableName
-		+ TQString::fromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::fromLatin1("=") + TQString::number(row_id), rdata))
+		TQString::tqfromLatin1("SELECT ") + tableName + TQString::tqfromLatin1(".") + aiFieldName + TQString::tqfromLatin1(" FROM ") + tableName
+		+ TQString::tqfromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::tqfromLatin1("=") + TQString::number(row_id), rdata))
 	{
 //		KexiDBDbg << "Connection::lastInsertedAutoIncValue(): row_id<=0 || true!=querySingleRecord()" << endl;
 	 	return (TQ_ULLONG)-1; //ULL;
@@ -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.")
-				.arg(tableSchema->name()));
+				.tqarg(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.")
-				.arg(sys_field->name()).arg(tableName));
+				.tqarg(sys_field->name()).tqarg(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.").arg(tableSchema->name()) );
+					i18n("Could not create the same table \"%1\" twice.").tqarg(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.").arg(tableSchema->name()) );
+			setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").tqarg(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.arg(tableSchema->name())
+		setError(ERR_OBJECT_NOT_FOUND, errmsg.tqarg(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.arg(tableSchema->name()) + d->strItIsASystemObject());
+		setError(ERR_SYSTEM_NAME_RESERVED, errmsg.tqarg(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.")
-			.arg(table));
+			.tqarg(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.")
-			.arg(tableSchema.name()));
+			.tqarg(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\"").arg(tableSchema.name()));
+		setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").tqarg(tableSchema.name()));
 		return false;
 	}
 	if (newName.isEmpty() || !KexiUtils::isIdentifier(newName)) {
-		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").arg(newName));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").tqarg(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.")
-			.arg(newTableName));
+			.tqarg(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.")
-			.arg(tableSchema.name()).arg(newName).arg(newName));
+			.tqarg(tableSchema.name()).tqarg(newName).tqarg(newName));
 		return false;
 	}
 
@@ -1838,13 +1838,13 @@ 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")
-			.arg(origID).arg(tableSchema.id()).arg((int)TableObjectType)))
+		if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3")
+			.tqarg(origID).tqarg(tableSchema.id()).tqarg((int)TableObjectType)))
 		{
 			return false;
 		}
-		if (!executeSQL(TQString::fromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2")
-			.arg(origID).arg(tableSchema.id())))
+		if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2")
+			.tqarg(origID).tqarg(tableSchema.id())))
 		{
 			return false;
 		}
@@ -1861,8 +1861,8 @@ 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")
-		.arg(m_driver->escapeString(tableSchema.name())).arg(tableSchema.id())))
+	if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2")
+		.tqarg(m_driver->escapeString(tableSchema.name())).tqarg(tableSchema.id())))
 	{
 		alterTableName_ERR;
 		return false;
@@ -1889,8 +1889,8 @@ bool Connection::drv_alterTableName(TableSchema& tableSchema, const TQString& ne
 	const TQString oldTableName = tableSchema.name();
 	tableSchema.setName(newName);
 
-	if (!executeSQL(TQString::fromLatin1("ALTER TABLE %1 RENAME TO %2")
-		.arg(escapeIdentifier(oldTableName)).arg(escapeIdentifier(newName))))
+	if (!executeSQL(TQString::tqfromLatin1("ALTER TABLE %1 RENAME TO %2")
+		.tqarg(escapeIdentifier(oldTableName)).tqarg(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.")
-			.arg(query));
+			.tqarg(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.").arg(m_driver->name() )); }
+	 i18n("Transactions are not supported for \"%1\" driver.").tqarg(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'").arg(objId) )))
+	if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").tqarg(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\"").arg(sdata.m_name));
+		setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").tqarg(sdata.m_name));
 		return false;
 	}
 	sdata.m_caption = data[3].toString();
@@ -2300,9 +2300,9 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata )
 tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata )
 {
 	RowData data;
-	if (true!=querySingleRecord(TQString::fromLatin1(
+	if (true!=querySingleRecord(TQString::tqfromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.arg(objectID), data))
+		.tqarg(objectID), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2310,9 +2310,9 @@ tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata )
 tristate Connection::loadObjectSchemaData( int objectType, const TQString& objectName, SchemaData &sdata )
 {
 	RowData data;
-	if (true!=querySingleRecord(TQString::fromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc "
+	if (true!=querySingleRecord(TQString::tqfromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc "
 		"FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-		.arg(objectType).arg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
+		.tqarg(objectType).tqarg(m_driver->valueToSQL(Field::Text, objectName.lower())), data))
 		return cancelled;
 	return setupObjectSchemaData( data, sdata );
 }
@@ -2324,9 +2324,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject )
 		return false;
 	if (newObject) {
 		int existingID;
-		if (true == querySingleNumber(TQString::fromLatin1(
+		if (true == querySingleNumber(TQString::tqfromLatin1(
 			"SELECT o_id FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2")
-			.arg(sdata.type()).arg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID))
+			.tqarg(sdata.type()).tqarg(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")
-		.arg(sdata.id()).arg(sdata.type())
-		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
-		.arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) );
+		.tqarg(sdata.id()).tqarg(sdata.type())
+		.tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption()))
+		.tqarg(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.").arg(column));
+		setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").tqarg(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: ")
-			.arg(errorMsg).arg(errorLine).arg(errorColumn) + extendedTableSchemaString.left(1024));
+			.tqarg(errorMsg).tqarg(errorLine).tqarg(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\"")
-			.arg( data.at(2).toString() ));
+			.tqarg( data.at(2).toString() ));
 		ok = false;
 		return 0;
 	}
@@ -2807,9 +2807,9 @@ KexiDB::TableSchema* Connection::setupTableSchema( const RowData &data )
 
 	KexiDB::Cursor *cursor;
 	if (!(cursor = executeQuery(
-		TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
+		TQString::tqfromLatin1("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").arg(t->m_id) )))
+			" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->m_id) )))
 	{
 		delete t;
 		return 0;
@@ -2867,9 +2867,9 @@ TableSchema* Connection::tableSchema( const TQString& tableName )
 		return t;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::fromLatin1(
+	if (true!=querySingleRecord(TQString::tqfromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.arg(m_tableName).arg(KexiDB::TableObjectType), data))
+			.tqarg(m_tableName).tqarg(KexiDB::TableObjectType), data))
 		return 0;
 
 	return setupTableSchema(data);
@@ -2882,9 +2882,9 @@ TableSchema* Connection::tableSchema( int tableId )
 		return t;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::fromLatin1(
+	if (true!=querySingleRecord(TQString::tqfromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1")
-		.arg(tableId), data))
+		.tqarg(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").arg(objectID));
+	TQString sql(TQString::tqfromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID));
 	TQString sql_sub( KexiDB::sqlWhere(m_driver, KexiDB::Field::Text, "o_sub_id", dataID) );
 
 	bool ok, exists;
@@ -2917,7 +2917,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const
 			+ " WHERE o_id=" + TQString::number(objectID) + " AND " + sql_sub );
 	}
 	return executeSQL(
-		TQString::fromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (")
+		TQString::tqfromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (")
 		+ TQString::number(objectID) +"," + m_driver->valueToSQL( KexiDB::Field::LongText, dataString )
 		+ "," + m_driver->valueToSQL( KexiDB::Field::Text, dataID ) + ")" );
 }
@@ -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.")
-			.arg(data[2].toString()));
+			.tqarg(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>").arg(data[2].toString())
-			.arg(d->parser()->statement()));
+			"<p>You can open this query in Text View and correct it.</p>").tqarg(data[2].toString())
+			.tqarg(d->parser()->statement()));
 		return 0;
 	}
 	if (!setupObjectSchemaData( data, *query )) {
@@ -2974,9 +2974,9 @@ QuerySchema* Connection::querySchema( const TQString& queryName )
 		return q;
 	//not found: retrieve schema
 	RowData data;
-	if (true!=querySingleRecord(TQString::fromLatin1(
+	if (true!=querySingleRecord(TQString::tqfromLatin1(
 		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2")
-			.arg(m_queryName).arg(KexiDB::QueryObjectType), data))
+			.tqarg(m_queryName).tqarg(KexiDB::QueryObjectType), data))
 		return 0;
 
 	return setupQuerySchema(data);
@@ -2990,8 +2990,8 @@ QuerySchema* Connection::querySchema( int queryId )
 	//not found: retrieve schema
 	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").arg(queryId), data))
+	if (true!=querySingleRecord(TQString::tqfromLatin1(
+		"SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").tqarg(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.").arg(it.current()->name()));
+						i18n("Primary key's field \"%1\" cannot be empty.").tqarg(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.")
-					.arg(query.name()));
+					.tqarg(query.name()));
 				return false;
 			}
 		}
@@ -3351,11 +3351,11 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf
 			return false;
 		}
 		RowData aif_data;
-		TQString getAutoIncForInsertedValue = TQString::fromLatin1("SELECT ")
+		TQString getAutoIncForInsertedValue = TQString::tqfromLatin1("SELECT ")
 			+ query.autoIncrementSQLFieldsList(m_driver)
-			+ TQString::fromLatin1(" FROM ")
+			+ TQString::tqfromLatin1(" FROM ")
 			+ escapeIdentifier(id_columnInfo->field->table()->name())
-			+ TQString::fromLatin1(" WHERE ")
+			+ TQString::tqfromLatin1(" WHERE ")
 			+ escapeIdentifier(id_columnInfo->field->name()) + "="
 			+ TQString::number(last_id);
 		if (true!=querySingleRecord(getAutoIncForInsertedValue, aif_data)) {
@@ -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.")
-			.arg(query.name()));
+			.tqarg(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.")
-					.arg(it.current()->name()));
+					.tqarg(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 75c30cfa5..dc95e30f8 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\": ").arg(query.name())+query.debugString());
+	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").tqarg(query.name())+query.debugString());
 #endif
 	init();
 }
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp
index 9e384debb..1edf5a258 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.")
-		.arg(v.toString());
+		.tqarg(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 490a7390f..44b69192e 100644
--- a/kexi/kexidb/dbproperties.cpp
+++ b/kexi/kexidb/dbproperties.cpp
@@ -38,31 +38,31 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value
 	bool ok;
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
-		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.arg(m_conn->driver()->escapeString(name)), ok);
+		TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
+			.tqarg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
-			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.arg(m_conn->driver()->escapeString(value.toString()))
-			.arg(m_conn->driver()->escapeString(name))))
+			TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
+			.tqarg(m_conn->driver()->escapeString(value.toString()))
+			.tqarg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
+			setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
 			return false;
 		}
 		return true;
 	}
 
 	if (!m_conn->executeSQL(
-		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.arg(m_conn->driver()->escapeString(name))
-		.arg(m_conn->driver()->escapeString(value.toString()))))
+		TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
+		.tqarg(m_conn->driver()->escapeString(name))
+		.tqarg(m_conn->driver()->escapeString(value.toString()))))
 	{
-		setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name));
+		setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name));
 		return false;
 	}
 	return true;
@@ -76,31 +76,31 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt
 	bool ok;
 	//we need to know whether update or insert
 	bool exists = m_conn->resultExists(
-		TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
-			.arg(m_conn->driver()->escapeString(name)), ok);
+		TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1")
+			.tqarg(m_conn->driver()->escapeString(name)), ok);
 	if (!ok) {
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
 		return false;
 	}
 
 	if (exists) {
 		if (!m_conn->executeSQL(
-			TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
-			.arg(m_conn->driver()->escapeString(caption))
-			.arg(m_conn->driver()->escapeString(name))))
+			TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2")
+			.tqarg(m_conn->driver()->escapeString(caption))
+			.tqarg(m_conn->driver()->escapeString(name))))
 		{
-			setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
+			setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
 			return false;
 		}
 		return true;
 	}
 
 	if (!m_conn->executeSQL(
-		TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
-		.arg(m_conn->driver()->escapeString(name))
-		.arg(m_conn->driver()->escapeString(caption))))
+		TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)")
+		.tqarg(m_conn->driver()->escapeString(name))
+		.tqarg(m_conn->driver()->escapeString(caption))))
 	{
-		setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name));
+		setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name));
 		return false;
 	}
 	return true;
@@ -111,9 +111,9 @@ TQVariant DatabaseProperties::value( const TQString& _name )
 	TQString result;
 	TQString name(_name.stripWhiteSpace());
 	if (true!=m_conn->querySingleString(
-		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
+		TQString::tqfromLatin1("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\".").arg(name));
+		m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").tqarg(name));
 		return TQVariant();
 	}
 	return result;
@@ -126,9 +126,9 @@ TQString DatabaseProperties::caption( const TQString& _name )
 	//captions have ' ' prefix
 	name.prepend(" ");
 	if (true!=m_conn->querySingleString(
-		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=")
+		TQString::tqfromLatin1("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\".").arg(name));
+		setError(m_conn, i18n("Could not read database property \"%1\".").tqarg(name));
 		return TQString();
 	}
 	return result;
@@ -138,8 +138,8 @@ TQStringList DatabaseProperties::names()
 {
 	TQStringList result;
 	if (true!=m_conn->queryStringList(
-		TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ")
-		    + m_conn->driver()->escapeString(TQString::fromLatin1(" %%")), result, 0 /*0-th*/)) {
+		TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ")
+		    + m_conn->driver()->escapeString(TQString::tqfromLatin1(" %%")), result, 0 /*0-th*/)) {
 		//                                                        ^^ exclude captions
 		setError(m_conn, i18n("Could not read database properties."));
 		return TQStringList();
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index d760a004e..4db1b4001 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.")
-		.arg(name())
-		.arg(TQString("%1.%2").arg(version().major).arg(version().minor))
-		.arg(TQString("%1.%2").arg(KexiDB::version().major).arg(KexiDB::version().minor)));
+		.tqarg(name())
+		.tqarg(TQString("%1.%2").tqarg(version().major).tqarg(version().minor))
+		.tqarg(TQString("%1.%2").tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor)));
 		return false;
 	}
 
-	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").arg(name());
+	TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").tqarg(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.arg("DriverBehaviour::ROW_ID_FIELD_NAME"));
+		setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.tqarg("DriverBehaviour::ROW_ID_FIELD_NAME"));
 		return false;
 	}
 
@@ -135,7 +135,7 @@ TQString Driver::fileDBDriverMimeType() const
 { return d->fileDBDriverMimeType; }
 
 TQString Driver::defaultFileBasedDriverMimeType()
-{ return TQString::fromLatin1("application/x-kexiproject-sqlite3"); }
+{ return TQString::tqfromLatin1("application/x-kexiproject-sqlite3"); }
 
 TQString Driver::defaultFileBasedDriverName()
 {
@@ -282,7 +282,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const
 			return dateTimeToSQL( v.toDateTime() );
 		case Field::BLOB: {
 			if (v.toByteArray().isEmpty())
-				return TQString::fromLatin1("NULL");
+				return TQString::tqfromLatin1("NULL");
 			if (v.type()==TQVariant::String)
 				return escapeBLOB(v.toString().utf8());
 			return escapeBLOB(v.toByteArray());
diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp
index 462ce608b..8c7f096a9 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").arg(version().major).arg(version().minor);
+	  TQString("%1.%2").tqarg(version().major).tqarg(version().minor);
 	propertyCaptions["kexidb_driver_version"] =
 	  i18n("KexiDB driver version");
 }
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 1f348ddf0..0a7ff5742 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!").arg(srv_name.lower()).arg(srv_ver_str)
-				.arg(KexiDB::version().major).arg(KexiDB::version().minor) << endl;
+				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
+				.tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor) << endl;
 			possibleProblems += TQString("\"%1\" database driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.arg(srv_name.lower()).arg(srv_ver_str)
-				.arg(KexiDB::version().major).arg(KexiDB::version().minor);
+				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
+				.tqarg(KexiDB::version().major).tqarg(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\".").arg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(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\".").arg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(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\".")
-				.arg(name) );
+				.tqarg(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\".").arg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").tqarg(name) );
 		return KService::Ptr();
 	}
 }
@@ -425,7 +425,7 @@ TQString DriverManager::possibleProblemsInfoMsg() const
 	for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin();
 		it!=d_int->possibleProblems.constEnd(); ++it)
 	{
-		str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>"));
+		str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>"));
 	}
 	str += "</ul>";
 	return str;
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
index 448531637..18682a4f0 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")
-		.arg(driver()->escapeString(tableName)), success) && success;
+		.tqarg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool MySqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 0f2bcf9b9..01d326af2 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -120,12 +120,12 @@ TQString MySqlDriver::escapeString(const TQString& str) const
 	const int old_length = str.length();
 	int i;
 	for ( i = 0; i < old_length; i++ ) { //anything to escape?
-		const unsigned int ch = str[i].unicode();
+		const unsigned int ch = str[i].tqunicode();
 		if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0')
 			break;
 	}
 	if (i >= old_length) { //no characters to escape
-		return TQString::fromLatin1("'") + str + TQString::fromLatin1("'");
+		return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'");
 	}
 
 	TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation
@@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
 	int new_length = 0;
 	new_string[new_length++] = '\''; //prepend '
 	for ( i = 0; i < old_length; i++, new_length++ ) {
-		const unsigned int ch = str[i].unicode();
+		const unsigned int ch = str[i].tqunicode();
 		if (ch == '\\') {
 			new_string[new_length++] = '\\';
 			new_string[new_length] = '\\';
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index d6262befc..c81f04adb 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -128,7 +128,7 @@ bool pqxxSqlConnection::drv_getDatabasesList( TQStringList &list )
 			// Read value of column 0 into a string N
 			c[0].to(N);
 			// Copy the result into the return list
-			list << TQString::fromLatin1 (N.c_str());
+			list << TQString::tqfromLatin1 (N.c_str());
 		}
 		return true;
 	}
@@ -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'").arg(data()->port);
+	conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(data()->port);
 
-	conninfo += TQString::fromLatin1(" dbname='%1'").arg(dbName);
+	conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(dbName);
 
 	if (!data()->userName.isNull())
-		conninfo += TQString::fromLatin1(" user='%1'").arg(data()->userName);
+		conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(data()->userName);
 
 	if (!data()->password.isNull())
-		conninfo += TQString::fromLatin1(" password='%1'").arg(data()->password);
+		conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(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")
-		.arg(driver()->escapeString(tableName)), success) && success;
+		.tqarg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool pqxxSqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index 8a61978d6..637a33f39 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
@@ -79,7 +79,7 @@ inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r)
 	switch(r.type())
 	{
 		case BOOLOID:
-			return TQString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
+			return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
 		case INT2OID:
 		case INT4OID:
 		case INT8OID:
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 8967bc5e5..333df590c 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -133,9 +133,9 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const
 //
 TQString pqxxSqlDriver::escapeString( const TQString& str) const
 {
-    return TQString::fromLatin1("'")
+    return TQString::tqfromLatin1("'")
     	+ TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() )
-    	+ TQString::fromLatin1("'");
+    	+ TQString::tqfromLatin1("'");
 }
 
 //==================================================================================
@@ -172,7 +172,7 @@ TQString pqxxSqlDriver::valueToSQL( uint ftype, const TQVariant& v ) const
 		// use SQL compliant TRUE or FALSE as described here
 		// http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.html
 		// 1 or 0 does not work
-		return v.toInt()==0 ? TQString::fromLatin1("FALSE") : TQString::fromLatin1("TRUE");
+		return v.toInt()==0 ? TQString::tqfromLatin1("FALSE") : TQString::tqfromLatin1("TRUE");
 	}
 	return Driver::valueToSQL(ftype, v);
 }
diff --git a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp
index 1fb33233a..14d2217a4 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\".").arg(TQDir::convertSeparators(databaseName)) );
+	TQString title( i18n("Could not compact database \"%1\".").tqarg(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 cf478b94c..631f3bc6c 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")
-		.arg(driver()->escapeString(tableName)), success) && success;
+		.tqarg(driver()->escapeString(tableName)), success) && success;
 }
 
 bool SQLiteConnection::drv_getTablesList( TQStringList &list )
@@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
 
 	d->res = sqlite3_open( 
 		//TQFile::encodeName( data()->fileName() ), 
-		data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */
+		data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */
 		&d->data,
 		exclusiveFlag,
 		allowReadonly /* If 1 and locking fails, try opening in read-only mode */
@@ -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?")
-				.arg(TQDir::convertSeparators(data()->fileName()))
+				.tqarg(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\".")
-			.arg(TQDir::convertSeparators(filename)) + " "
+			.tqarg(TQDir::convertSeparators(filename)) + " "
 			+ i18n("Check the file's permissions and whether it is already opened and locked by another application."));
 		return false;
 	}
@@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName()
 {
 	TQString r = 
 #ifdef SQLITE2
-		TQString::fromLatin1( sqlite_error_string(d->res) );
+		TQString::tqfromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-		TQString(); //fromLatin1( d->result_name );
+		TQString(); //tqfromLatin1( d->result_name );
 #endif
 	return r.isEmpty() ? Connection::serverResultName() : r;
 }
@@ -395,8 +395,8 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri
 //TODO indices, etc.???
 
 	// 3. copy all rows to the new table
-	if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2")
-		.arg(escapeIdentifier(tableSchema.name())).arg(escapeIdentifier(oldTableName))))
+	if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2")
+		.tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName))))
 	{
 		drv_alterTableName_ERR;
 		return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
index 20d80f9c6..5239127ca 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
@@ -476,19 +476,19 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const
 			case Field::Integer:
 				data[i] = TQVariant( TQCString(*col).toInt() );
 			case Field::BigInteger:
-				data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() );
+				data[i] = TQVariant( TQString::tqfromLatin1(*col).toLongLong() );
 			case Field::Boolean:
-				data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 );
+				data[i] = TQVariant( sqliteStringToBool(TQString::tqfromLatin1(*col)), 1 );
 				break;
 			case Field::Date:
-				data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate );
+				data[i] = TQDate::fromString( TQString::tqfromLatin1(*col), Qt::ISODate );
 				break;
 			case Field::Time:
 				//TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull()
-				data[i] = KexiUtils::stringToHackedTQTime(TQString::fromLatin1(*col));
+				data[i] = KexiUtils::stringToHackedTQTime(TQString::tqfromLatin1(*col));
 				break;
 			case Field::DateTime: {
-				TQString tmp( TQString::fromLatin1(*col) );
+				TQString tmp( TQString::tqfromLatin1(*col) );
 				tmp[10] = 'T';
 				data[i] = TQDateTime::fromString( tmp, Qt::ISODate );
 				break;
@@ -548,9 +548,9 @@ int SQLiteCursor::serverResult()
 TQString SQLiteCursor::serverResultName()
 {
 #ifdef SQLITE2
-	return TQString::fromLatin1( sqlite_error_string(d->res) );
+	return TQString::tqfromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-	return TQString::fromLatin1( d->result_name );
+	return TQString::tqfromLatin1( d->result_name );
 #endif
 }
 
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index 968025965..d24d906da 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\"...")
-		.arg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>")
+		.tqarg("<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.")
-			.arg(decrease).arg(KIO::convertSize(newSize)));
+			.tqarg(decrease).tqarg(KIO::convertSize(newSize)));
 	}
 	return m_result;
 }
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index d9a33b4c1..35ab8d70e 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)").arg(m_token).arg(Driver::defaultSQLTypeName(type()));
+	return TQString("BaseExpr(%1,type=%1)").tqarg(m_token).tqarg(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)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(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} ").arg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
+	return TQString("{INVALID_OPERATOR#%1} ").tqarg(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)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString BinaryExpr::tokenToString()
@@ -449,7 +449,7 @@ TQString BinaryExpr::tokenToString()
 	/* not handled here */
 	default:;
 	}
-	return TQString("{INVALID_BINARY_OPERATOR#%1} ").arg(m_token);
+	return TQString("{INVALID_BINARY_OPERATOR#%1} ").tqarg(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)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(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]").arg(value.toString())
-		+ TQString("',type=%1)").arg(Driver::defaultSQLTypeName(type()));
+	return TQString("QueryParameterExpr('") + TQString::tqfromLatin1("[%2]").tqarg(value.toString())
+		+ TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").arg(value.toString());
+	return params ? params->getPreviousValueAsString(type()) : TQString::tqfromLatin1("[%2]").tqarg(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)").arg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
+		+ TQString(",type=%1)").tqarg(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.")
-						.arg(firstField->table()->name()).arg(f->table()->name())
-						.arg(fieldName).arg(fieldName);
+						.tqarg(firstField->table()->name()).tqarg(f->table()->name())
+						.tqarg(fieldName).tqarg(fieldName);
 					return false;
 				}
 			}
 		}
 		if (!firstField) {
 			parseInfo.errMsg = i18n("Field not found");
-			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").arg(fieldName);
+			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").tqarg(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\"").arg(tableName)
-				.arg(TQString(tableName+"."+fieldName)).arg(TQString(tableAlias+"."+fieldName.latin1()));
+				"you can write \"%3\"").tqarg(tableName)
+				.tqarg(TQString(tableName+"."+fieldName)).tqarg(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\"").arg(tableName);
+		parseInfo.errDescr = i18n("Unknown table \"%1\"").tqarg(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").arg(tableName);
-			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").arg(tableName);
+			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").tqarg(tableName);
+			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").tqarg(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")
-			.arg(tableName).arg(fieldName);
+			.tqarg(tableName).tqarg(fieldName);
 		return false;
 	}
 
@@ -815,9 +815,9 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 			numberOfTheSameFields++;
 		if (numberOfTheSameFields>1) {
 			parseInfo.errMsg = i18n("Ambiguous \"%1.%2\" expression")
-				.arg(tableName).arg(fieldName);
+				.tqarg(tableName).tqarg(fieldName);
 			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-				.arg(tableName).arg(fieldName);
+				.tqarg(tableName).tqarg(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)").arg(Driver::defaultSQLTypeName(type())));
+	res.append(TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())));
 	return res;
 }
 
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index b12000ac0..33e9e929a 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").arg(type);
+	return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").tqarg(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").arg(typeGroup);
+	return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").tqarg(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)").arg(t) 
+		KexiDBWarn << TQString("Field::setType(%1)").tqarg(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)").arg(m_precision).arg(scale());
+			dbg += TQString::tqfromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale());
 		else 
-			dbg += TQString::fromLatin1("(%1)").arg(m_precision);
+			dbg += TQString::tqfromLatin1("(%1)").tqarg(m_precision);
 	}
 	else if (m_type==Field::Text && m_length>0)
-		dbg += TQString::fromLatin1("(%1)").arg(m_length);
+		dbg += TQString::tqfromLatin1("(%1)").tqarg(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]").arg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue);
+		dbg += TQString(" DEFAULT=[%1]").tqarg(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): ").arg(m_customProperties->count());
+		dbg += TQString(" CUSTOM PROPERTIES (%1): ").tqarg(m_customProperties->count());
 		bool first = true;
 		foreach (CustomPropertiesMap::ConstIterator, it, *m_customProperties) {
 			if (first)
 				first = false;
 			else
 				dbg += ", ";
-			dbg += TQString("%1 = %2 (%3)").arg(TQString(it.key())).arg(TQString(it.data().toString())).arg(TQString(it.data().typeName()));
+			dbg += TQString("%1 = %2 (%3)").tqarg(TQString(it.key())).tqarg(TQString(it.data().toString())).tqarg(TQString(it.data().typeName()));
 		}
 	}
 	return dbg;
@@ -664,10 +664,10 @@ void Field::setCustomProperty(const TQCString& propertyName, const TQVariant& va
 //-------------------------------------------------------
 #define ADDTYPE(type, i18, str) this->at(Field::type) = i18; \
 	this->at(Field::type+Field::LastType+1) = str; \
-	str2num.insert(TQString::fromLatin1(str).lower(), type)
+	str2num.insert(TQString::tqfromLatin1(str).lower(), type)
 #define ADDGROUP(type, i18, str) this->at(Field::type) = i18; \
 	this->at(Field::type+Field::LastTypeGroup+1) = str; \
-	str2num.insert(TQString::fromLatin1(str).lower(), type)
+	str2num.insert(TQString::tqfromLatin1(str).lower(), type)
 
 Field::FieldTypeNames::FieldTypeNames()
  : TQValueVector<TQString>()
diff --git a/kexi/kexidb/fieldlist.cpp b/kexi/kexidb/fieldlist.cpp
index 292ba75e7..dea19876f 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\"").arg(field->name()) : TQString()) << endl;
+			<< (field ? TQString("\"%1\"").tqarg(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\"").arg(fname);
+	return TQString("FieldList::subList() could not find field \"%1\"").tqarg(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").arg(*it) << endl;
+			KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").tqarg(*it) << endl;
 			delete fl;
 			return 0;
 		}
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index 9db4f5a66..fbf303a9a 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -143,13 +143,13 @@ class KEXI_DB_EXPORT FieldList
 		 See @ref Connection::selectStatement() for example use.
 		 \a drvEscaping can be used to alter default escaping type.
 		*/
-		TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::fromLatin1(","), 
+		TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::tqfromLatin1(","), 
 			const TQString& tableAlias = TQString(),
 			int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
 
 		/*! Like above, but this is convenient static function, so you can pass any \a list here. */
 		static TQString sqlFieldsList(Field::List* list, Driver *driver,
-			const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(),
+			const TQString& separator = TQString::tqfromLatin1(","), const TQString& tableAlias = TQString(),
 			int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
 
 		/*! @internal Renames field \a oldName to \a newName. 
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 05728d00b..62a0665e1 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")
-		.arg(typeName()).arg(name()).arg(m_values ? m_values->join("|") : TQString());
+		.tqarg(typeName()).tqarg(name()).tqarg(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 )")
-		.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);
+		.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);
 }
 
 void LookupFieldSchema::debug() const
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 38a7d3862..c2cece0bc 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").arg(ctoken)+lexerErr, ctoken, current) );
+					i18n("\"%1\" is a reserved keyword").tqarg(ctoken)+lexerErr, ctoken, current) );
 			else
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("Syntax Error near \"%1\"").arg(ctoken)+lexerErr, ctoken, current) );
+					i18n("Syntax Error near \"%1\"").tqarg(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").arg(item->table()->name()), ctoken, current);
+					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(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.")
-								.arg(firstField->table()->name()).arg(f->table()->name())
-								.arg(fieldName).arg(fieldName));
+								.tqarg(firstField->table()->name()).tqarg(f->table()->name())
+								.tqarg(fieldName).tqarg(fieldName));
 						return false;
 					}
 				}
 			}
 			if (!firstField) {
 					setError(i18n("Field not found"), 
-						i18n("Table containing \"%1\" field not found").arg(fieldName));
+						i18n("Table containing \"%1\" field not found").tqarg(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\"").arg(tableName)
-					.arg(tableName+"."+fieldName).arg(tableAlias+"."+fieldName.latin1()));
+					"you can write \"%3\"").tqarg(tableName)
+					.tqarg(tableName+"."+fieldName).tqarg(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").arg(tableName),
-						i18n("More than one \"%1\" table or alias defined").arg(tableName));
+					setError(i18n("Ambiguous \"%1.*\" expression").tqarg(tableName),
+						i18n("More than one \"%1\" table or alias defined").tqarg(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").arg(tableName).arg(fieldName),
+							setError(i18n("Ambiguous \"%1.%2\" expression").tqarg(tableName).tqarg(fieldName),
 								i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-								.arg(tableName).arg(fieldName));
+								.tqarg(tableName).tqarg(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")
-						.arg(tableName).arg(fieldName));
+						.tqarg(tableName).tqarg(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").arg(TQString(tname)));
+					i18n("Table \"%1\" does not exist").tqarg(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\"")
-						.arg(columnExpr->toString())); //ok?
+						.tqarg(columnExpr->toString())); //ok?
 					CLEANUP;
 					return 0;
 				}
@@ -542,7 +542,7 @@ QuerySchema* buildSelectQuery(
 				e->toBinary()->m_larg = 0;
 			}
 			else {
-				setError(i18n("Invalid \"%1\" column definition").arg(e->toString())); //ok?
+				setError(i18n("Invalid \"%1\" column definition").tqarg(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")
-								.arg((*it).columnNumber));
+								.tqarg((*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").arg((*it).aliasOrName));
+								"column name or alias \"%1\" does not exist").tqarg((*it).aliasOrName));
 							CLEANUP;
 							return 0;
 						}
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index c7c3aa99d..091d516b5 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'").arg(item->name()).arg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current);
 				parser->setError(err);
 				yyerror("fieldlisterror");
 			}	
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index 5a8357f22..7775885d7 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'").arg(item->name()).arg(schema->name()), ctoken, current);
+				ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(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\"").arg($1));
+	setError(i18n("Invalid identifier \"%1\"").tqarg($1));
 }*/
 ;
 
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index 47e5d95c0..b77f76a3e 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -53,7 +53,7 @@ TQString QueryColumnInfo::debugString() const
 {
 	return field->name() + 
 		( alias.isEmpty() ? TQString() 
-			: (TQString::fromLatin1(" AS ") + TQString(alias)) );
+			: (TQString::tqfromLatin1(" AS ") + TQString(alias)) );
 }
 
 //=======================================
@@ -402,11 +402,11 @@ TQString OrderByColumn::debugString() const
 	if (m_column) {
 		if (m_pos>-1)
 			return TQString("COLUMN_AT_POSITION_%1(%2, %3)")
-				.arg(m_pos+1).arg(m_column->debugString()).arg(orderString);
+				.tqarg(m_pos+1).tqarg(m_column->debugString()).tqarg(orderString);
 		else
-			return TQString("COLUMN(%1, %2)").arg(m_column->debugString()).arg(orderString);
+			return TQString("COLUMN(%1, %2)").tqarg(m_column->debugString()).tqarg(orderString);
 	}
-	return m_field ? TQString("FIELD(%1, %2)").arg(m_field->debugString()).arg(orderString)
+	return m_field ? TQString("FIELD(%1, %2)").tqarg(m_field->debugString()).tqarg(orderString)
 	 : TQString("NONE");
 }
 
@@ -801,7 +801,7 @@ TQString QuerySchema::debugString()
 	else {
 		dbg1 = "<NONE>\n";
 	}
-	dbg1.prepend( TQString("(%1):\n").arg(fieldsExpandedCount) );
+	dbg1.prepend( TQString("(%1):\n").tqarg(fieldsExpandedCount) );
 	dbg += dbg1;
 
 	//it's safer to delete fieldsExpanded for now 
@@ -816,7 +816,7 @@ TQString QuerySchema::debugString()
 		if (tablePos>=0) {
 			TQCString tAlias = tableAlias(tablePos);
 			if (!tAlias.isEmpty()) {
-				dbg2 += (TQString::fromLatin1(" field \"") + FieldList::field(i)->name() 
+				dbg2 += (TQString::tqfromLatin1(" field \"") + FieldList::field(i)->name() 
 					+ "\" uses alias \"" + TQString(tAlias) + "\" of table \""
 					+ d->tables.at(tablePos)->name() + "\"\n");
 			}
@@ -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: ").arg(i) 
+				aliases += (TQString("field #%1: ").tqarg(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: ").arg(i) 
+				aliases += (TQString("table #%1: ").tqarg(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").arg(orderByColumnList().count()) 
+		dbg += (TQString("\n-ORDER BY (%1):\n").tqarg(orderByColumnList().count()) 
 			+ orderByColumnList().debugString());
 	return dbg;
 }
@@ -1291,8 +1291,8 @@ void QuerySchema::computeFieldsExpanded()
 						// (the expression object will be owned by column info)
 						visibleColumn = new Field();
 						visibleColumn->setName(
-							TQString::fromLatin1("[multiple_visible_fields_%1]")
-							.arg( ++numberOfColumnsWithMultipleVisibleFields ));
+							TQString::tqfromLatin1("[multiple_visible_fields_%1]")
+							.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
 						visibleColumn->setExpression( 
 							new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 						if (!d->ownedVisibleColumns) {
@@ -1310,7 +1310,7 @@ void QuerySchema::computeFieldsExpanded()
 						if (!table( visibleField->table()->name() )) {
 						}
 						if (!sql.isEmpty())
-							sql += TQString::fromLatin1(", ");
+							sql += TQString::tqfromLatin1(", ");
 						sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "."
 							+ escapeIdentifier(visibleField->name(), drvEscaping));
 					}*/
@@ -1351,8 +1351,8 @@ void QuerySchema::computeFieldsExpanded()
 					// (the expression object will be owned by column info)
 					visibleColumn = new Field();
 					visibleColumn->setName(
-						TQString::fromLatin1("[multiple_visible_fields_%1]")
-						.arg( ++numberOfColumnsWithMultipleVisibleFields ));
+						TQString::tqfromLatin1("[multiple_visible_fields_%1]")
+						.tqarg( ++numberOfColumnsWithMultipleVisibleFields ));
 					visibleColumn->setExpression( 
 						new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/));
 					if (!d->ownedVisibleColumns) {
@@ -1370,7 +1370,7 @@ void QuerySchema::computeFieldsExpanded()
 					if (!table( visibleField->table()->name() )) {
 					}
 					if (!sql.isEmpty())
-						sql += TQString::fromLatin1(", ");
+						sql += TQString::tqfromLatin1(", ");
 					sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "."
 						+ escapeIdentifier(visibleField->name(), drvEscaping));
 				}*/
@@ -1508,9 +1508,9 @@ void QuerySchema::computeFieldsExpanded()
 						ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
 				}
 				else {
-					const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
-						.arg( ++numberOfColumnsWithMultipleVisibleFields )
-						.arg(ci->field->table()->name()).arg(ci->field->name()) );
+					const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3")
+						.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
+						.tqarg(ci->field->table()->name()).tqarg(ci->field->name()) );
 					uint *index = lookup_dict[ key ];
 					if (index)
 						ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
@@ -1542,9 +1542,9 @@ void QuerySchema::computeFieldsExpanded()
 					ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index );
 			}
 			else {
-				const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3")
-					.arg( ++numberOfColumnsWithMultipleVisibleFields )
-					.arg(ci->field->table()->name()).arg(ci->field->name()) );
+				const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3")
+					.tqarg( ++numberOfColumnsWithMultipleVisibleFields )
+					.tqarg(ci->field->table()->name()).tqarg(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 4418f6e9d..4cead9627 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\"").arg(Field::typeName(type)).arg(message);
+	return TQString("msg=\"%1\" type=\"%2\"").tqarg(Field::typeName(type)).tqarg(message);
 }
 
 void KexiDB::debug(const QuerySchemaParameterList& list)
 {
-	KexiDBDbg << TQString("Query parameters (%1):").arg(list.count()) << endl;
+	KexiDBDbg << TQString("Query parameters (%1):").tqarg(list.count()) << endl;
 	foreach(QuerySchemaParameterListConstIterator, it, list)
 		KexiDBDbg << " - " << (*it).debugString() << endl;
 }
diff --git a/kexi/kexidb/schemadata.cpp b/kexi/kexidb/schemadata.cpp
index 9370a3ac1..9b6913499 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'")
-		.arg(m_id).arg(m_name).arg(m_caption).arg(desc);
+		.tqarg(m_id).tqarg(m_name).tqarg(m_caption).tqarg(desc);
 }
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 570043fe6..904469bca 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: ").arg(userAtHost);
+		cout << i18n("Enter password for %1: ").tqarg(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 594773af9..9fa9ca018 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>").arg(obj->recentSQLString());
+		details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").tqarg(obj->recentSQLString());
 	int serverResult;
 	TQString serverResultName;
 	if (obj->serverResult()!=0) {
@@ -159,9 +159,9 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details)
 
 	if (!details.isEmpty() && !details.startsWith("<qt>")) {
 		if (details.startsWith("<p>"))
-			details = TQString::fromLatin1("<qt>")+details;
+			details = TQString::tqfromLatin1("<qt>")+details;
 		else
-			details = TQString::fromLatin1("<qt><p>")+details;
+			details = TQString::tqfromLatin1("<qt><p>")+details;
 	}
 }
 
@@ -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")
-		.arg(objName.lower()).arg(objType), data))
+		.tqarg(objName.lower()).tqarg(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>")
-	.arg(data.serverInfoString(true)), true /*modal*/)
+	.tqarg(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>")
-					.arg(m_connData.serverInfoString(true)),
+					.tqarg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 		else {
 			KMessageBox::information(0, 
 				i18n("<qt>Test connection to <b>%1</b> database server established successfully.</qt>")
-					.arg(m_connData.serverInfoString(true)),
+					.tqarg(m_connData.serverInfoString(true)),
 				i18n("Test Connection"));
 		}
 //		slotCancel();
@@ -493,7 +493,7 @@ void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData
 int KexiDB::rowCount(Connection &conn, const TQString& sql)
 {
 	int count = -1; //will be changed only on success of querySingleNumber()
-	TQString selectSql( TQString::fromLatin1("SELECT COUNT() FROM (") + sql + ")" );
+	TQString selectSql( TQString::tqfromLatin1("SELECT COUNT() FROM (") + sql + ")" );
 	conn.querySingleNumber(selectSql, count);
 	return count;
 }
@@ -507,7 +507,7 @@ int KexiDB::rowCount(const KexiDB::TableSchema& tableSchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	tableSchema.connection()->querySingleNumber(
-		TQString::fromLatin1("SELECT COUNT(*) FROM ") 
+		TQString::tqfromLatin1("SELECT COUNT(*) FROM ") 
 		+ tableSchema.connection()->driver()->escapeIdentifier(tableSchema.name()), 
 		count
 	);
@@ -523,7 +523,7 @@ int KexiDB::rowCount(KexiDB::QuerySchema& querySchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	querySchema.connection()->querySingleNumber(
-		TQString::fromLatin1("SELECT COUNT(*) FROM (") 
+		TQString::tqfromLatin1("SELECT COUNT(*) FROM (") 
 		+ querySchema.connection()->selectStatement(querySchema) + ")",
 		count
 	);
@@ -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!")
-					.arg(propertyName.data()) << endl;
+					.tqarg(propertyName.data()) << endl;
 			}
 			else {
 				LookupFieldSchema *lookup = field.table()->lookupFieldSchema(field);
@@ -965,7 +965,7 @@ TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& p
 	TQDomElement numberEl( doc.createElement("bool") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( 
-		value ? TQString::fromLatin1("true") : TQString::fromLatin1("false") ) );
+		value ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("false") ) );
 	return el;
 }
 
@@ -998,9 +998,9 @@ TQVariant KexiDB::emptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::currentDate();
+			return TQDate::tqcurrentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::currentDateTime();
+			return TQDateTime::tqcurrentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1047,9 +1047,9 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::currentDate();
+			return TQDate::tqcurrentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::currentDateTime();
+			return TQDateTime::tqcurrentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1076,11 +1076,11 @@ TQString KexiDB::escapeBLOB(const TQByteArray& array, BLOBEscapingType type)
 		return TQString();
 	}
 	if (type == BLOBEscapeXHex)
-		str = TQString::fromLatin1("X'");
+		str = TQString::tqfromLatin1("X'");
 	else if (type == BLOBEscape0xHex)
-		str = TQString::fromLatin1("0x");
+		str = TQString::tqfromLatin1("0x");
 	else if (type == BLOBEscapeOctal)
-		str = TQString::fromLatin1("'");
+		str = TQString::tqfromLatin1("'");
 	
 	int new_length = str.length(); //after X' or 0x, etc.
 	if (type == BLOBEscapeOctal) {
@@ -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):").arg(rowData.count()) << endl;
+	KexiDBDbg << TQString("ROW DATA (%1 columns):").tqarg(rowData.count()) << endl;
 	foreach(RowData::ConstIterator, it, rowData)
 		KexiDBDbg << "- " << (*it) << endl;
 }
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index 334ea20c1..ec807d340 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -454,11 +454,11 @@ namespace KexiDB
 			return TQString::fromUtf8(data, length);
 		if (f->isIntegerType()) {
 			if (f->type()==KexiDB::Field::BigInteger)
-				return TQVariant( TQString::fromLatin1(data, length).toLongLong() );
-			return TQVariant( TQString::fromLatin1(data, length).toInt() );
+				return TQVariant( TQString::tqfromLatin1(data, length).toLongLong() );
+			return TQVariant( TQString::tqfromLatin1(data, length).toInt() );
 		}
 		if (f->isFPNumericType())
-			return TQString::fromLatin1(data, length).toDouble();
+			return TQString::tqfromLatin1(data, length).toDouble();
 		if (f->type()==KexiDB::Field::BLOB) {
 			TQByteArray ba;
 			ba.duplicate(data, length);
diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index 23e2aaebe..cbee692d5 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -21,7 +21,7 @@
 #include "utils_p.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <ktabwidget.h>
 #include <klistview.h>
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index ed1afdcbd..da5f7f964 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.at(i).lower();
+		TQChar c = s.tqat(i).lower();
 		if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9'))
 			break;
 	}
@@ -45,10 +45,10 @@ TQString KexiUtils::string2FileName(const TQString &s)
 
 inline TQString char2Identifier(const TQChar& c)
 {
-	if (c.unicode() >= TRANSLITERATION_TABLE_SIZE)
+	if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE)
 		return TQString(TQChar('_'));
-	const char *const s = transliteration_table[c.unicode()];
-	return s ? TQString::fromLatin1(s) : TQString(TQChar('_'));
+	const char *const s = transliteration_table[c.tqunicode()];
+	return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_'));
 }
 
 TQString KexiUtils::string2Identifier(const TQString &s)
@@ -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.").arg(valueName)
-		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>";
+	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>";
 }
 
 //--------------------------------------------------------------------------------
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index e7cce8671..ca3a42dd8 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -53,7 +53,7 @@ TQValidator::State LongLongValidator::validate( TQString &str, int & ) const
 	if (m_base > 10)
 		newStr = newStr.upper();
 
-	if (newStr == TQString::fromLatin1("-")) {// a special case
+	if (newStr == TQString::tqfromLatin1("-")) {// a special case
 		if ((m_min || m_max) && m_min >= 0)
 			ok = false;
 		else
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index cf3eea505..867ef23d5 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -67,10 +67,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 
 		virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); }
 
-		virtual TQRect itemRect( TQPainter *p, const TQRect &r,
+		virtual TQRect tqitemRect( TQPainter *p, const TQRect &r,
 			int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const
 		{
-			return m_style->itemRect( p, r, flags, enabled, pixmap, text, len );
+			return m_style->tqitemRect( p, r, flags, enabled, pixmap, text, len );
 		}
 
 		virtual void drawItem( TQPainter *p, const TQRect &r,
@@ -87,18 +87,18 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			m_style->tqdrawPrimitive( pe, p, r, cg, flags, option );
 		}
 
-		virtual void drawControl( TQ_ControlElement element,
+		virtual void tqdrawControl( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg,
 			SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->drawControl( element, p, widget, r, cg, how, option );
+			m_style->tqdrawControl( element, p, widget, r, cg, how, option );
 		}
 
-		virtual void drawControlMask( TQ_ControlElement element,
+		virtual void tqdrawControlMask( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, 
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->drawControlMask( element, p, widget, r, option );
+			m_style->tqdrawControlMask( element, p, widget, r, option );
 		}
 
 		virtual TQRect subRect( SubRect r, const TQWidget *widget ) const
@@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->subRect( r, widget );
 		}
 
-		virtual void drawComplexControl( TQ_ComplexControl control,
+		virtual void tqdrawComplexControl( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQColorGroup &cg, SFlags how = Style_Default,
 #ifdef TQ_TQDOC
@@ -116,14 +116,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 #endif
 			SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
+			tqdrawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
 		}
 
-		virtual void drawComplexControlMask( TQ_ComplexControl control,
+		virtual void tqdrawComplexControlMask( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->drawComplexControlMask( control, p, widget, r, option );
+			m_style->tqdrawComplexControlMask( control, p, widget, r, option );
 		}
 
 		virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
@@ -140,10 +140,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->querySubControl( control, widget, pos, option );
 		}
 
-		virtual int pixelMetric( PixelMetric metric,
+		virtual int tqpixelMetric( PixelMetric metric,
 			const TQWidget *widget = 0 ) const
 		{
-			return m_style->pixelMetric( metric, widget );
+			return m_style->tqpixelMetric( metric, widget );
 		}
 
 		virtual TQSize tqsizeFromContents( ContentsType contents,
@@ -153,11 +153,11 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->tqsizeFromContents( contents, widget, contentsSize, option );
 		}
 
-		virtual int styleHint( TQ_StyleHint stylehint,
+		virtual int tqstyleHint( TQ_StyleHint stylehint,
 			const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default,
 			TQStyleHintReturn* returnData = 0 ) const
 		{
-			return m_style->styleHint( stylehint, widget, option, returnData );
+			return m_style->tqstyleHint( stylehint, widget, option, returnData );
 		}
 
 		virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
diff --git a/kexi/kexiutils/transliteration_table.h b/kexi/kexiutils/transliteration_table.h
index 5be7dadc9..0eece11c1 100644
--- a/kexi/kexiutils/transliteration_table.h
+++ b/kexi/kexiutils/transliteration_table.h
@@ -1,4 +1,4 @@
-/* Transliteration table of 65535 unicode characters
+/* Transliteration table of 65535 tqunicode characters
    Do not edit this file, it is generated
    by ./generate_transliteration_table.sh script. */
 
diff --git a/kexi/kexiutils/tristate.h b/kexi/kexiutils/tristate.h
index f38648498..0a8df95c8 100644
--- a/kexi/kexiutils/tristate.h
+++ b/kexi/kexiutils/tristate.h
@@ -165,8 +165,8 @@ public:
 	 */
 	TQString toString() const {
 		if (m_value==False)
-			return TQString::fromLatin1("false");
-		return m_value==True ? TQString::fromLatin1("true") : TQString::fromLatin1("cancelled");
+			return TQString::tqfromLatin1("false");
+		return m_value==True ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("cancelled");
 	}
 
 private:
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index dca4998b5..7a1ab0f7a 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -226,7 +226,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string)
 	TQCString cstr(string.latin1());
 	TQByteArray array( size );
 	for (uint i=0; i<size; i++) {
-		array[i] = char(string[i].unicode()-1);
+		array[i] = char(string[i].tqunicode()-1);
 	}
 	TQMap<TQString,TQString> map;
 	TQDataStream ds(array, IO_ReadOnly);
@@ -244,17 +244,17 @@ TQString KexiUtils::stringToFileName(const TQString& string)
 void KexiUtils::simpleCrypt(TQString& string)
 {
 	for (uint i=0; i<string.length(); i++)
-		string[i] = TQChar( string[i].unicode() + 47 + i );
+		string[i] = TQChar( string[i].tqunicode() + 47 + i );
 }
 
 void KexiUtils::simpleDecrypt(TQString& string)
 {
 	for (uint i=0; i<string.length(); i++)
-		string[i] = TQChar( string[i].unicode() - 47 - i );
+		string[i] = TQChar( string[i].tqunicode() - 47 - i );
 }
 
 void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, 
-	const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio)
+	const TQPixmap& pixmap, int tqalignment, 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( alignment );
+				int hAlign = TQApplication::horizontalAlignment( tqalignment );
 				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 ( alignment & TQt::AlignBottom )
+				if ( tqalignment & TQt::AlignBottom )
 					pos.setY(pos.y() + h-img.height());
-				else if ( alignment & TQt::AlignVCenter )
+				else if ( tqalignment & TQt::AlignVCenter )
 					pos.setY(pos.y() + h/2-img.height()/2);
 			}
 			pixmapBuffer.convertFromImage(img);
 			if (!fast) {
-				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
+				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
 			}
 			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.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
+				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
 				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( alignment );
+		int hAlign = TQApplication::horizontalAlignment( tqalignment );
 		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 ( alignment & TQt::AlignBottom )
+		if ( tqalignment & TQt::AlignBottom )
 			pos.setY(pos.y() + h-pixmap.height());
-		else if ( alignment & TQt::AlignVCenter )
+		else if ( tqalignment & TQt::AlignVCenter )
 			pos.setY(pos.y() + h/2-pixmap.height()/2);
 		else //top, etc. 
 			pos.setY(pos.y());
@@ -339,8 +339,8 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		bitBlt( p.device(), 
 //			pos.x(), 
 //			pos.y(), 
-			(int)p.worldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
-			(int)p.worldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
+			(int)p.tqworldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
+			(int)p.tqworldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
 			&pixmapBuffer);
 	}
 }
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 81e4f41ea..d7bdbae84 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -184,7 +184,7 @@ namespace KexiUtils
 	KEXIUTILS_EXPORT TQString stringToFileName(const TQString& string);
 
 	/*! Performs a simple \a string  encryption using rot47-like algorithm. 
-	 Each character's unicode value is increased by 47 + i (where i is index of the character). 
+	 Each character's tqunicode value is increased by 47 + i (where i is index of the character). 
 	 The resulting string still contains redable characters.
 	 Do not use this for data that can be accessed by attackers! */
 	KEXIUTILS_EXPORT void simpleCrypt(TQString& string);
@@ -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 alignment, bool scaledContents, bool keepAspectRatio);
+		const TQPixmap& pixmap, int tqalignment, 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 919a3b615..bec7a1ec9 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().arg(valueName);
+			message = Validator::msgColumnNotEmpty().tqarg(valueName);
 			return Error;
 		}
 		return Ok;
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 8c246ad18..0aa0cd352 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqguardedptr.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqaccel.h>
 
 //! @internal
@@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
  , d( new Private() )
 {
 	m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
-	layout()->setMargin( KDialog::marginHint() );
-	layout()->setSpacing( KDialog::spacingHint() );
+	tqlayout()->setMargin( KDialog::marginHint() );
+	tqlayout()->setSpacing( KDialog::spacingHint() );
 	KAction *a = KStdAction::findNext(0, 0, 0);
 	m_btnFind->setText(a->text());
 	m_btnFind->setIconSet(a->iconSet());
@@ -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")
-				.arg(columnName) << endl;
+				.tqarg(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\"").arg(name));
+			setCaption(i18n("Replace in \"%1\"").tqarg(name));
 	}
 	else {
 		if (name.isEmpty())
 			setCaption(i18n("Find"));
 		else
-			setCaption(i18n("Find in \"%1\"").arg(name));
+			setCaption(i18n("Find in \"%1\"").tqarg(name));
 	}
 }
 
diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 133570e71..8ffc254d3 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -243,7 +243,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>2</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 3071dd383..5594d5779 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -111,7 +111,7 @@
 # define KexiVDebug if (0) kdDebug()
 #endif
 
-//first fix the geometry
+//first fix the tqgeometry
 //#define KEXI_NO_CTXT_HELP 1
 
 #ifndef KEXI_NO_CTXT_HELP
@@ -127,7 +127,7 @@
 //! width changes will be removed in KMDI
 //#define PROPEDITOR_VISIBILITY_CHANGES
 
-//temporary fix to manage layout
+//temporary fix to manage tqlayout
 #include "ksplitter.h"
 #define KDOCKWIDGET_P 1
 
@@ -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").arg(desk.width()), 700 ),
-			d->config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
+		TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
+			d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) );
 		resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height()));
 	}
 
@@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		TQToolButton *closeButton = new TQToolButton( tabWidget() );
 		closeButton->setAutoRaise( true );
 		closeButton->setPixmap( TQPixmap( kde2_closebutton ) );
-		closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); 
+		closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); 
 //		closeButton->setIconSet(SmallIconSet("tab_remove"));
 		tabWidget()->setCornerWidget( closeButton, TQt::TopRight );
 		closeButton->hide(); // hide until it's needed to avoid problems in "user mode" 
@@ -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.")
-				.arg(KEXI_APP_NAME));
+				.tqarg(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.")
-				.arg(KEXI_APP_NAME));
+				.tqarg(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) ").arg(i18n("reason:")+" <i>"+s+"</i>");
+	return TQString("<br>(%1) ").tqarg(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>").arg(projectData.infoString()),
+				"Do you want to import it as a new Kexi project?</qt>").tqarg(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\"")
-						.arg(info["type"]);
+						.tqarg(info["type"]);
 				else
-					not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]);
+					not_found_msg += i18n("unknown object type \"%1\"").tqarg(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\"").arg(info["type"])+
+					not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(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>").arg(not_found_msg) );
+			TQString("<ul>%1</ul>").tqarg(not_found_msg) );
 
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
@@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions()
 	}
 #endif
 #ifdef TQ_WS_WIN
-	showMaximized();//js: workaround for not yet completed layout settings storage on win32
+	showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32
 #endif
 }
 
@@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor()
 
 	//1		dw->setMinimumWidth(200);
 
-	//	ds->setSeparatorPos(d->propEditor->sizeHint().width(), true);
+	//	ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true);
 
 			//heh, this is for IDEAl only, I suppose?
 	//js		if (m_rightContainer) {
@@ -1864,7 +1864,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 }
 
 //! internal
-void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized)
+void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized)
 {
 	//js todo: allow to set custom "static" app caption
 
@@ -1877,18 +1877,18 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized)
 		//current dialog isn't attached! - find top level child
 		if (m_pMdi->topChild()) {
 			view = m_pMdi->topChild()->m_pClient;
-			childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
+			tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized;
 		}
 		else
 			view = 0;
 	}
 
-	if (childrenMaximized && view) {
+	if (tqchildrenMaximized && view) {
 		setCaption( d->curDialog->caption()
-			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) );
+			+ (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) );
 	}
 	else {
-		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - ")))
+		setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - ")))
 			+ d->origAppCaption );
 	}
 }
@@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings()
 		}*/
 
 		config->setGroup("MainWindow");
-	    TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ),
-              config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) );
+	    TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
+              config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(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.")
-			.arg(d->curDialog->partItem()->name()),
+			.tqarg(d->curDialog->partItem()->name()),
 		i18n("Selected view (%1) is not supported by this object type (%2).")
-			.arg(Kexi::nameForViewMode(viewMode))
-			.arg(d->curDialog->part()->instanceCaption()) );
+			.tqarg(Kexi::nameForViewMode(viewMode))
+			.tqarg(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).").arg(Kexi::nameForViewMode(viewMode)),
+		showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(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)
-						.arg(d->nameDialog->widget()->nameText())
+						.tqarg(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)
-						.arg(d->nameDialog->widget()->nameText())
+						.tqarg(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.")
-//				.arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText()));
+//				.tqarg(dlg->part()->instanceName()).tqarg(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.").arg(dlg->partItem()->name()),
+			showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(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.").arg(dlg->partItem()->name()),
+		showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(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." )
-			.arg(dlg->partItem()->name()) );
+			.tqarg(dlg->partItem()->name()) );
 		KGuiItem discardChanges( KStdGuiItem::discard() );
 		discardChanges.setWhatsThis(
 			i18n( "Pressing this button will discard all recent changes made in \"%1\" object." )
-			.arg(dlg->partItem()->name()) );
+			.tqarg(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)
-			.arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>"
+			.tqarg(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->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
+		&& pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom())
 	{
-		TQRect r = pWnd->geometry();
+		TQRect r = pWnd->tqgeometry();
 		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 invalidate actions.
+		 And: just tqinvalidate actions.
 		*/
 		if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) {
 			KexiVDebug << e->type() << endl;
@@ -3479,10 +3479,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #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")
-			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
-			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
+		d->statusBar->settqStatus(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() : "")
 			);
 #endif
 	}
@@ -3492,10 +3492,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		KexiVDebug << (focus_w ? focus_w->name() : "" )  << endl;
 		KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl;
 #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")
-			.arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "")
-			.arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "")
+		TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0;
+		d->statusBar->settqStatus(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() : "")
 			);
 #endif
 	}
@@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //				invalidateSharedActions();
 			}
 			else {
-/*			TQObject* o = focusWidget();
+/*			TQObject* o = tqfocusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->parent();*/
 //js				invalidateSharedActions(focus_w);
@@ -3534,7 +3534,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		return true;
 	}
 
-	//remember currently focued window invalidate act.
+	//remember currently focued window tqinvalidate 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").arg(Kexi::nameForViewMode(viewMode));
+				"opening is not allowed in \"%1\" mode").tqarg(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.")
-				.arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
+				.tqarg( "</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.").arg(newName) );
+		showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) );
 		success = false;
 		return;
 	}
@@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
 	if (onStartup && !d->showImportantInfoOnStartup)
 		return;
 
-	TQString key = TQString("showImportantInfo %1").arg(KEXI_VERSION_STRING);
+	TQString key = TQString("showImportantInfo %1").tqarg(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>").arg(ts.read()) );
+				tb->setText( TQString("<qt>%1</qt>").tqarg(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.")
-		.arg(static_cast<KexiDB::SchemaData*>(projectData)->name());
+		.tqarg(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.")
-				.arg(TQDir::convertSeparators(cdata.fileName())));
+				.tqarg(TQDir::convertSeparators(cdata.fileName())));
 			return;
 		}
 		data = new KexiProjectData( cdata, cdata.fileName() );
@@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio
 
 	if (dlg) {
 		// accept row changes
-		TQWidget *prevFocusWidget = focusWidget();
+		TQWidget *prevFocusWidget = tqfocusWidget();
 		dlg->setFocus();
 		d->action_data_save_row->activate();
 		if (prevFocusWidget)
@@ -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." )
-				.arg(item->name()) );
+				.tqarg(item->name()) );
 			KGuiItem doNotSave( KStdGuiItem::no() );
 			doNotSave.setWhatsThis(
 				i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." )
-				.arg(dlg->partItem()->name()) );
+				.tqarg(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)
-				.arg(item->name()) + "</p><p>" + question + "</p>",
+				.tqarg(item->name()) + "</p><p>" + question + "</p>",
 				TQString(), 
 				saveChanges,
 				doNotSave);
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 141cd4750..9dbedae33 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual bool acceptsSharedActions(TQObject *w);
 
 		/*! Performs lookup like in KexiSharedActionHost::focusWindow()
-		 but starting from \a w instead of a widget returned by TQWidget::focusWidget().
+		 but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget().
 		 \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */
 		TQWidget* findWindow(TQWidget *w);
 
@@ -346,7 +346,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		void slotPartLoaded(KexiPart::Part* p);
 
-		void slotCaptionForCurrentMDIChild(bool childrenMaximized);
+		void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized);
 		void slotNoMaximizedChildFrmLeft(KMdiChildFrm*);
 		void slotLastChildViewClosed();
 		void slotChildViewIsDetachedNow(TQWidget*);
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 3eeccc941..c79b58dbb 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.").arg(KEXI_APP_NAME),
-			i18n("Command \"%1\" failed.").arg(args.join(" ")));
+		wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME),
+			i18n("Command \"%1\" failed.").tqarg(args.join(" ")));
 	}
 
 	void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator)
@@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() {
 #endif
 			} else {
 				//propEditorToolWindow->show();
-				TQWidget *origFocusWidget = tqApp->focusWidget();
+				TQWidget *origFocusWidget = tqApp->tqfocusWidget();
 				wnd->makeWidgetDockVisible(propEditorTabWidget);
 				if (origFocusWidget)
 					origFocusWidget->setFocus();
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index f3e1acec2..45cbc4497 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -53,12 +53,12 @@ void KexiNameDialog::init()
 {
 	TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3);
 	m_icon = new TQLabel( plainPage(), "icon" );
-	m_icon->setAlignment( int( AlignTop | AlignLeft ) );
-	m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
+	m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) );
+	m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
 	m_icon->setFixedWidth(50);
 	lyr->addWidget(m_icon,0,0);
 
-	m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
+	m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
 	lyr->addWidget(m_widget,0,1);
 	lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2);
 	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
@@ -75,7 +75,7 @@ void KexiNameDialog::updateSize()
 {
 //	resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
 	resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
-		.expandedTo(minimumSizeHint()) );
+		.expandedTo(tqminimumSizeHint()) );
 //	updateGeometry();
 }
 
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index 08210ac51..c6ca8f417 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -20,7 +20,7 @@
 #include "kexinamewidget.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <kmessagebox.h>
@@ -66,8 +66,8 @@ void KexiNameWidget::init(
 
 	lbl_message = new TQLabel( this, "message" );
 	setMessageText( message );
-	lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-	lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
+	lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak );
 	lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 );
 
 	lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel,
@@ -79,17 +79,17 @@ void KexiNameWidget::init(
 	lyr->addWidget( lbl_name, 2, 0 );
 
 	le_caption = new KLineEdit( nameText, this, "le_caption" );
-	le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
+	le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0));
 	lyr->addWidget( le_caption, 1, 1 );
 
 	le_name = new KLineEdit( nameText, this, "le_name" );
-	le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
+	le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
 	Validator *idValidator = new IdentifierValidator(0, "id_val");
 	le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") );
 	lyr->addWidget( le_name, 2, 1 );
 
 	setFocusProxy(le_caption);
-	resize( TQSize(342, 123).expandedTo(minimumSizeHint()) );
+	resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) );
 
 	m_nameWarning = i18n("Please enter the name.");
 	m_captionWarning = i18n("Please enter the caption.");
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index 1ab0ea89c..acbeed5ca 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -21,7 +21,7 @@
 #define KEXINAMEWIDGET_H
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klineedit.h>
 
 namespace KexiUtils {
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 1218df23d..9beffbf5d 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\"").arg(fileName) << endl;
+		kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl;
 		return false;
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index ab6fffabe..e4bfd5801 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -22,7 +22,7 @@
 
 #include "kexistatusbar.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqtimer.h>
@@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part)
 	if (part && part->widget()) {
 		if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) {
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( setStatus( const TQString & ) ) );
+				this, TQT_SLOT( settqStatus( const TQString & ) ) );
 
 #  if TDE_VERSION < KDE_MAKE_VERSION(3,1,90)
 			changeItem(m_map[ m_activePart ], m_msgID);
@@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged()
 #endif
 }
 
-void KexiStatusBar::setStatus(const TQString &str)
+void KexiStatusBar::settqStatus(const TQString &str)
 {
 	kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl;
 //	m_status->setText(str);
@@ -125,16 +125,16 @@ void KexiStatusBar::setStatus(const TQString &str)
 
 void KexiStatusBar::setCursorPosition(int line, int col)
 {
-//	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);
+//	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);
 }
 
 /*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->sizeHint().height() + 4 > height())
-		setFixedHeight(widget->sizeHint().height() + 4);
+	if(widget->tqsizeHint().height() + 4 > height())
+		setFixedHeight(widget->tqsizeHint().height() + 4);
 }*/
 
 void KexiStatusBar::setReadOnlyFlag(bool readOnly)
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index e8c31d41a..bab1277a5 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar
 //		virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
 
 	public slots:
-		virtual void setStatus(const TQString &str);
+		virtual void settqStatus(const TQString &str);
 		virtual void setReadOnlyFlag(bool readOnly);
 
 	protected slots:
@@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar
 
 	protected:
 		int m_msgID, m_readOnlyID;
-//		TQLabel *m_status, *m_readOnlyStatus;
+//		TQLabel *m_status, *m_readOnlytqStatus;
 
 #if KexiStatusBar_KTEXTEDITOR_USED
 	KTextEditor::ViewCursorInterface * m_cursorIface;
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 8591167f1..45ab58929 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 		painter.setFont(m_mainFont);
 
-		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
+		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(),
 			true, false);
 		m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+"   ");
 		m_mainLineSpacing = painter.fontMetrics().lineSpacing();
@@ -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")
-				.arg(pageNumber+1).arg(m_pagesCount);
+				.tqarg(pageNumber+1).tqarg(m_pagesCount);
 		else
-			pageNumString = i18n("Page %1").arg(pageNumber+1);
+			pageNumString = i18n("Page %1").tqarg(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 1df662504..476f924a4 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -38,7 +38,7 @@
 
 #include <tqlabel.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -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.arg(m_item->name()) );
+		m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(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)")
-			.arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit))
-			.arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit));
+			.tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit))
+			.tqarg(m_settings.pageLayout.ptHeight).tqarg(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 ff46ee7af..6b169f7ec 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>layout15</cstring>
+                <cstring>tqlayout15</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>Page title:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignBottom</set>
             </property>
             <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>layout19</cstring>
+                <cstring>tqlayout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -222,7 +222,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>6</height>
@@ -343,7 +343,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -360,7 +360,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -377,7 +377,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -394,7 +394,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -411,7 +411,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index d17aac454..68c1c6735 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -22,7 +22,7 @@
 #include "kexisimpleprintpreviewwindow_p.h"
 #include <kexi_version.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqaccel.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(&pm), this);
+	p.tqbegin(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->repaint();
+	widget->tqrepaint();
 }
 
 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").arg(previewName).arg(KEXI_APP_NAME));
+	setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME));
 	setIcon(DesktopIcon("filequickprint"));
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
@@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
 	m_scrollView->setUpdatesEnabled(false);
 	m_view = m_scrollView->widget;
-	m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget(m_scrollView);
 
 	TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar
-	navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
@@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
 	m_pageNumber = pageNumber;
 	m_pagesCount = m_engine.pagesCount();
 
-	m_view->repaint(); //this will automatically paint a new page
+	m_view->tqrepaint(); //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").arg(m_pageNumber+1).arg(m_engine.pagesCount()));
+		i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount()));
 }
 
 void KexiSimplePrintPreviewWindow::setFullWidth()
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index c2c84011b..a9a2a3166 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -42,10 +42,10 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqgroupbox.h>
 #include <tqwidgetstack.h>
 #include <tqbuttongroup.h>
@@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 	TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection"));
 	TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections"));
 	d->stack->addWidget(m_remote);
-	if (m_remote->layout())
-		m_remote->layout()->setMargin(0);
+	if (m_remote->tqlayout())
+		m_remote->tqlayout()->setMargin(0);
 //	connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn()));
 	connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
 		this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
@@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id)
 			if (m_remote->list->firstChild()) {
 				m_remote->list->setSelected(m_remote->list->firstChild(),true);
 			}
-			m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background());
-			m_remote->descGroupBox->layout()->setMargin(2);
+			m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background());
+			m_remote->descGroupBox->tqlayout()->setMargin(2);
 			m_remote->list->setFocus();
 			slotConnectionSelectionChanged();
 		}
@@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn()
 		m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening,
 			d->stack, "openExistingFileDlg");
 		m_fileDlg->setConfirmOverwrites( d->confirmOverwrites );
-//		static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg );
+//		static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
 		d->stack->addWidget(m_fileDlg);
 
 		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
@@ -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>.").arg("") //temporary, please do not change for 0.8!
+		"You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8!
 		+ "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */
-//		.arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
+//		.tqarg("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?")
-		.arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), 
+		.tqarg(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 c55614e21..5c7bb64dd 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -72,7 +72,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -166,7 +166,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -177,7 +177,7 @@
             <property name="name">
                 <cstring>descGroupBox</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>80</height>
@@ -205,7 +205,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>50</height>
@@ -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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
@@ -268,7 +268,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 0ee1e4ddb..4ac59bc00 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -22,7 +22,7 @@
 
 #include "KexiDBTitlePageBase.h"
 
-//! @short A helper widget used to displaying a line edit with a label and layout
+//! @short A helper widget used to displaying a line edit with a label and tqlayout
 class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 {
 	Q_OBJECT
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index e8a00ef9a..7b711ea30 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>111</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -76,7 +76,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 122137e11..79f763ee6 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 9842cb416..b24a66abf 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -46,7 +46,7 @@
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqheader.h>
 
@@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	//page: type selector
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
 //	lv_types = new KListView(m_prjtype_sel, "types listview");
-//	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
+//	m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
 #if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
 #endif
@@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
 	connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*)));
 
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
-//	static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types);
+//	static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1);
 //	updateGeometry();
 
 	addPage(m_prjtype_sel, i18n("Select Storage Method"));
@@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_conn_sel_widget = new TQWidget(this);
 	TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget);
 	TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget);
-	conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	conn_sel_lyr->addWidget( conn_sel_label );
 	conn_sel_lyr->addSpacing(KDialogBase::spacingHint());
 
@@ -301,7 +301,7 @@ void KexiNewProjectWizard::next()
 				return;
 			}
 			m_project_selector->label->setText(
-				d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
+				d->server_db_name_dblist_lbl_txt.tqarg(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?")
-				.arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), 
+				.tqarg( 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 b74936dd2..f11d7f581 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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -43,7 +43,7 @@
             <property name="name">
                 <cstring>line</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>8</height>
@@ -60,13 +60,13 @@
             <property name="name">
                 <cstring>spacer</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>6</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>6</height>
@@ -75,7 +75,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -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="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 05cd52935..9353e3a6d 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -31,7 +31,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 
 #include <assert.h>
@@ -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:")
-		.arg(cdata->serverInfoString(false)) );
+		.tqarg(cdata->serverInfoString(false)) );
 }
 
 KexiProjectSelectorDialog::~KexiProjectSelectorDialog()
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 5159d9bb6..18c805441 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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -103,7 +103,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>60</height>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index f482ed736..b423d467a 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -44,7 +44,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="name">
                 <cstring>le_dbname</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>70</width>
                     <height>20</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>12</height>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index d405aee38..c479a4e08 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -54,7 +54,7 @@
 
 #include <tqcstring.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 namespace Kexi {
 	static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter;
@@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 			if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) {
 //				kdDebug() << percent << endl;
 				pd->progressBar()->setProgress(percent);
-				tqApp->processEvents(100);
+				tqApp->tqprocessEvents(100);
 			}
 		}
 	}
@@ -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.").arg("<b>"+cdata.userName+"</b>");*/
+			: "<p>"+i18n("Please enter the password for user.").tqarg("<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").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
+	msg += ("</p><p>"+i18n("Database server: %1").tqarg(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").arg(usr)+"</p>");
+	msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>");
 
 	setPrompt( msg );
 	if (showDetailsButton) {
@@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog()
 void KexiDBPasswordDialog::done(int r)
 {
 	if (r == TQDialog::Accepted) {
-		m_cdata->password = TQString::fromLatin1(password());
+		m_cdata->password = TQString::tqfromLatin1(password());
 	}
 //	if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) {
 /*			} else {
@@ -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.")
-				.arg(TQDir::convertSeparators(connectionShortcut.fileName())));
+				.tqarg(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.")
-			.arg(fileType));
+			.tqarg(fileType));
 		return false;
 	}
 
@@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 	const bool dropDB = args->isSet("dropdb");
 	const bool openExisting = !createDB && !dropDB;
 	const bool readOnly = args->isSet("readonly");
-	const TQString couldnotMsg = TQString::fromLatin1("\n")
+	const TQString couldnotMsg = TQString::tqfromLatin1("\n")
 		+i18n("Could not start Kexi application this way.");
 
 	if (createDB && dropDB) {
@@ -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.")
-					.arg(TQDir::convertSeparators(cdata.dbFileName())));
+					.tqarg(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\".")
-							.arg(TQDir::convertSeparators(cdata.fileName())));
+							.tqarg(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\".")
-							.arg(TQDir::convertSeparators(cdata.fileName())));
+							.tqarg(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.")
-					.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
+					.tqarg( 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.")
-				.arg( TQDir::convertSeparators(projectData()->databaseName()) ));
+				.tqarg( 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>")
-				.arg(TQDir::convertSeparators(dbFileName))
+				.tqarg(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>")
-					.arg(TQDir::convertSeparators(dbFileName))
+					.tqarg(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?")
-				.arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()),
+				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(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?")
-			 .arg(TQDir::convertSeparators(dbFileName))
-			 .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName));
+			 .tqarg(TQDir::convertSeparators(dbFileName))
+			 .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(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)?")
-			.arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) )
+			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(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.")
-				.arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) );
+				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
 			//continue...
 		}
 		if (res==true)
@@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (detectedDriverName.isEmpty()) {
 		TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() );
 		if (!possibleProblemsInfoMsg.isEmpty()) {
-			possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:"));
-			possibleProblemsInfoMsg += TQString::fromLatin1("</p>");
+			possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:"));
+			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
 			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
-					.arg(TQDir::convertSeparators(dbFileName)),
-				TQString::fromLatin1("<p>")
+					.tqarg(TQDir::convertSeparators(dbFileName)),
+				TQString::tqfromLatin1("<p>")
 				+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
-					.arg(mimename)
+					.tqarg(mimename)
 				+(ptr.data()->comment().isEmpty() 
-					? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment()))
-				+TQString::fromLatin1("</p>")
+					? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment()))
+				+TQString::tqfromLatin1("</p>")
 				+possibleProblemsInfoMsg);
 		return false;
 	}
@@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile(
 KexiProjectData*
 KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
-	clearStatus();
+	cleartqStatus();
 	cancelled = false;
 	if (!cdata)
 		return 0;
@@ -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.")
-				.arg(cdata->serverInfoString(true)));
+				.tqarg(cdata->serverInfoString(true)));
 		else
 			msgh.showErrorMessage(
 				i18n("Could not load list of available projects for <b>%1</b> database server.")
-				.arg(cdata->serverInfoString(true)));
-//		setStatus(i18n("Could not load list of available projects for database server \"%1\"")
-//		.arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
+				.tqarg(cdata->serverInfoString(true)));
+//		settqStatus(i18n("Could not load list of available projects for database server \"%1\"")
+//		.tqarg(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.")
-			.arg(TQDir::convertSeparators(d->shortcutFile->fileName())));
+			.tqarg(TQDir::convertSeparators(d->shortcutFile->fileName())));
 	}
 }
 
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 23d8e832a..fe1b3cf04 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 /*! Handles startup actions for Kexi application.
 */
 class KEXIMAIN_EXPORT KexiStartupHandler 
-	: public TQObject, public KexiStartupData, public Kexi::ObjectStatus
+	: public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus
 {
 	Q_OBJECT
   TQ_OBJECT
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index b2ad8cfd7..7f67bc767 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -25,7 +25,7 @@
 #include "KexiConnSelector.h"
 #include "KexiConnSelectorBase.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates()
 	tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
 	TQLabel *lbl_blank = new TQLabel( 
 		i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
-	lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_blank->setMargin(0);
 	tmplyr->addWidget( lbl_blank );
 	tmplyr->addStretch(1);
@@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_templ = new TQLabel( 
 		i18n("Kexi will create a new database project using selected template.\n"
 		"Select template and click \"OK\" button to proceed."), templPageFrame );
-	lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_templ->setMargin(0);
 	tmplyr->addWidget( lbl_templ );
 
@@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates()
 	TQLabel *lbl_import = new TQLabel( 
 		i18n("Kexi will import the structure and data of an existing database as a new database project.")
 		+clickMsg, templPageFrame );
-	lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+	lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
 	lbl_import->setMargin(0);
 	tmplyr->addWidget( lbl_import );
 	tmplyr->addStretch(1);
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index d919463d5..429499f4f 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>")
-		.arg(static_cast<TemplateItem*>(item)->name)
-		.arg(static_cast<TemplateItem*>(item)->description);
+		.tqarg(static_cast<TemplateItem*>(item)->name)
+		.tqarg(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 8dd742981..cd54602bf 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -23,7 +23,7 @@
 #include <core/kexi.h>
 #include <kexiutils/utils.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
 #include <tqapplication.h>
@@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
-	setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
+	tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
 	reparent( parentWidget(), point );
 
-	if (layout())
-		layout()->setMargin(0);
+	if (tqlayout())
+		tqlayout()->setMargin(0);
 	setMinimumHeight(100);
 	setSizeGripEnabled ( false );
 
@@ -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." )
-					.arg( TQDir::convertSeparators(path) ) );
+					.tqarg( 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." )
-						.arg( TQDir::convertSeparators(path) ) );
+						.tqarg( 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?").arg( TQDir::convertSeparators(filePath) ), TQString(), 
+		"Do you want to overwrite it?").tqarg( 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 36b8c527c..c81de131c 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").arg( u.path() );
+    TQString text = i18n("Root Directory: %1").tqarg( u.path() );
     d->pathCombo->addDefaultURL( u,
                                  KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
-    text = i18n("Home Directory: %1").arg( u.path( +1 ) );
+    text = i18n("Home Directory: %1").tqarg( 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").arg( docPath.path( +1 ) );
+        text = i18n("Documents: %1").tqarg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( u,
                                      KMimeType::pixmapForURL( u, 0, KIcon::Small ),
                                      text );
     }
 
     u.setPath( KGlobalSettings::desktopPath() );
-    text = i18n("Desktop: %1").arg( u.path( +1 ) );
+    text = i18n("Desktop: %1").tqarg( 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>").arg(getlogin()));
+                                            "button will take you to file:/home.</qt>").tqarg(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 );
@@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory."));
 
     d->bookmarkHandler = new KFileBookmarkHandler( this );
-    toolbar->insertButton(TQString::fromLatin1("bookmark"),
+    toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
                           (int)HOTLIST_BUTTON, true,
                           i18n("Bookmarks"));
     toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(),
@@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes,
 //(js)    filterWidget->setMimeFilter( mimeTypes, defaultType );
 
 //(js)    TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-//(js)    types.append( TQString::fromLatin1( "inode/directory" ));
+//(js)    types.append( TQString::tqfromLatin1( "inode/directory" ));
 //(js)    ops->clearFilter();
 //(js)    ops->setMimeFilter( types );
 //(js)    d->hasDefaultFilter = !defaultType.isEmpty();
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index e959ccdc0..e8139e181 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...")
-		.arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
+		.tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("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 46479e66a..50d6726d0 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -22,8 +22,8 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <layout.h>
-#include <textcodec.h>
+#include <tqlayout.h>
+#include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
@@ -53,16 +53,16 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
 		KDialogBase::spacingHint());
 
 	m_encodingComboBox = new KexiCharacterEncodingComboBox(plainPage(), selectedEncoding);
-	m_encodingComboBox->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_encodingComboBox->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget( m_encodingComboBox, 1, 1 );
 	TQLabel* lbl = new TQLabel( 
 		i18n("<h3>Text encoding for Microsoft Access database</h3>\n"
 		"<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>")
-		.arg(TQDir::convertSeparators(databaseFile)), plainPage());
-	lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak );
-	lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+		.tqarg(TQDir::convertSeparators(databaseFile)), plainPage());
+	lbl->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak );
+	lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 );
 
 	TQLabel* lbl2 = new TQLabel( m_encodingComboBox, i18n("Text encoding:"), plainPage());
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index cd1c94b39..9c1b45598 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -24,7 +24,7 @@
 #include "importoptionsdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
@@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
 		}
 	}
 
-	m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default
+	m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default
 }
 
 //===========================================================
@@ -148,19 +148,19 @@ void ImportWizard::setupIntro()
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint());
 	
 	TQLabel *lblIntro = new TQLabel(m_introPage);
-	lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 	TQString msg;
 	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>")
-			.arg(m_predefinedDatabaseName).arg(m_predefinedConnectionData->serverInfoString());
+			.tqarg(m_predefinedDatabaseName).tqarg(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>")
-			.arg(TQDir::convertSeparators(m_predefinedDatabaseName)).arg(mimeTypePtr->comment());
+			.tqarg(TQDir::convertSeparators(m_predefinedDatabaseName)).tqarg(mimeTypePtr->comment());
 	}
 	else {
 		msg = i18n("Database Importing wizard allows you to import an existing database "
@@ -247,7 +247,7 @@ void ImportWizard::setupDstType()
 
 	TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
 	TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage);
-	lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop);
+	lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop);
 	hbox->addWidget(lbl);
 
 	m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage);
@@ -274,7 +274,7 @@ void ImportWizard::setupDstTitle()
 {
 	m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"), 
 		this, "KexiDBTitlePage");
-	m_dstTitlePage->layout()->setMargin( KDialog::marginHint() );
+	m_dstTitlePage->tqlayout()->setMargin( KDialog::marginHint() );
 	m_dstTitlePage->updateGeometry();
 	m_dstNewDBNameLineEdit = m_dstTitlePage->le_caption;
 	addPage(m_dstTitlePage, i18n("Select Destination Database Project's Caption"));
@@ -339,10 +339,10 @@ void ImportWizard::setupImporting()
 	m_importingPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint());
 	m_lblImportingTxt = new TQLabel(m_importingPage);
-	m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_lblImportingErrTxt = new TQLabel(m_importingPage);
-	m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_progressBar = new KProgress(100, m_importingPage);
 	m_progressBar->hide();
@@ -374,7 +374,7 @@ void ImportWizard::setupFinish()
 	m_finishPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint());
 	m_finishLbl = new TQLabel(m_finishPage);
-	m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	vbox->addWidget( m_finishLbl );
 	m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), 
@@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput()
 		finishtxt = finishtxt + "<br>" + i18n("No new database name was entered.");
 	}
 
-	Kexi::ObjectStatus result;
+	Kexi::ObjecttqStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 	if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame())
 	{
@@ -551,11 +551,11 @@ void ImportWizard::arriveImportingPage() {
 //! and KexiMigration::Driver classes
 	bool showOptions = false;
 	if (fileBasedSrcSelected()) {
-		Kexi::ObjectStatus result;
+		Kexi::ObjecttqStatus result;
 		KexiMigrate* sourceDriver = prepareImport(result);
 		if (sourceDriver) {
 			showOptions = !result.error() 
-				&& sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool();
+				&& sourceDriver->propertyValue( "source_database_has_nontqunicode_encoding" ).toBool();
 			KexiMigration::Data *data = sourceDriver->data();
 			sourceDriver->setData( 0 );
 			delete data;
@@ -572,7 +572,7 @@ void ImportWizard::arriveImportingPage() {
 void ImportWizard::arriveFinishPage() {
 //	backButton()->hide();
 //	cancelButton()->setEnabled(false);
-//	m_finishLbl->setText(	m_successText.arg(m_dstNewDBNameLineEdit->text()) );
+//	m_finishLbl->setText(	m_successText.tqarg(m_dstNewDBNameLineEdit->text()) );
 }
 
 bool ImportWizard::fileBasedSrcSelected() const
@@ -650,7 +650,7 @@ void ImportWizard::accept()
 	KWizard::accept();
 }
 
-KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
+KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 {
 	KexiUtils::WaitCursor wait;
 	
@@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 	);
 	if (!destDriver || manager.error())
 	{
-		result.setStatus(&manager);
+		result.settqStatus(&manager);
 		kdDebug() << "Manager error..." << endl;
 		manager.debugError();
-//		result.setStatus(&manager);
+//		result.settqStatus(&manager);
 	}
 
 	// Set up destination connection data
@@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 		{
 			//TODO This needs a better message
 			//KMessageBox::error(this, 
-			result.setStatus(i18n("No connection data is available. You did not select a destination filename."),"");
+			result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),"");
 			//return false;
 		} */
 	}
@@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 	{
 		sourceDriverName = driverNameForSelectedSource();
 		if (sourceDriverName.isEmpty())
-			result.setStatus(i18n("No appropriate migration driver found."), 
+			result.settqStatus(i18n("No appropriate migration driver found."), 
 				m_migrateManager.possibleProblemsInfoMsg());
 	}
 
@@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 		sourceDriver = m_migrateManager.driver( sourceDriverName );
 		if(!sourceDriver || m_migrateManager.error()) {
 			kdDebug() << "Import migrate driver error..." << endl;
-			result.setStatus(&m_migrateManager);
+			result.settqStatus(&m_migrateManager);
 		}
 	}
 
@@ -793,7 +793,7 @@ tristate ImportWizard::import()
 {
 	m_importExecuted = true;
 
-	Kexi::ObjectStatus result;
+	Kexi::ObjecttqStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 
 	bool acceptingNeeded = false;
@@ -802,7 +802,7 @@ tristate ImportWizard::import()
 	if (sourceDriver && !result.error())
 	{
 		if (!m_sourceDBEncoding.isEmpty()) {
-			sourceDriver->setPropertyValue( "source_database_nonunicode_encoding", 
+			sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", 
 				TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" 
 			);
 		}
@@ -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?")
-			.arg(sourceDriver->data()->destination->infoString()),
+			.tqarg(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>")
-			.arg(msg).arg(details));
+			.tqarg(msg).tqarg(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\"").arg(dbname);
+					dbname = TQString(" \"%1\"").tqarg(dbname);
 			KMessageBox::error(this, i18n("Could not import database%1. This type is not supported.")
-				.arg(dbname));
+				.tqarg(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\".")
-					.arg(m_dstNewDBNameLineEdit->text()) );
+					.tqarg(m_dstNewDBNameLineEdit->text()) );
 				cancelButton()->setEnabled(false);
 				setBackEnabled(m_finishPage, false);
 				setFinishEnabled(m_finishPage, true);
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 19a1b844c..8d3a82b02 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -47,7 +47,7 @@ class KexiPrjTypeSelector;
 
 namespace Kexi
 {
-	class ObjectStatus;
+	class ObjecttqStatus;
 }
 
 namespace KexiDB
@@ -98,7 +98,7 @@ private:
 	void setupImporting();
 	bool checkUserInput();
 
-	KexiMigrate* prepareImport(Kexi::ObjectStatus& result);
+	KexiMigrate* prepareImport(Kexi::ObjecttqStatus& result);
 
 	/*! Performs import. \return true/false on success/faulure 
 	 or cancelled when user cancelled importing (mainly 
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index 1c3295b67..b225f6ba1 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -61,20 +61,20 @@ KexiMigrate::~KexiMigrate()
 	delete m_destPrj;
 }
 
-bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, 
+bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, 
 	bool& acceptingNeeded)
 {
 	acceptingNeeded = false;
 	if (result)
-		result->clearStatus();
+		result->cleartqStatus();
 
 	KexiDB::DriverManager drvManager;
 	KexiDB::Driver *destDriver = drvManager.driver(
 		m_migrateData->destination->connectionData()->driverName);
 	if (!destDriver) {
-		result->setStatus(&drvManager,
+		result->settqStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.arg(m_migrateData->destination->databaseName()));
+			.tqarg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -113,18 +113,18 @@ bool KexiMigrate::isSourceAndDestinationDataSourceTheSame() const
 
 //=============================================================================
 // Perform Import operation
-bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
+bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
 {
 	if (result)
-		result->clearStatus();
+		result->cleartqStatus();
 
 	KexiDB::DriverManager drvManager;
 	KexiDB::Driver *destDriver = drvManager.driver(
 		m_migrateData->destination->connectionData()->driverName);
 	if (!destDriver) {
-		result->setStatus(&drvManager,
+		result->settqStatus(&drvManager,
 			i18n("Could not create database \"%1\".")
-			.arg(m_migrateData->destination->databaseName()));
+			.tqarg(m_migrateData->destination->databaseName()));
 		return false;
 	}
 
@@ -135,8 +135,8 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (!drv_connect()) {
 		kdDebug() << "Couldnt connect to database server" << endl;
 		if (result)
-			result->setStatus(i18n("Could not connect to data source \"%1\".")
-				.arg(m_migrateData->source->serverInfoString()), "");
+			result->settqStatus(i18n("Could not connect to data source \"%1\".")
+				.tqarg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -145,9 +145,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (!tableNames(tables)) {
 		kdDebug() << "Couldnt get list of tables" << endl;
 		if (result)
-			result->setStatus(
+			result->settqStatus(
 				i18n("Could not get a list of table names for data source \"%1\".")
-					.arg(m_migrateData->source->serverInfoString()), "");
+					.tqarg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -155,9 +155,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	if (tables.isEmpty()) {
 		kdDebug() << "There were no tables to import" << endl;
 		if (result)
-			result->setStatus(
+			result->settqStatus(
 				i18n("No tables to import found in data source \"%1\".")
-					.arg(m_migrateData->source->serverInfoString()), "");
+					.tqarg(m_migrateData->source->serverInfoString()), "");
 		return false;
 	}
 
@@ -165,15 +165,15 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 	tables.sort();
 	m_tableSchemas.clear();
 	if (!destDriver) {
-		result->setStatus(&drvManager);
+		result->settqStatus(&drvManager);
 		return false;
 	}
 	const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end();
 	TQStringList kexiDBTables;
 	if (kexi__objects_exists) {
 		tristate res = drv_queryStringListFromSQL(
-			TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
-		.arg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
+			TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
+		.tqarg((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
@@ -199,9 +199,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		if (!drv_readTableSchema(*it, *tableSchema)) {
 			delete tableSchema;
 			if (result)
-				result->setStatus(
+				result->settqStatus(
 					i18n("Could not import project from data source \"%1\". Error reading table \"%2\".")
-					.arg(m_migrateData->source->serverInfoString()).arg(tableName), "");
+					.tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), "");
 			return false;
 		}
 		//yeah, got a table
@@ -228,9 +228,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		if (trans.isNull()) {
 			ok = false;
 			if (result)
-				result->setStatus(destConn,
+				result->settqStatus(destConn,
 					i18n("Could not create database \"%1\".")
-					.arg(m_migrateData->destination->databaseName()));
+					.tqarg(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").arg(*it).arg((int)KexiDB::TableObjectType), 
+					"WHERE o_name='%1' AND o_type=%1").tqarg(*it).tqarg((int)KexiDB::TableObjectType), 
 					data, firstRecord)
 				&& destConn->setupObjectSchemaData( data, *t ))
 			{
@@ -258,9 +258,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 				//load schema for every field and add it
 				firstRecord = true;
 				TQString sql(
-					TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
+					TQString::tqfromLatin1("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").arg(t->id()) );
+						" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) );
 				while (ok) {
 					tristate res = drv_fetchRecordFromSQL(sql, data, firstRecord);
 					if (res != true) {
@@ -299,9 +299,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 				kdDebug() << "Failed to create a table " << ts->name() << endl;
 				destConn->debugError();
 				if (result)
-					result->setStatus(destConn,
+					result->settqStatus(destConn,
 						i18n("Could not create database \"%1\".")
-						.arg(m_migrateData->destination->databaseName()));
+						.tqarg(m_migrateData->destination->databaseName()));
 				m_tableSchemas.remove(ts);
 				break;
 			}
@@ -329,9 +329,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 		if (m_destPrj->error()) {
 			ok = false;
 			if (result)
-				result->setStatus(m_destPrj,
+				result->settqStatus(m_destPrj,
 					i18n("Could not import project from data source \"%1\".")
-					.arg(m_migrateData->source->serverInfoString()));
+					.tqarg(m_migrateData->source->serverInfoString()));
 		}
 	}
 
@@ -380,8 +380,8 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 			if (!ok) {
 				kdDebug() << "Failed to copy table " << tname << endl;
 				if (result)
-					result->setStatus(destConn,
-						i18n("Could not copy table \"%1\" to destination database.").arg(tname));
+					result->settqStatus(destConn,
+						i18n("Could not copy table \"%1\" to destination database.").tqarg(tname));
 				break;
 			}
 		}//for
@@ -404,9 +404,9 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 
 	// Finally: error handling
 	if (result && result->error())
-		result->setStatus(destConn,
+		result->settqStatus(destConn,
 			i18n("Could not import data from data source \"%1\".")
-				.arg(m_migrateData->source->serverInfoString()));
+				.tqarg(m_migrateData->source->serverInfoString()));
 	if (destConn) {
 		destConn->debugError();
 		destConn->rollbackTransaction(trans);
@@ -420,10 +420,10 @@ bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
 }
 //=============================================================================
 
-bool KexiMigrate::performExport(Kexi::ObjectStatus* result)
+bool KexiMigrate::performExport(Kexi::ObjecttqStatus* result)
 {
 	if (result)
-		result->clearStatus();
+		result->cleartqStatus();
 
 	//! @todo performExport
 
@@ -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").arg(fname),
+				 "types").tqarg(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.")
-		.arg(name())
-		.arg(TQString("%1.%2").arg(versionMajor()).arg(versionMinor()))
-		.arg(TQString("%1.%2").arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor())));
+		.tqarg(name())
+		.tqarg(TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()))
+		.tqarg(TQString("%1.%2").tqarg(KexiMigration::versionMajor()).tqarg(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").arg(drv_escapeIdentifier(columnName))
-		.arg(drv_escapeIdentifier(tableName)), 0, string);
+		TQString::tqfromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName))
+		.tqarg(drv_escapeIdentifier(tableName)), 0, string);
 	if (r == false)
 		return false;
 	if (~r) {
diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h
index cd2949f9d..ee22ded85 100644
--- a/kexi/migration/keximigrate.h
+++ b/kexi/migration/keximigrate.h
@@ -34,7 +34,7 @@
 class KexiProject;
 namespace Kexi
 {
-	class ObjectStatus;
+	class ObjecttqStatus;
 }
 
 /*! KexiMigration implementation version. 
@@ -99,7 +99,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 		 \a acceptingNeeded is set to true if destination database exists. 
 		 In this case you should ask about accepting database overwriting. 
 		 Used in ImportWizard::import(). */
-		bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result,
+		bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result,
 			bool& acceptingNeeded);
 
 		/*! Checks if the source- and the destination databases are identical.
@@ -107,10 +107,10 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
 		bool isSourceAndDestinationDataSourceTheSame() const;
 
 		//! Perform an import operation
-		bool performImport(Kexi::ObjectStatus* result = 0);
+		bool performImport(Kexi::ObjecttqStatus* result = 0);
 
 		//! Perform an export operation
-		bool performExport(Kexi::ObjectStatus* result = 0);
+		bool performExport(Kexi::ObjecttqStatus* result = 0);
 
 		//! Returns true if the migration driver supports progress updates.
 		inline bool progressSupported() { return drv_progressSupported(); }
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 945f084cd..2c0ce6cdb 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\"")
-				.arg(srv_name.lower())
-				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
+				.tqarg(srv_name.lower())
+				.tqarg(KexiMigration::versionMajor()).tqarg(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!").arg(srv_name.lower()).arg(srv_ver_str)
-				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()) << endl;
+				" -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str)
+				.tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()) << endl;
 			possibleProblems += TQString("\"%1\" migration driver has version \"%2\" "
 				"but required driver version is \"%3.%4\"")
-				.arg(srv_name.lower()).arg(srv_ver_str)
-				.arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor());
+				.tqarg(srv_name.lower()).tqarg(srv_ver_str)
+				.tqarg(KexiMigration::versionMajor()).tqarg(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\".").arg(name) );
+		setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(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\".")
-				.arg(name) );
+				.tqarg(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").arg(mimeType) << endl;
+		kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").tqarg(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").arg(name).arg(d_int->errorMsg()) << endl;
+		kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").tqarg(name).tqarg(d_int->errorMsg()) << endl;
 		setError(d_int);
 	}
 	return drv;
@@ -363,7 +363,7 @@ TQString MigrateManager::possibleProblemsInfoMsg() const
 	for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin();
 		it!=d_int->possibleProblems.constEnd(); ++it)
 	{
-		str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>"));
+		str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>"));
 	}
 	str += "</ul>";
 	return str;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 786712412..1b125d8dc 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -396,7 +396,7 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table,
 	TQString mysqlType;
 	KexiDB::Field::Type kexiType;
 	TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + 
-	                "` LIKE '" + TQString::fromLatin1(fld->name) + "'";
+	                "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
 
 	if(d->executeSQL(query)) {
 		MYSQL_RES *res = mysql_store_result(d->mysql);
@@ -444,7 +444,7 @@ TQStringList MySQLMigrate::examineEnumField(const TQString& table,
 		const MYSQL_FIELD* fld) {
 	TQString vals;
 	TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + 
-			"` LIKE '" + TQString::fromLatin1(fld->name) + "'";
+			"` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
 
 	if(d->executeSQL(query)) {
 		MYSQL_RES *res = mysql_store_result(d->mysql);
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index 904e0c920..d6c655f98 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames)
         for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c)
         {
             // Copy the result into the return list
-            tableNames << TQString::fromLatin1 (c[0].c_str());
+            tableNames << TQString::tqfromLatin1 (c[0].c_str());
         }
         return true;
     }
@@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect()
     if (m_migrateData->source->port == 0)
         m_migrateData->source->port = 5432;
 
-    conninfo += TQString::fromLatin1(" port='%1'").arg(m_migrateData->source->port);
+    conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
 
-    conninfo += TQString::fromLatin1(" dbname='%1'").arg(m_migrateData->sourceName);
+    conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
 
     if (!m_migrateData->source->userName.isNull())
-        conninfo += TQString::fromLatin1(" user='%1'").arg(m_migrateData->source->userName);
+        conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
 
     if (!m_migrateData->source->password.isNull())
-        conninfo += TQString::fromLatin1(" password='%1'").arg(m_migrateData->source->password);
+        conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(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))").arg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").tqarg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_pkey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL(
 				mysql_free_result(res);
 				return false;
 			}
-			string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]);
+			string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]);
 			mysql_free_result(res);
 		} else {
 			kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl;
@@ -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))").arg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").tqarg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_ukey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const
             // Read value of column 0 into a string N
             c[0].to(N);
             // Copy the result into the return list
-            list << TQString::fromLatin1 (N.c_str());
+            list << TQString::tqfromLatin1 (N.c_str());
 	    KexiDBDrvDbg << N.c_str() << endl;
         }
         return true;
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index bec4de7d0..615858407 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:").arg(actionWidgetName);
+			msg = i18n("&Select macro to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
 		else if (actionType=="script")
-			msg = i18n("&Select script to be executed after clicking \"%1\" button:").arg(actionWidgetName);
+			msg = i18n("&Select script to be executed after clicking \"%1\" button:").tqarg(actionWidgetName);
 		//default: table/query/form/report...
 		else
-			msg = i18n("&Select object to be opened after clicking \"%1\" button:").arg(actionWidgetName);
+			msg = i18n("&Select object to be opened after clicking \"%1\" button:").tqarg(actionWidgetName);
 		selectActionToBeExecutedLbl->setText(msg);
 	}
 
@@ -405,7 +405,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	setButtonOK( KGuiItem(i18n("Assign action", "&Assign"), "button_ok", i18n("Assign action")) );
 
 	TQWidget *mainWidget = new TQWidget( this );
-	mainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	mainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	setMainWidget(mainWidget);
 
 /*    lbl 1
@@ -428,24 +428,24 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 
 	// 1st column: action types
 	d->actionCategoriesListView = new ActionCategoriesListView(mainWidget);
-	d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+	d->actionCategoriesListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	d->glyr->addWidget(d->actionCategoriesListView, 1, 0);
 	connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
 		this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*)));
 
 	TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget);
 	lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
-	lbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-	lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	lbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->glyr->addWidget(lbl, 0, 0, TQt::AlignTop|TQt::AlignLeft);
 	
 	// widget stack for 2nd and 3rd column
 	d->secondAnd3rdColumnStack = new TQWidgetStack(mainWidget);
-	d->secondAnd3rdColumnStack->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	d->secondAnd3rdColumnStack->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	d->glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, TQt::AlignTop|TQt::AlignLeft);
 
 	d->secondAnd3rdColumnMainWidget = new TQWidget(d->secondAnd3rdColumnStack);
-	d->secondAnd3rdColumnMainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	d->secondAnd3rdColumnMainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	d->secondAnd3rdColumnGrLyr = new TQGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, 0, KDialog::spacingHint());
 	d->secondAnd3rdColumnGrLyr->setRowStretch(1, 2);
 	d->secondAnd3rdColumnStack->addWidget(d->secondAnd3rdColumnMainWidget);
@@ -457,8 +457,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 		this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
 
 	d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget);
-	d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
-	d->selectActionToBeExecutedLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	d->selectActionToBeExecutedLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->selectActionToBeExecutedLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->selectActionToBeExecutedLbl->setMinimumHeight(d->selectActionToBeExecutedLbl->fontMetrics().height()*2);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, TQt::AlignTop|TQt::AlignLeft);
 
@@ -469,7 +469,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteListView = new ActionToExecuteListView(d->secondAnd3rdColumnMainWidget);
 	d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting
-	d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+	d->actionToExecuteListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)),
 		this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
 	connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
@@ -479,8 +479,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, 
 		i18n("Action to execute:"), d->secondAnd3rdColumnMainWidget);
 	d->actionToExecuteLbl->installEventFilter(this); //to be able to disable painting
-	d->actionToExecuteLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
-	d->actionToExecuteLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+	d->actionToExecuteLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->actionToExecuteLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, TQt::AlignTop|TQt::AlignLeft);
 
 	// temporary show all sections to avoid resizing the dialog in the future
@@ -538,7 +538,7 @@ void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*)
 void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*)
 {
 	d->setActionToExecuteSectionVisible(false);
-	updateOKButtonStatus();
+	updateOKButtontqStatus();
 }
 
 void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem*)
@@ -549,7 +549,7 @@ void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem
 void KexiActionSelectionDialog::slotCurrentFormActionItemSelected(TQListViewItem*)
 {
 	d->setActionToExecuteSectionVisible(false);
-	updateOKButtonStatus();
+	updateOKButtontqStatus();
 }
 
 void KexiActionSelectionDialog::slotItemForOpeningOrExecutingSelected(KexiPart::Item* item)
@@ -568,7 +568,7 @@ void KexiActionSelectionDialog::slotActionToExecuteItemExecuted(TQListViewItem*
 
 void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*)
 {
-	updateOKButtonStatus();
+	updateOKButtontqStatus();
 }
 
 void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
@@ -581,15 +581,15 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label
 		if (simpleItem->data == "kaction") {
 			if (!d->kactionPageWidget) {
-				//create lbl+list view with a vlayout
+				//create lbl+list view with a vtqlayout
 				d->kactionPageWidget = new TQWidget();
-				d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+				d->kactionPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				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.arg(d->actionWidgetName),
+				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName),
 					d->kactionPageWidget);
-				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+				lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->kactionListView);
@@ -605,16 +605,16 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 		}
 		else if (simpleItem->data == "currentForm") {
 			if (!d->currentFormActionsPageWidget) {
-				//create lbl+list view with a vlayout
+				//create lbl+list view with a vtqlayout
 				d->currentFormActionsPageWidget = new TQWidget();
-				d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+				d->currentFormActionsPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint());
 				d->currentFormActionsListView = new CurrentFormActionsListView(
 					d->currentFormActionsPageWidget, d->mainWin);
 				d->currentFormActionsListView->init();
 				TQLabel *lbl = new TQLabel(d->currentFormActionsListView, 
-					selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->currentFormActionsPageWidget);
-				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
+					selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->currentFormActionsPageWidget);
+				lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->currentFormActionsListView);
@@ -635,7 +635,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			d->setActionToExecuteSectionVisible(false);
 		}
 		d->actionCategoriesListView->update();
-		updateOKButtonStatus();
+		updateOKButtontqStatus();
 		return;
 	}
 	// other case
@@ -656,7 +656,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 			d->raiseWidget( d->secondAnd3rdColumnMainWidget );
 	}
 	d->actionCategoriesListView->update();
-	updateOKButtonStatus();
+	updateOKButtontqStatus();
 }
 
 KexiMainWindow* KexiActionSelectionDialog::mainWin() const
@@ -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").arg(partInfo->objectName()).arg(partItem->name());
+				data.string = TQString("%1:%2").tqarg(partInfo->objectName()).tqarg(partItem->name());
 				data.option = actionToExecute->data;
 				return data;
 			}
@@ -705,7 +705,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const
 	return data; // No Action
 }
 
-void KexiActionSelectionDialog::updateOKButtonStatus()
+void KexiActionSelectionDialog::updateOKButtontqStatus()
 {
 	TQPushButton *btn = actionButton(Ok);
 	ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>(
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h
index 983ea759a..a2c4066d4 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog.h
@@ -63,7 +63,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
 		void slotItemForOpeningOrExecutingSelected(KexiPart::Item* item);
 
 	protected:
-		void updateOKButtonStatus();
+		void updateOKButtontqStatus();
 
 		class KexiActionSelectionDialogPrivate;
 		KexiActionSelectionDialogPrivate* d;
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 1a6df899b..e89ba9cb7 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")
-					.arg(indexForVisibleLookupValue).arg(visibleLookupValue.toString())
+					.tqarg(indexForVisibleLookupValue).tqarg(visibleLookupValue.toString())
 				: TQString())
 			<< endl;
 		const bool displayDefaultValue = cursorAtNewRow && (value.isNull() && visibleLookupValue.isNull())
@@ -228,7 +228,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 //		newIndices[i]=-1;
 		KexiFormDataItemInterface *item = m_dataItems.at( *it );
 		if (item)
-			item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
+			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		m_dataItems.remove(*it);
 		kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl;
 //		i++;
@@ -253,7 +253,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 		else {
 			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
 			m_dataItems.remove(it.key());
-			it.key()->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
+			it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		}
 	}
 #endif
@@ -275,7 +275,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou
 	for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current();) {
 		KexiFormDataItemInterface * item = it.current();
 		if (invalidSources[ item->dataSource().lower() ]) {
-			item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") );
+			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 			m_dataItems.remove(item);
 			continue;
 		}
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 018feb8b5..e9ff41775 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -20,7 +20,7 @@
 #include "kexidatasourcepage.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqheader.h>
 
@@ -65,9 +65,9 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	TQVBoxLayout *contentsVlyr = new TQVBoxLayout(contents);
 
 	m_noDataSourceAvailableLabel = new TQLabel(m_noDataSourceAvailableSingleText, contents);
-	m_noDataSourceAvailableLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	m_noDataSourceAvailableLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 	m_noDataSourceAvailableLabel->setMargin(2);
-	m_noDataSourceAvailableLabel->setAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft);
+	m_noDataSourceAvailableLabel->tqsetAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft);
 	contentsVlyr->addWidget(m_noDataSourceAvailableLabel);
 
 	//-Widget's Data Source
@@ -78,10 +78,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 #else
 	m_widgetDSLabel = new TQLabel(i18n("Table Field or Query Field", "Widget's data source:"), contents);
 #endif
-	m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_widgetDSLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_widgetDSLabel->setMargin(2);
 	m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom);
+	m_widgetDSLabel->tqsetAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_widgetDSLabel);
 
 	m_clearWidgetDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearWidgetDSButton");
@@ -104,10 +104,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	//- Form's Data Source
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents);
-	m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_dataSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_dataSourceLabel->setMargin(2);
 	m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom);
+	m_dataSourceLabel->tqsetAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_dataSourceLabel);
 
 	m_gotoButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoButton");
@@ -160,14 +160,14 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_mousePointerLabel->setFixedWidth( m_mousePointerLabel->pixmap() ? m_mousePointerLabel->pixmap()->width() : 0);
 	m_availableFieldsDescriptionLabel = new TQLabel(
 		i18n("Select fields from the list below and drag them onto a form or click the \"Insert\" button"), contents);
-	m_availableFieldsDescriptionLabel->setAlignment( TQt::AlignAuto | TQt::WordBreak );
+	m_availableFieldsDescriptionLabel->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak );
 	hlyr->addWidget(m_availableFieldsDescriptionLabel);
 
 	//Available Fields
 	contentsVlyr->addSpacing(4);
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents);
-	m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	m_availableFieldsLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_availableFieldsLabel->setMargin(2);
 	m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small));
 	hlyr->addWidget(m_availableFieldsLabel);
@@ -183,7 +183,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 
 	m_fieldListView = new KexiFieldListView(contents, "fieldListView",
 		KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection );
-	m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+	m_fieldListView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 	m_availableFieldsLabel->setBuddy(m_fieldListView);
 	contentsVlyr->addWidget(m_fieldListView, 1);
 	connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged()));
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index d87b31c52..3f47a6ec4 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -398,9 +398,9 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 /*	else if(c == "KexiDBTimeEdit")
 		w = new KexiDBTimeEdit(TQTime::currentTime(), p, n);
 	else if(c == "KexiDBDateEdit")
-		w = new KexiDBDateEdit(TQDate::currentDate(), p, n);
+		w = new KexiDBDateEdit(TQDate::tqcurrentDate(), p, n);
 	else if(c == "KexiDBDateTimeEdit")
-		w = new KexiDBDateTimeEdit(TQDateTime::currentDateTime(), p, n);*/
+		w = new KexiDBDateTimeEdit(TQDateTime::tqcurrentDateTime(), p, n);*/
 //	else if(c == "KexiDBIntSpinBox")
 //		w = new KexiDBIntSpinBox(p, n);
 //	else if(c == "KexiDBDoubleSpinBox")
@@ -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->geometry(), lineedit->alignment(), true);
+			lineedit->tqgeometry(), lineedit->tqalignment(), 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->geometry(), textedit->alignment(), true, true);
+			textedit->tqgeometry(), textedit->tqalignment(), true, true);
 		//copy a few properties
 		KTextEdit *ed = dynamic_cast<KTextEdit *>( editor(w) );
 		ed->setWrapPolicy(textedit->wrapPolicy());
@@ -497,13 +497,13 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
 			}
 
 			if ( classname == "KexiDBLabel" )
-				w->resize(w->sizeHint());
+				w->resize(w->tqsizeHint());
 		}
 		else
 		{
 			createEditor(classname, label->text(), label, container,
-				label->geometry(), label->alignment(), 
-				false, label->alignment() & TQt::WordBreak /*multiline*/);
+				label->tqgeometry(), label->tqalignment(), 
+				false, label->tqalignment() & 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->geometry(), label->alignment());
+		createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
 		return true;
 	}
 	else if (classname == "KexiDBCheckBox") {
 		KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w);
-		TQRect r( cb->geometry() );
+		TQRect r( cb->tqgeometry() );
 		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 geometry
+	//! \todo check field's tqgeometry
 	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()->geometry() );
+		editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->tqgeometry() );
 }
 
 void
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
index e8da5ad5a..3c20510ed 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 alignment, bool hasFocus )
+void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int tqalignment, bool hasFocus )
 {
 	KexiFormDataItemInterface *dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(w);
 	KexiDB::QueryColumnInfo *columnInfo = dataItemIface ? dataItemIface->columnInfo() : 0;
@@ -53,11 +53,11 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt
 			if (w->hasFocus()) {
 				p->setPen(
 					KexiUtils::blendedColors(
-						m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3));
+						m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3));
 			}
 			KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
 				2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, 
-				w->height() - margin*2 -2, alignment, hasFocus);
+				w->height() - margin*2 -2, tqalignment, 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->repaint();
+			w->tqrepaint();
 	}
 }
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.h b/kexi/plugins/forms/kexidbtextwidgetinterface.h
index 17382e318..6e0299c0d 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 alignment, bool hasFocus );
+		void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int tqalignment, 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 55e999db9..4e066bd65 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").arg(_actionType) );
+		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(_actionType) );
 		if (!info)
 			return 0;
 	}
@@ -85,7 +85,7 @@ void KexiFormEventAction::activate()
 	if (!project)
 		return;
 	KexiPart::Part* part = Kexi::partManager().partForMimeType( 
-		TQString("kexi/%1").arg(m_actionName) );
+		TQString("kexi/%1").tqarg(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 8c0c66e72..9674f4fe9 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\"").arg(name.data()), propertySet());
+			= new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").tqarg(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 9d8017d8d..9c4e3173d 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").arg(list->field(i)->name()));
+		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").tqarg(list->field(i)->name()));
 		lType.appendChild(lClassN);
 		lNameProperty.appendChild(lType);
 		lclass.appendChild(lNameProperty);
@@ -510,7 +510,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 
 void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 {
-	TQStrList signalNames(widget->metaObject()->signalNames());
+	TQStrList signalNames(widget->tqmetaObject()->signalNames());
 	if (!signalNames.isEmpty()) {
 		const char *handleDragMoveEventSignal = "handleDragMoveEvent(TQDragMoveEvent*)";
 		const char *handleDropEventSignal = "handleDropEvent(TQDropEvent*)";
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index b4b58f700..df5191ed7 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 repaint)
+void KexiFormScrollView::clearColumnsInternal(bool tqrepaint)
 {
-	Q_UNUSED( repaint );
+	Q_UNUSED( tqrepaint );
 	//! @todo
 }
 
@@ -349,7 +349,7 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 }
 
 /*void KexiFormScrollView::slotAboutToDeleteRow(KexiTableItem& item, 
-	KexiDB::ResultInfo* result, bool repaint)
+	KexiDB::ResultInfo* result, bool tqrepaint)
 {
 	//! @todo
 }*/
@@ -359,18 +359,18 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item)
 	//! @todo
 }*/
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool repaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool tqrepaint)
 {
 	Q_UNUSED( item );
-	Q_UNUSED( repaint );
+	Q_UNUSED( tqrepaint );
 	//! @todo
 }
 
-void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool repaint)
+void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
 {
 	Q_UNUSED( item );
 	Q_UNUSED( row );
-	Q_UNUSED( repaint );
+	Q_UNUSED( tqrepaint );
 	//! @todo
 }
 
@@ -551,7 +551,7 @@ void KexiFormScrollView::refreshContentsSize()
 
 void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName)
 {
-	TQWidget *w = focusWidget();
+	TQWidget *w = tqfocusWidget();
 	KexiFormDataItemInterface *item = 0;
 	while (w) {
 		item = dynamic_cast<KexiFormDataItemInterface*>(w);
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index 7d2b98679..d8326a570 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 repaint)
-		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
+		virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
+		{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
 
-		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
 		virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
+		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & );
 
@@ -193,7 +193,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView :
 
 	protected:
 		//! Implementation for KexiDataAwareObjectInterface
-		virtual void clearColumnsInternal(bool repaint);
+		virtual void clearColumnsInternal(bool tqrepaint);
 
 		//! 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 c6d689f78..01ec080f7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
-		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
+		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background());
 //moved to formmanager		connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
 	}
 	else
@@ -345,12 +345,12 @@ void KexiFormView::updateValuesForSubproperties()
 				kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget="
 					<< it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl;
 
-				const int count = subwidget->metaObject()->findProperty(subpropIt.key().latin1(), true);
-				const TQMetaProperty *meta = count!=-1 ? subwidget->metaObject()->property(count, true) : 0;
+				const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true);
+				const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0;
 				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: "alignment" property.
+					// by FormIO::readPropertyValue(). Example: "tqalignment" property.
 					if (meta->isSetType() && subpropIt.data().type()==TQVariant::StringList) {
 						TQStrList keys;
 						const TQStringList list( subpropIt.data().toStringList() );
@@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties()
 static void setUnsavedBLOBIdsForDataViewMode( 
 	TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName)
 {
-	if (-1 != widget->metaObject()->findProperty("pixmapId")) {
+	if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) {
 		const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
 		if (blobID > 0)
 			widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID);
@@ -525,9 +525,9 @@ KexiFormView::afterSwitchFrom(int mode)
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
-//			TQWidget *www = focusWidget();
-			//if (Kexi::hasParent(this, tqApp->focusWidget())) {
-				KexiUtils::unsetFocusWithReason(tqApp->focusWidget(), TQFocusEvent::Tab);
+//			TQWidget *www = tqfocusWidget();
+			//if (Kexi::hasParent(this, tqApp->tqfocusWidget())) {
+				KexiUtils::unsetFocusWithReason(tqApp->tqfocusWidget(), TQFocusEvent::Tab);
 			//}
 
 			TQPtrListIterator<TQWidget> it(*m_dbform->orderedFocusWidgets());
@@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 	setAvailable("formpart_format_raise", true);
 	setAvailable("formpart_format_lower", true);
 
-	// If the widgets selected is a container, we enable layout actions
+	// If the widgets selected is a container, we enable tqlayout actions
 	if(!multiple)
 	{
 		KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() );
@@ -999,14 +999,14 @@ void
 KexiFormView::setFocusInternal()
 {
 	if (viewMode() == Kexi::DataViewMode) {
-		if (m_dbform->focusWidget()) {
+		if (m_dbform->tqfocusWidget()) {
 			//better-looking focus
 			if (m_setFocusInternalOnce) {
 				KexiUtils::setFocusWithReason(m_setFocusInternalOnce, TQFocusEvent::Other);//Tab);
 				m_setFocusInternalOnce = 0;
 			}
 			else {
-				//ok? SET_FOCUS_USING_REASON(m_dbform->focusWidget(), TQFocusEvent::Other);//Tab);
+				//ok? SET_FOCUS_USING_REASON(m_dbform->tqfocusWidget(), TQFocusEvent::Other);//Tab);
 			}
 			return;
 		}
@@ -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").arg(fields.count()),
+		fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").tqarg(fields.count()),
 		KFormDesigner::FormManager::self()->propertySet()
 	);
 	
@@ -1173,8 +1173,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 //		newWidget->setDataSource(column->aliasOrName());
 //		newWidget->setFieldTypeInternal((int)column->field->type());
 //		newWidget->setFieldCaptionInternal(column->captionOrAliasOrName());
-		//resize again because autofield's type changed what can lead to changed sizeHint() 
-//		newWidget->resize(newWidget->sizeHint());
+		//resize again because autofield's type changed what can lead to changed tqsizeHint() 
+//		newWidget->resize(newWidget->tqsizeHint());
 		KFormDesigner::WidgetList list;
 		list.append(newWidget);
 		KFormDesigner::AdjustSizeCommand *adjustCommand 
@@ -1191,10 +1191,10 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	}
 	if (widgetsToSelect.last()) {
 		//resize form if needed
-		TQRect oldFormRect( m_dbform->geometry() );
+		TQRect oldFormRect( m_dbform->tqgeometry() );
 		TQRect newFormRect( oldFormRect );
-		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->geometry().right()+1));
-		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->geometry().bottom()+1));
+		newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->tqgeometry().right()+1));
+		newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->tqgeometry().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 geometry of the last inserted widget
-		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->geometry();
+		//remember tqgeometry of the last inserted widget
+		m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->tqgeometry();
 	}
 
 	//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->repaint();
-	m_scrollView->viewport()->repaint();
+	m_scrollView->tqrepaint();
+	m_scrollView->viewport()->tqrepaint();
 	m_scrollView->repaintContents();
 	m_scrollView->updateContents();
-	m_scrollView->clipper()->repaint();
+	m_scrollView->clipper()->tqrepaint();
 	m_scrollView->refreshContentsSize();
 
 	//select all inserted widgets, if multiple
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index f269abf7b..8bc1cb79d 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 geometry of widget recently inserted using insertAutoFields() method.
+		/*! Stores tqgeometry 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 be17c159c..7ebc522f6 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -22,7 +22,7 @@
 #include "kexidbautofield.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqmetaobject.h>
 #include <tqapplication.h>
@@ -57,7 +57,7 @@ class KexiDBAutoField::Private
 		                       //!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto
 		WidgetType  widgetType_property; //!< provides widget type or Auto
 		LabelPosition  lblPosition;
-		TQBoxLayout  *layout;
+		TQBoxLayout  *tqlayout;
 		TQLabel  *label;
 		TQString  caption;
 		KexiDB::Field::Type fieldTypeInternal;
@@ -104,7 +104,7 @@ void
 KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 {
 	d->fieldTypeInternal = KexiDB::Field::InvalidType;
-	d->layout = 0;
+	d->tqlayout = 0;
 	m_subwidget = 0;
 	d->label = new TQLabel(text, this);
 	d->label->installEventFilter( this );
@@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
 	d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType()
 	setLabelPosition(pos);
 	setWidgetType(type);
-	d->baseColor = palette().active().base();
-	d->textColor = palette().active().text();
+	d->baseColor = tqpalette().active().base();
+	d->textColor = tqpalette().active().text();
 }
 
 void
@@ -222,30 +222,30 @@ void
 KexiDBAutoField::setLabelPosition(LabelPosition position)
 {
 	d->lblPosition = position;
-	if(d->layout) {
-		TQBoxLayout *lyr = d->layout;
-		d->layout = 0;
+	if(d->tqlayout) {
+		TQBoxLayout *lyr = d->tqlayout;
+		d->tqlayout = 0;
 		delete lyr;
 	}
 
 	if(m_subwidget)
 		m_subwidget->show();
-	//! \todo support right-to-left layout where positions are inverted
+	//! \todo support right-to-left tqlayout where positions are inverted
 	if (position==Top || position==Left) {
-		int align = d->label->alignment();
+		int align = d->label->tqalignment();
 		if(position == Top) {
-			d->layout = (TQBoxLayout*) new TQVBoxLayout(this);
+			d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignTop;
 		}
 		else {
-			d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
+			d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
 			align |= AlignVertical_Mask;
 			align ^= AlignVertical_Mask;
 			align |= AlignVCenter;
 		}
-		d->label->setAlignment(align);
+		d->label->tqsetAlignment(align);
 		if(d->widgetType == Boolean 
 			|| (d->widgetType == Auto && fieldTypeInternal() == KexiDB::Field::InvalidType && !d->designMode))
 		{
@@ -254,36 +254,36 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 		else {
 			d->label->show();
 		}
-		d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
+		d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
 		if(position == Left && d->widgetType != Boolean)
-			d->layout->addSpacing(KexiDBAutoField_SPACING);
-		d->layout->addWidget(m_subwidget, 1);
+			d->tqlayout->addSpacing(KexiDBAutoField_SPACING);
+		d->tqlayout->addWidget(m_subwidget, 1);
 		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		if (subwidgetInterface) {
 			if (subwidgetInterface->appendStretchRequired(this))
-				d->layout->addStretch(0);
+				d->tqlayout->addStretch(0);
 			if (subwidgetInterface->subwidgetStretchRequired(this)) {
-				TQSizePolicy sizePolicy( m_subwidget->sizePolicy() );
+				TQSizePolicy sizePolicy( m_subwidget->tqsizePolicy() );
 				if(position == Left) {
 					sizePolicy.setHorData( TQSizePolicy::Minimum );
-					d->label->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+					d->label->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 				}
 				else {
 					sizePolicy.setVerData( TQSizePolicy::Minimum );
-					d->label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+					d->label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 				}
-				m_subwidget->setSizePolicy(sizePolicy);
+				m_subwidget->tqsetSizePolicy(sizePolicy);
 			}
 		}
 //		if(m_subwidget)
-	//		m_subwidget->setSizePolicy(...);
+	//		m_subwidget->tqsetSizePolicy(...);
 	}
 	else {
-		d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
+		d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
 		d->label->hide();
-		d->layout->addWidget(m_subwidget);
+		d->tqlayout->addWidget(m_subwidget);
 	}
-	//a hack to force layout to be refreshed (any better idea for this?)
+	//a hack to force tqlayout to be refreshed (any better idea for this?)
 	resize(size()+TQSize(1,0));
 	resize(size()-TQSize(1,0));
 	if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) {
@@ -570,7 +570,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 	bool unbound = false;
 	if (d->autoCaption && (d->widgetType==Auto || dataSource().isEmpty())) {
 		if (d->designMode)
-			realText = TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)");
+			realText = TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)");
 		else
 			realText = TQString();
 		unbound = true;
@@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 				realText = text[0].upper() + text.mid(1);
 				if (d->widgetType!=Boolean) {
 //! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-//! @todo support right-to-left layout where position of ":" is inverted
+//! @todo support right-to-left tqlayout where position of ":" is inverted
 					realText += ": ";
 				}
 			}
@@ -594,9 +594,9 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
 	}
 
 	if (unbound)
-		d->label->setAlignment( TQt::AlignCenter | TQt::WordBreak );
+		d->label->tqsetAlignment( TQt::AlignCenter | TQt::WordBreak );
 	else
-		d->label->setAlignment( TQt::AlignCenter );
+		d->label->tqsetAlignment( TQt::AlignCenter );
 //	TQWidget* widgetToAlterForegroundColor;
 	if(d->widgetType == Boolean) {
 		static_cast<TQCheckBox*>((TQWidget*)m_subwidget)->setText(realText);
@@ -650,15 +650,15 @@ KexiDBAutoField::setDataSource( const TQString &ds ) {
 }
 
 TQSize
-KexiDBAutoField::sizeHint() const
+KexiDBAutoField::tqsizeHint() const
 {
 	if (d->lblPosition == NoLabel)
-		return m_subwidget ? m_subwidget->sizeHint() : TQWidget::sizeHint();
+		return m_subwidget ? m_subwidget->tqsizeHint() : TQWidget::tqsizeHint();
 
 	TQSize s1(0,0);
 	if (m_subwidget)
-		s1 = m_subwidget->sizeHint();
-	TQSize s2(d->label->sizeHint());
+		s1 = m_subwidget->tqsizeHint();
+	TQSize s2(d->label->tqsizeHint());
 	if (d->lblPosition == Top)
 		return TQSize(TQMAX(s1.width(), s2.width()), s1.height()+KexiDBAutoField_SPACING+s2.height());
 
@@ -682,10 +682,10 @@ KexiDBAutoField::updateInformationAboutUnboundField()
 	if ( (d->autoCaption && (dataSource().isEmpty() || dataSourceMimeType().isEmpty()))
 		|| (!d->autoCaption && d->caption.isEmpty()) )
 	{
-		d->label->setText( TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") );
+		d->label->setText( TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") );
 	}
 //	else
-//		d->label->setText( TQString::fromLatin1(name())+" "+i18n(" (unbound)") );
+//		d->label->setText( TQString::tqfromLatin1(name())+" "+i18n(" (unbound)") );
 }
 
 /*void
@@ -701,7 +701,7 @@ KexiDBAutoField::paintEvent( TQPaintEvent* pe )
 		p.setClipRect(pe->rect());
 		p.setFont(d->label->font());
 		p.drawText(rect(), TQt::AlignLeft | TQt::WordBreak, 
-			TQString::fromLatin1(name())+" "+i18n(" (unbound)"));
+			TQString::tqfromLatin1(name())+" "+i18n(" (unbound)"));
 	}
 }*/
 
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h
index 809c1186a..653e4067b 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.h
+++ b/kexi/plugins/forms/widgets/kexidbautofield.h
@@ -132,7 +132,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField :
 		/*! @internal */
 		TQString fieldCaptionInternal() const;
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 		virtual void setFocusPolicy ( TQ_FocusPolicy policy );
 
 		//! Reimplemented to return internal editor's color.
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 2a25b905b..81c66ba6b 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -59,10 +59,10 @@ class KexiDBComboBox::Private
 
 	KexiComboBoxPopup *popup;
 	KComboBox *paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle (because styles use <static_cast>)
-	TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), 
+	TQSize tqsizeHint; //!< A cache for KexiDBComboBox::tqsizeHint(), 
 	                //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange()
 	KexiDB::QueryColumnInfo* visibleColumnInfo;
-	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its children (if isEditable is false)
+	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false)
 	bool isEditable : 1; //!< true is the combo box is editable
 	bool buttonPressed : 1;
 	bool mouseOver : 1;
@@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const
 void KexiDBComboBox::paintEvent( TQPaintEvent * )
 {
 	TQPainter p( this );
-	TQColorGroup cg( palette().active() );
+	TQColorGroup cg( tqpalette().active() );
 //	if ( hasFocus() )
 //		cg.setColor(TQColorGroup::Base, cg.highlight());
 //	else
@@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		return;
 	}
 
-//! @todo support reverse layout
+//! @todo support reverse tqlayout
 //bool reverse = TQApplication::reverseLayout();
-	tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+	tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
 		flags, (uint)TQStyle::SC_All, 
 		(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
 	);
@@ -159,7 +159,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		if ( hasFocus() ) {
 			if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
 				p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
-			TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+			TQRect r( TQStyle::tqvisualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
 			r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
 			tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, 
 				r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
@@ -170,7 +170,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 
 TQRect KexiDBComboBox::editorGeometry() const
 {
-	TQRect r( TQStyle::visualRect(
+	TQRect r( TQStyle::tqvisualRect(
 		tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
 		TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
 	
@@ -211,20 +211,20 @@ void KexiDBComboBox::createEditor()
 void KexiDBComboBox::setLabelPosition(LabelPosition position)
 {
 	if(m_subwidget) {
-		if (-1 != m_subwidget->metaObject()->findProperty("frameShape", true))
+		if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true))
 			m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame));
 		m_subwidget->setGeometry( editorGeometry() );
 	}
 //		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		// update size policy
 //		if (subwidgetInterface && subwidgetInterface->subwidgetStretchRequired(this)) {
-			TQSizePolicy sizePolicy( this->sizePolicy() );
+			TQSizePolicy sizePolicy( this->tqsizePolicy() );
 			if(position == Left)
 				sizePolicy.setHorData( TQSizePolicy::Minimum );
 			else
 				sizePolicy.setVerData( TQSizePolicy::Minimum );
-			//m_subwidget->setSizePolicy(sizePolicy);
-			setSizePolicy(sizePolicy);
+			//m_subwidget->tqsetSizePolicy(sizePolicy);
+			tqsetSizePolicy(sizePolicy);
 		//}
 //	}
 }
@@ -233,7 +233,7 @@ TQRect KexiDBComboBox::buttonGeometry() const
 {
 	TQRect arrowRect( 
 		tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
-	arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
+	arrowRect = TQStyle::tqvisualRect(arrowRect, d->paintedCombo);
 	arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
 	return arrowRect;
 }
@@ -259,7 +259,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 	    if ( arrowRect.contains( e->pos() ) ) {
 		d->arrowPressed = TRUE;
 		d->arrowDown    = TRUE;
-		repaint( FALSE );
+		tqrepaint( FALSE );
 	    }
 	} else {*/
 		showPopup();
@@ -490,29 +490,29 @@ int KexiDBComboBox::popupWidthHint() const
 
 void KexiDBComboBox::fontChange( const TQFont & oldFont )
 {
-	d->sizeHint = TQSize(); //force rebuild the cache
+	d->tqsizeHint = TQSize(); //force rebuild the cache
 	KexiDBAutoField::fontChange(oldFont);
 }
 
 void KexiDBComboBox::styleChange( TQStyle& oldStyle )
 {
 	KexiDBAutoField::styleChange( oldStyle );
-	d->sizeHint = TQSize(); //force rebuild the cache
+	d->tqsizeHint = TQSize(); //force rebuild the cache
 	if (m_subwidget)
 		m_subwidget->setGeometry( editorGeometry() );
 }
 
-TQSize KexiDBComboBox::sizeHint() const
+TQSize KexiDBComboBox::tqsizeHint() const
 {
-	if ( isVisible() && d->sizeHint.isValid() )
-		return d->sizeHint;
+	if ( isVisible() && d->tqsizeHint.isValid() )
+		return d->tqsizeHint;
 
 	const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
 	const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
-	d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+	d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
 		TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
 
-	return d->sizeHint;
+	return d->tqsizeHint;
 }
 
 void KexiDBComboBox::editRequested()
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index 60ed78d1b..4e780aa35 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -68,7 +68,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		//! Reimpemented because to avoid taking value from the internal editor (index is taken from the popup instead)
 		virtual bool valueChanged();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Reimplemented after KexiDBAutoField: jsut sets \a cinfo without initializing a subwidget.
 		//! Initialization is performed by \ref setVisibleColumnInfo().
@@ -111,7 +111,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		//! \return internal editor's geometry
+		//! \return internal editor's tqgeometry
 		TQRect editorGeometry() const;
 
 		//! Creates editor. Reimplemented, because if the combo box is not editable, 
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 339ba7224..8394ef58f 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "kexidbdateedit.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kpopupmenu.h>
 #include <kdatepicker.h>
@@ -37,7 +37,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 
 	m_edit = new TQDateEdit(date, this);
 	m_edit->setAutoAdvance(true);
-	m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) );
 	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) );
 
@@ -54,7 +54,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 
 	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
-	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
+	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
@@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* layout = new TQHBoxLayout(this);
-	layout->addWidget(m_edit, 1);
-	layout->addWidget(btn, 0);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	tqlayout->addWidget(m_edit, 1);
+	tqlayout->addWidget(btn, 0);
 
 	setFocusProxy(m_edit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 6f479c699..ea9dede77 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -21,7 +21,7 @@
 #include "kexidbdatetimeedit.h"
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kpopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
@@ -36,7 +36,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_dateEdit = new TQDateEdit(datetime.date(), this);
 	m_dateEdit->setAutoAdvance(true);
-	m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_dateEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 //	m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") );
 	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged()));
 	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged()));
@@ -48,7 +48,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_timeEdit = new TQTimeEdit(datetime.time(), this);;
 	m_timeEdit->setAutoAdvance(true);
-	m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+	m_timeEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged()));
 	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged()));
 
@@ -61,7 +61,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 
 	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
-	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
+	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
@@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_datePickerPopupMenu->insertItem(m_datePicker);
 	btn->setPopup(m_datePickerPopupMenu);
 
-	TQHBoxLayout* layout = new TQHBoxLayout(this);
-	layout->addWidget(m_dateEdit, 0);
-	layout->addWidget(btn, 0);
-	layout->addWidget(m_timeEdit, 0);
-	//layout->addStretch(1);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+	tqlayout->addWidget(m_dateEdit, 0);
+	tqlayout->addWidget(btn, 0);
+	tqlayout->addWidget(m_timeEdit, 0);
+	//tqlayout->addStretch(1);
 
 	setFocusProxy(m_dateEdit);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 17242953a..88ddf93fa 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; }
 
-//repaint all children widgets
+//tqrepaint all tqchildren 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)->repaint();
+		TQT_TQWIDGET(obj)->tqrepaint();
 	}
 	delete list;
 }
@@ -148,7 +148,7 @@ void
 KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 {
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(this), true);
+	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -192,7 +192,7 @@ void
 KexiDBForm::clearForm()
 {
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(this), true);
+	p.tqbegin(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.begin(TQT_TQPAINTDEVICE(this), true);
+	p.tqbegin(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->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -268,7 +268,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 }
 
 TQSize
-KexiDBForm::sizeHint() const
+KexiDBForm::tqsizeHint() const
 {
 	//todo: find better size (user configured?)
 	return TQSize(400,300);
@@ -304,7 +304,7 @@ TQPtrList<TQWidget>* KexiDBForm::orderedDataAwareWidgets() const
 void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 {
 	TQWidget *fromWidget = 0;
-	//TQWidget *topLevelWidget = form->widget()->topLevelWidget();
+	//TQWidget *tqtopLevelWidget = form->widget()->tqtopLevelWidget();
 //js	form->updateTabStopsOrder(); //certain widgets can have now updated focusPolicy properties, fix this
 	uint numberOfDataAwareWidgets = 0;
 //	if (d->orderedFocusWidgets.isEmpty()) {
@@ -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 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())) {
+				//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())) {
 						kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" 
-							<< childrenIt.current()->className() << " " << childrenIt.current()->name()  
+							<< tqchildrenIt.current()->className() << " " << tqchildrenIt.current()->name()  
 							<< "' child to filtered widgets" << endl;
-						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
-						childrenIt.current()->installEventFilter(this);
+						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(tqchildrenIt.current()));
+						tqchildrenIt.current()->installEventFilter(this);
 		//			}
 				}
-				delete children;
+				delete tqchildren;
 				if (fromWidget) {
 					kexipluginsdbg << "KexiDBForm::updateTabStopsOrder() tab order: " << fromWidget->name() 
 						<< " -> " << it.current()->widget()->name() << endl;
@@ -361,7 +361,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 			}
 			fromWidget = it.current();
 		}
-//		SET_FOCUS_USING_REASON(focusWidget(), TQFocusEvent::Tab);
+//		SET_FOCUS_USING_REASON(tqfocusWidget(), TQFocusEvent::Tab);
 	}*/
 }
 
@@ -399,7 +399,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab;
 			bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab)
 				|| (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab);
-			TQObject *o = watched; //focusWidget();
+			TQObject *o = watched; //tqfocusWidget();
 			TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling)
 
 			if (!tab && !backtab) {
diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h
index 297989476..fc0d25c27 100644
--- a/kexi/plugins/forms/widgets/kexidbform.h
+++ b/kexi/plugins/forms/widgets/kexidbform.h
@@ -69,7 +69,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm :
 		virtual void clearForm();
 		virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/);
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		bool autoTabStops() const;
 
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 23f079ae2..4165c0000 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -23,7 +23,7 @@
 #include <tqapplication.h>
 #include <tqpixmap.h>
 #include <tqstyle.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqbuffer.h>
@@ -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_alignment(TQt::AlignAuto|TQt::AlignTop)
+	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
 	, m_readOnly(false)
 	, m_scaledContents(false)
@@ -80,7 +80,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n
 	, m_insideSetPalette(false)
 {
 	installEventFilter(this);
-	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
+	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
 
 	//setup popup menu
 	m_popupMenu = new KexiImageContextMenu(this);
@@ -176,7 +176,7 @@ void KexiDBImageBox::setValueInternal( const TQVariant& add, bool removeOld, boo
 		m_valueMimeType = TQString();
 		m_pixmap = TQPixmap();
 	}
-	repaint();
+	tqrepaint();
 }
 
 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 ));
-	repaint();
+	tqrepaint();
 }
 
 uint KexiDBImageBox::storedPixmapId() const
@@ -257,7 +257,7 @@ uint KexiDBImageBox::storedPixmapId() const
 void KexiDBImageBox::setStoredPixmapId(uint id)
 {
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*stored*/true ));
-	repaint();
+	tqrepaint();
 }
 
 bool KexiDBImageBox::hasScaledContents() const
@@ -276,14 +276,14 @@ void KexiDBImageBox::setScaledContents(bool set)
 {
 //todo	m_pixmapLabel->setScaledContents(set);
 	m_scaledContents = set;
-	repaint();
+	tqrepaint();
 }
 
 void KexiDBImageBox::setKeepAspectRatio(bool set)
 {
 	m_keepAspectRatio = set;
 	if (m_scaledContents)
-		repaint();
+		tqrepaint();
 }
 
 TQWidget* KexiDBImageBox::widget()
@@ -331,7 +331,7 @@ void KexiDBImageBox::handleInsertFromFileAction(const KURL& url)
 		if (!h)
 			return;
 		setData(h);
-		repaint();
+		tqrepaint();
 	}
 	else {
 		//db-aware
@@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction()
 
 void KexiDBImageBox::handleCopyAction()
 {
-	tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
+	tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
 }
 
 void KexiDBImageBox::handlePasteAction()
 {
 	if (isReadOnly() || (!m_designMode && !hasFocus()))
 		return;
-	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
 //	if (!pm.isNull())
 //		setValueInternal(pm, true);
 	if (dataSource().isEmpty()) {
@@ -429,7 +429,7 @@ void KexiDBImageBox::handlePasteAction()
 		}
 	}
 	
-	repaint();
+	tqrepaint();
 	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
-	repaint();
+	tqrepaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();//valueChanged(data());
 		signalValueChanged();
@@ -522,17 +522,17 @@ void KexiDBImageBox::slotToggled(bool on)
 	TQRect screen = tqApp->desktop()->availableGeometry( m_chooser );
 	TQPoint p;
 	if ( TQApplication::reverseLayout() ) {
-		if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() )
+		if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() )
 			p = m_chooser->mapToGlobal( m_chooser->rect().bottomRight() );
 		else
-			p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->sizeHint().height() ) );
-		p.rx() -= m_popupMenu->sizeHint().width();
+			p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) );
+		p.rx() -= m_popupMenu->tqsizeHint().width();
 	}
 	else {
-		if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() )
+		if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() )
 			p = m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() );
 		else
-			p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->sizeHint().height() ) );
+			p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) );
 	}
 	if (!m_popupMenu->isVisible() && on) {
 		m_popupMenu->exec( p, -1 );
@@ -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").arg(beautifiedImageBoxName));
+			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").tqarg(beautifiedImageBoxName));
 		}
 	}
 }
@@ -610,11 +610,11 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	}
 	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
 	}
 }
 
-TQSize KexiDBImageBox::sizeHint() const
+TQSize KexiDBImageBox::tqsizeHint() const
 {
 	if (pixmap().isNull())
 		return TQSize(80, 80);
@@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (m_designMode && pixmap().isNull()) {
 		TQPixmap pm(size()-TQSize(m, m));
 		TQPainter p2;
-		p2.begin(TQT_TQPAINTDEVICE(&pm), this);
+		p2.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
 		p2.fillRect(0,0,width(),height(), bg);
 
 		updatePixmap();
@@ -665,7 +665,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 		p2.setPen( KexiUtils::contrastColor( bg ) );
 		p2.drawText(pm.rect(), TQt::AlignCenter,
 			dataSource().isEmpty() 
-				? TQString::fromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image")
+				? TQString::tqfromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image")
 				: dataSource());
 		p2.end();
 		bitBlt(this, m, m, &pm);
@@ -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_alignment, 
+		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_tqalignment, 
 			m_scaledContents, m_keepAspectRatio );
 	}
 	KexiFrame::drawFrame( &p );
@@ -687,7 +687,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
 		tqstyle().tqdrawPrimitive(
 			TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this), 
-			palette().active() );
+			tqpalette().active() );
 	}
 }
 
@@ -697,7 +697,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (oldPalette.active().background()!=palette().active().background()) {
 		delete KexiDBImageBox_pm;
 		KexiDBImageBox_pm = 0;
-		repaint();
+		tqrepaint();
 	}
 }*/
 
@@ -715,11 +715,11 @@ void KexiDBImageBox::updatePixmap()
 	}
 }
 
-void KexiDBImageBox::setAlignment(int alignment)
+void KexiDBImageBox::tqsetAlignment(int tqalignment)
 {
-	m_alignment = alignment;
+	m_tqalignment = tqalignment;
 	if (!m_scaledContents || m_keepAspectRatio)
-		repaint();
+		tqrepaint();
 }
 
 void KexiDBImageBox::setData(const KexiBLOBBuffer::Handle& handle)
@@ -737,7 +737,7 @@ void KexiDBImageBox::resizeEvent( TQResizeEvent * e )
 {
 	KexiFrame::resizeEvent(e);
 	if (m_chooser) {
-		TQSize s( m_chooser->sizeHint() );
+		TQSize s( m_chooser->tqsizeHint() );
 		TQSize margin( realLineWidth(), realLineWidth() );
 		s.setHeight( height() - 2*margin.height() );
 		s = s.boundedTo( size()-2*margin );
@@ -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 repaint focus rect
+			update(); //to tqrepaint 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 860ee4c6f..32b4e9b15 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 alignment READ alignment WRITE setAlignment )
+	TQ_PROPERTY( int tqalignment READ tqalignment WRITE tqsetAlignment )
 //	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,11 +95,11 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 //		bool designMode() const { return m_designMode; }
 
-		int alignment() const { return m_alignment; }
+		int tqalignment() const { return m_tqalignment; }
 
 		bool keepAspectRatio() const { return m_keepAspectRatio; }
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		KexiImageContextMenu *contextMenu() const;
 
@@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 		void setScaledContents(bool set);
 
-		void setAlignment(int alignment);
+		void tqsetAlignment(int tqalignment);
 
 		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_alignment;
+		int m_tqalignment;
 		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 93f350271..2d09429e2 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -63,10 +63,10 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
 	: TQLabel( parent )
 	, m_parentLabel(parent)
 {
-	int a = alignment() | TQt::WordBreak;
+	int a = tqalignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
 	a |= TQt::AlignTop;
-	setAlignment( a );
+	tqsetAlignment( a );
 	updateFrame();
 }
 
@@ -132,7 +132,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage,
 	double realOpacity = SHADOW_OPACITY + TQMIN(50.0/double(256.0-tqGray(bgColor.rgb())), 50.0);
 	//int _h, _s, _v;
 	//.getHsv( &_h, &_s, &_v );
-	if (colorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white
+	if (tqcolorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white
 		realOpacity += 50.0;
 	result.fill( (int)realOpacity );
 	result.setAlphaBuffer( true );
@@ -177,7 +177,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() {
 	/*!
 	* Backup the default color used to draw text.
 	*/
-	const TQColor textColor = colorGroup().foreground();
+	const TQColor textColor = tqcolorGroup().foreground();
 
 	/*!
 	* Temporary storage for the generated shadow
@@ -232,7 +232,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() {
 		TQMIN( m_shadowRect.y() + ( m_shadowRect.height() * 3 / 2 ), shadowImage.height() ) ) );
 
 	shadowImage = makeShadow( shadowImage,
-		tqGray( colorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black,
+		tqGray( tqcolorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black,
 		m_shadowRect );
 	if (shadowImage.isNull())
 		return KPixmap();
@@ -424,9 +424,9 @@ void KexiDBLabel::init()
 	m_hasFocusableWidget = false;
 	d->internalLabel = new KexiDBInternalLabel( this );
 	d->internalLabel->hide();
-	d->frameColor = palette().active().foreground();
+	d->frameColor = tqpalette().active().foreground();
 
-	setAlignment( d->internalLabel->alignment() );
+	tqsetAlignment( d->internalLabel->tqalignment() );
 }
 
 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( alignment() );
+	d->internalLabel->tqsetAlignment( tqalignment() );
 //	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;
-	repaint();
+	tqrepaint();
 }
 
 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(), alignment(), false );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), false );
 	TQLabel::paintEvent( e );
 }
 
@@ -577,7 +577,7 @@ void KexiDBLabel::setShadowEnabled( bool state ) {
 	d->pixmapDirty = true;
 	if (state)
 		d->internalLabel->updateFrame();
-	repaint();
+	tqrepaint();
 }
 
 void KexiDBLabel::resizeEvent( TQResizeEvent* e ) {
@@ -636,7 +636,7 @@ void KexiDBLabel::setText( const TQString& text ) {
 	TQLabel::setText( text );
 	//This is necessary for KexiFormDataItemInterface
 	valueChanged();
-	repaint();
+	tqrepaint();
 }
 
 bool KexiDBLabel::shadowEnabled() const
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 815adca94..5bb74e22a 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(), alignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
 }*/
 
 void KexiDBLineEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KLineEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
 }
 
 bool KexiDBLineEdit::event( TQEvent * e )
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8b4149a97..9c24df4a9 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -33,7 +33,7 @@ KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent,
 : TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
 }
 /*
 void
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index b6ab6b03f..c4cbe4d04 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(), alignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
 }
 
 TQPopupMenu * KexiDBTextEdit::createPopupMenu(const TQPoint & pos)
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index 3afa0e471..b136fa0d8 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -21,7 +21,7 @@
 #include "kexidbtimeedit.h"
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 
 #include <kpopupmenu.h>
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index b64d6edff..09266ae41 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
 	, d( new Private() )
 {
 	//defaults
-	d->frameColor = palette().active().foreground();
+	d->frameColor = tqpalette().active().foreground();
 //! @todo obtain these defaults from current template's style...
 	setLineWidth(2);
 	setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised);
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index ce51766c8..2f6ca562f 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 shape );
+		void setFrameShape( KexiFrame::Shape tqshape );
 		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 22a71001f..331909eed 100644
--- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
+++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
@@ -26,7 +26,7 @@ void ClassName::drawFrame( TQPainter *p )
 		if ( frameShadow() == Plain )
 			qDrawPlainRect( p, frameRect(), d->frameColor, lineWidth() );
 		else
-			qDrawShadeRect( p, frameRect(), colorGroup(), frameShadow() == TQFrame::Sunken, 
+			qDrawShadeRect( p, frameRect(), tqcolorGroup(), frameShadow() == TQFrame::Sunken, 
 				lineWidth(), midLineWidth() );
 	}
 	else {
@@ -69,9 +69,9 @@ ClassName::Shape ClassName::frameShape() const
 	return d->frameShape;
 }
 
-void ClassName::setFrameShape( ClassName::Shape shape )
+void ClassName::setFrameShape( ClassName::Shape tqshape )
 {
-	d->frameShape = shape;
+	d->frameShape = tqshape;
 	update();
 }
 
@@ -98,7 +98,7 @@ void TQFrame::drawFrame( TQPainter *p )
     p->setPen( black ); // ####
     p->drawRect( r ); //### a bit too simple
 #else
-    const TQColorGroup & g = colorGroup();
+    const TQColorGroup & g = tqcolorGroup();
 
 #ifndef TQT_NO_STYLE
     TQStyleOption opt(lineWidth(),midLineWidth());
@@ -162,24 +162,24 @@ void TQFrame::drawFrame( TQPainter *p )
     case PopupPanel:
 #ifndef TQT_NO_STYLE
     {
-	int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this),
-	    hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this);
+	int vextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this),
+	    hextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this);
 	if(vextra > 0 || hextra > 0) {
 	    TQRect fr = frameRect();
 	    int   fw = frameWidth();
 	    if(vextra > 0) {
-		style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
+		style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.y() + fw, fr.width() - (fw*2), vextra),
 				    g, flags, opt);
-		style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
+		style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.bottom() - fw - vextra, fr.width() - (fw*2), vextra),
 				    g, flags, opt);
 	    }
 	    if(hextra > 0) {
-		style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
+		style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
 				    TQRect(fr.x() + fw, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra),
 				    g, flags, opt);
-		style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
+		style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this,
 				    TQRect(fr.right() - fw - hextra, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra),
 				    g, flags, opt);
 	    }
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index bbd678ccf..f33476768 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 	}
 
 	if (copyToClipboard)
-		kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
+		kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
 
 	delete [] isText;
 	delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index bd5ad8141..6e9859012 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -137,12 +137,12 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_exportOptionsPage);
 	connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked()));
 	exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0);
-	m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
 	// -<options section>
 	m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage,
 		"m_exportOptionsSection");
-	m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1);
 	TQWidget *exportOptionsSectionWidget
 		= new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget");
@@ -170,7 +170,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 	// - character encoding
 	m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget );
-	m_characterEncodingCombo->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 );
 	TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"),
 		exportOptionsSectionWidget);
@@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	updateGeometry();
 
 	// -keep widths equal on page #2:
-	int width = TQMAX( m_infoLblFrom->leftLabel()->sizeHint().width(),
-		m_infoLblTo->leftLabel()->sizeHint().width());
+	int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(),
+		m_infoLblTo->leftLabel()->tqsizeHint().width());
 	m_infoLblFrom->leftLabel()->setFixedWidth(width);
 	m_infoLblTo->leftLabel()->setFixedWidth(width);
 }
@@ -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)").arg(m_rowCount).arg(columns);
+			text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns);
 		else
-			text += i18n("(columns: %1)").arg(columns);
+			text += i18n("(columns: %1)").tqarg(columns);
 		m_infoLblFrom->setLabelText(text);
 		TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
 		m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() );
@@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
 	}
 }
 
-void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
 {
-	TQWizard::layOutButtonRow( layout );
+	TQWizard::layOutButtonRow( tqlayout );
 
-	//find the last sublayout
+	//find the last subtqlayout
 	TQLayout *l = 0;
-	for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
-		l = lit.current()->layout();
+	for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
+		l = lit.current()->tqlayout();
 	if (dynamic_cast<TQBoxLayout*>(l)) {
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
@@ -376,7 +376,7 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked()
 
 static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
 {
-	TQString _key(TQString::fromLatin1(key));
+	TQString _key(TQString::tqfromLatin1(key));
 	if (mode == KexiCSVExport::Clipboard) {
 		_key.replace("Exporting", "Copying");
 		_key.replace("Export", "Copy");
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 7ef7020d6..272131597 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard
 
 	protected:
 		//! reimplemented to add "Defaults" button on the left hand
-		virtual void layOutButtonRow( TQHBoxLayout * layout );
+		virtual void layOutButtonRow( TQHBoxLayout * tqlayout );
 
 		//! \return default delimiter depending on mode.
 		TQString defaultDelimiter() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 54890c0b5..18398d39f 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -27,17 +27,17 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmime.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfiledialog.h>
 #include <tqpainter.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
@@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	setIcon(DesktopIcon(_IMPORT_ICON));
 	setSizeGripEnabled( TRUE );
 
-//	m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+//	m_encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
 //	m_stripWhiteSpaceInTextValuesChecked = true;
 	m_file = 0;
 	m_inputStream = 0;
@@ -216,7 +216,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_delimiterWidget, 1, 2, 0, 0 );
 
 	TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), page);
-	delimiterLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	delimiterLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addMultiCellWidget( delimiterLabel, 0, 0, 0, 0 );
 
 	// Format: number, text, currency,
@@ -230,7 +230,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_formatCombo, 1, 1, 1, 1 );
 
 	m_formatLabel = new TQLabel(m_formatCombo, "", page);
-	m_formatLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_formatLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_formatLabel, 0, 1 );
 
 	m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" );
@@ -241,20 +241,20 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addWidget( m_comboQuote, 1, 2 );
 
 	TextLabel2 = new TQLabel( m_comboQuote, i18n( "Text quote:" ), page, "TextLabel2" );
-	TextLabel2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	TextLabel2->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	TextLabel2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	TextLabel2->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( TextLabel2, 0, 2 );
 
 	m_startAtLineSpinBox = new KIntSpinBox( page, "m_startAtLineSpinBox" );
 	m_startAtLineSpinBox->setMinValue(1);
-	m_startAtLineSpinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	m_startAtLineSpinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 	m_startAtLineSpinBox->setMinimumWidth(TQFontMetrics(m_startAtLineSpinBox->font()).width("8888888"));
 	glyr->addWidget( m_startAtLineSpinBox, 1, 3 );
 
 	m_startAtLineLabel = new TQLabel( m_startAtLineSpinBox, "", 
 		page, "TextLabel3" );
-	m_startAtLineLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	m_startAtLineLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_startAtLineLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	m_startAtLineLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_startAtLineLabel, 0, 3 );
 
 	TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
@@ -271,7 +271,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	m_table = new KexiCSVImportDialogTable( plainPage(), "m_table" );
 	lyr->addWidget( m_table );
 
-	m_table->setSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
+	m_table->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
 	m_table->setNumRows( 0 );
 	m_table->setNumCols( 0 );
 
@@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 if ( m_mode == Clipboard )
   {
 	setCaption( i18n( "Inserting From Clipboard" ) );
-	TQMimeSource * mime = TQApplication::clipboard()->data();
+	TQMimeSource * mime = TQApplication::tqclipboard()->data();
 	if ( !mime )
 	{
 	  KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -294,7 +294,7 @@ if ( m_mode == Clipboard )
 	  m_cancelled = true;
 	  return;
 	}
-	m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
+	m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {*/
@@ -336,11 +336,11 @@ if ( m_mode == Clipboard )
 	}
 	else if (m_mode == Clipboard) {
 		TQCString subtype("plain");
-		m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard);
+		m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard);
 /* debug
-		for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++)
+		for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++)
 			kdDebug() << i << ": " 
-				<< TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
+				<< TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
 */
 	}
 	else {
@@ -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\"...")
-			.arg(TQDir::convertSeparators(m_fname)), true);
+			.tqarg(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>.")
-			.arg(TQDir::convertSeparators(m_fname)) );
+			.tqarg(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);
-	repaint();
+	tqrepaint();
 	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:").arg(
-			m_allRowsLoadedInPreview ? TQString(" (1-%1)").arg(count)
+	m_startAtLineLabel->setText(i18n( "Start at line%1:").tqarg(
+			m_allRowsLoadedInPreview ? TQString(" (1-%1)").tqarg(count)
 			: TQString() //we do not know what's real count
 	));
 	updateRowCountInfo();
 
 	m_blockUserEvents = false;
-	repaint();
-	m_table->verticalScrollBar()->repaint();//avoid missing repaint
-	m_table->horizontalScrollBar()->repaint();//avoid missing repaint
+	tqrepaint();
+	m_table->verticalScrollBar()->tqrepaint();//avoid missing tqrepaint
+	m_table->horizontalScrollBar()->tqrepaint();//avoid missing tqrepaint
 }
 
 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.device()->at();
+	const TQIODevice::Offset origOffset = inputStream.tqdevice()->at();
 	TQChar c, prevChar=0;
 	int detectedDelimiter = 0;
 	bool insideQuote = false;
@@ -601,7 +601,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 		prevChar = c;
 	}
 
-	inputStream.device()->at(origOffset); //restore orig. offset
+	inputStream.tqdevice()->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
@@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 		if (x == '\r') {
 			continue; // eat '\r', to handle RFC-compliant files
 		}
-		if (offset==0 && x.unicode()==0xfeff) {
+		if (offset==0 && x.tqunicode()==0xfeff) {
 			// Ignore BOM, the "Byte Order Mark" 
-			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
+			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf)
 			// Probably fixed in TQt4.
 			continue;
 		}
@@ -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;
-			repaint();
+			tqrepaint();
 			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").arg(col+1); //will be changed to a valid identifier on import
+		colName = i18n("Column %1").tqarg(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").arg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
+		i18n("Column %1").tqarg(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.at(i)==',') {
-					t.at(i) = '.';
+				if (t.tqat(i)==',') {
+					t.tqat(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.arg(col+1) );
+	m_formatLabel->setText( m_formatComboText.tqarg(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...")
-			.arg(TQDir::convertSeparators(m_fname)).arg(m_destinationTableSchema->name()) );
+			.tqarg(TQDir::convertSeparators(m_fname)).tqarg(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\".")
-		.arg(m_destinationTableSchema->name()));
+		.tqarg(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)").arg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: %1)").tqarg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::remove( m_infoLbl );
 	}
 	else {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: more than %1)").arg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: more than %1)").tqarg( 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/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index bf64aad5c..ed1a5b304 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -21,8 +21,8 @@
 #include <widget/kexicharencodingcombobox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
-#include <textcodec.h>
+#include <tqlayout.h>
+#include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
@@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
 	kapp->config()->setGroup("ImportExport");
 	encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
 	if (encoding.isEmpty()) {
-		encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+		encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
 		defaultEncodingExplicitySet = false;
 	}
 	else
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index 53ba28c34..48d907b99 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <klineedit.h>
@@ -57,7 +57,7 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget
 	setFocusProxy(m_combo);
 
 	m_delimiterEdit = new KLineEdit( this, "m_delimiterEdit" );
-//  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+//  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
 	m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
 	m_delimiterEdit->setMaxLength(1);
 	lyr->addWidget( m_delimiterEdit );
@@ -162,19 +162,19 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	vbox->addLayout(hbox);
 	m_leftLabel = new TQLabel(labelText, this);
 	m_leftLabel->setMinimumWidth(130);
-	m_leftLabel->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_leftLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_leftLabel->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_leftLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_leftLabel);
 	m_iconLbl = new TQLabel(this);
-	m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft);
+	m_iconLbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_iconLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft);
 	m_fnameLbl = new KActiveLabel(this);
 	m_fnameLbl->setFocusPolicy(TQ_NoFocus);
 	m_fnameLbl->setTextFormat(TQt::PlainText);
-	m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
+	m_fnameLbl->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
 	m_fnameLbl->setLineWidth(1);
 	m_fnameLbl->setFrameStyle(TQFrame::Box);
-	m_fnameLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_fnameLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addSpacing(5);
 	hbox->addWidget(m_iconLbl);
 	hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
@@ -182,10 +182,10 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	m_commentLbl = new KActiveLabel(this);
 	m_commentLbl->setFocusPolicy(TQ_NoFocus);
 	m_commentLbl->setTextFormat(TQt::PlainText);
-	m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+	m_commentLbl->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 	m_commentLbl->setLineWidth(1);
 	m_commentLbl->setFrameStyle(TQFrame::Box);
-	m_commentLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_commentLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_commentLbl, 0, TQt::AlignVCenter | TQt::AlignRight | TQt::WordBreak);
 
 	m_separator = new TQFrame(this);
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 76f76d31c..3c420c7ac 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget
 		 setFileName() can be used to display filename and setCommentAfterFileName() to display 
 		 additional comment.
 
-		 The widget's layout can look like this:
+		 The widget's tqlayout can look like this:
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index 19922122b..d2eb1df16 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").arg(parts[0]) );
+		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) );
 		KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0;
 		if(! item)
-			throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem));
+			throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(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\"").arg(method));
+		throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index 564b03c8d..ccad645c8 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").arg( context->variable("object")->variant().toString() );
+	const TQString mimetype = TQString("kexi/%1").tqarg( 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\"").arg(mimetype));
+		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").tqarg(mimetype));
 	}
 
 	KexiPart::Item* item = mainWin()->project()->item(part->info(), name);
 	if(! item) {
-		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype));
+		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype));
 	}
 
 	part->execute(item);
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index 815b87234..bc573d100 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\".").arg(dialog->caption()));
+		throw KoMacro::Exception(i18n("No view selected for \"%1\".").tqarg(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.").arg(dialog->caption()));
+		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").tqarg(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\".").arg(record).arg(dialog->caption()));
+		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").tqarg(record).tqarg(dialog->caption()));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 1a0aabf8c..419e2b00d 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").arg(objectname) );
+				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(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()<<" children="<<namelist<<endl;
+				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl;
 			}
 
 			virtual ~ObjectNameVariable() {}
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index c27f024b7..83a7a471c 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->children().count() > 0)
-					this->setVariant( this->children()[0]->variant() );
+				else if(this->tqchildren().count() > 0)
+					this->setVariant( this->tqchildren()[0]->variant() );
 				else
 					this->setVariant( TQString() );
 
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index d7c4e7aa9..9cd2e6641 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").arg(objectname) );
+				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(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->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
+						this->tqchildren().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").arg(objectname).latin1(), name );
+	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").tqarg(objectname).latin1(), name );
 	if(! item) {
-		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").arg(objectname).arg(name));
+		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").tqarg(objectname).tqarg(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\".").arg(view).arg(objectname).arg(name));
+		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").tqarg(view).tqarg(objectname).tqarg(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\".").arg(objectname).arg(name));
+			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").tqarg(objectname).tqarg(name));
 		}
 	}
 }
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index 5406e8ca0..b7e89e9ac 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
 	) );
 
 	// Create the tableview.
-	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
 	d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/);
-	layout->addWidget(d->datatable);
+	tqlayout->addWidget(d->datatable);
 	d->tableview = d->datatable->tableView();
 	d->tableview->setSpreadSheetMode();
 	d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area
@@ -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 children = variable->children();
-		if(children.count() > 0) {
+		KoMacro::Variable::List tqchildren = variable->tqchildren();
+		if(tqchildren.count() > 0) {
 			TQStringList keys, names;
-			KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
+			KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.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 520d1799e..3529ea0cd 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 repaint);
+		void rowInserted(KexiTableItem* item, uint row, bool tqrepaint);
 
 		/**
 		* 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 25ec569f0..f6422be9b 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>").arg( context->macro()->name() ).arg( exception->errorMessage() ));
+	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").tqarg( context->macro()->name() ).tqarg( 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").arg(i++));
+		listviewitem->setText(0,TQString("%1").tqarg(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\"").arg(name) << endl;
+		kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").tqarg(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.").arg(name) << endl;
+			kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").tqarg(name) << endl;
 			return;
 		}
 	}
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 05d7ba726..d44b8aeec 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -53,7 +53,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>48</width>
                                     <height>48</height>
@@ -65,7 +65,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -87,7 +87,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignVCenter</set>
                             </property>
                         </widget>
@@ -154,7 +154,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 738273837..e67794be8 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -17,7 +17,7 @@
 
 #include "keximacroproperty.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpainter.h>
@@ -86,7 +86,7 @@ void KexiMacroProperty::init()
 	}
 
 	//TESTCASE!!!!!!!!!!!!!!!!!!!!!!
-	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() );
+	//if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() );
 
 	Q_ASSERT(! d->name.isNull());
 	m_property->setName( d->name.latin1() );
@@ -349,9 +349,9 @@ class EditListBoxItem : public ListBoxItem
 			Q_ASSERT( m_widget != 0 );
 			//m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0));
 			m_widget->reparent(listBox(), 0, TQPoint(1,1));
-			//layout->addWidget(m_widget, 1);
+			//tqlayout->addWidget(m_widget, 1);
 			m_widget->setMinimumHeight(5);
-			m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+			m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 		}
 
 	private:
@@ -389,45 +389,45 @@ class ListBox : public TQListBox
 			Q_ASSERT( m_edititem->widget() != 0 );
 
 			const TQString name = m_macroproperty->name();
-			KoMacro::Variable::List children;
+			KoMacro::Variable::List tqchildren;
 			{
-				KoMacro::Variable::List actionchildren;
+				KoMacro::Variable::List actiontqchildren;
 
 				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())
-					actionchildren = itemvar->children();
+					actiontqchildren = itemvar->tqchildren();
 
 				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())
-					actionchildren += actionvar->children();
+					actiontqchildren += actionvar->tqchildren();
 
-				KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd());
+				KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd());
 				for(; it != end; ++it) {
 					if(name == (*it)->name()) {
-						KoMacro::Variable::List list = (*it)->children();
+						KoMacro::Variable::List list = (*it)->tqchildren();
 						KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd());
 						for(; listit != listend; ++listit)
-							children.append( *listit );
+							tqchildren.append( *listit );
 					}
 				}
 
-				if(children.count() <= 0)
-					children = actionchildren;
+				if(tqchildren.count() <= 0)
+					tqchildren = actiontqchildren;
 			}
 
 			/*
-			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl;
-			KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd());
+			kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl;
+			KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd());
 			for(; listit != listend; ++listit) {
-				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl;
+				kdDebug()<<"    child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl;
 			}
 			*/
 
-			if(children.count() > 0) {
-				KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end());
+			if(tqchildren.count() > 0) {
+				KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end());
 				for(; childit != childend; ++childit) {
 					const TQString n = (*childit)->name();
 					//if(! n.startsWith("@")) continue;
@@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
 {
 	kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl;
 
-	TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0);
 
 	d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() );
 	if(! d->macroproperty) {
@@ -516,11 +516,11 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
 	}
 
 	d->combobox = new KComboBox(this);
-	layout->addWidget(d->combobox);
+	tqlayout->addWidget(d->combobox);
 	d->listbox = new ListBox(d->combobox, d->macroproperty);
 	d->combobox->setEditable(true);
 	d->combobox->setListBox(d->listbox);
-	d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	d->combobox->setMinimumHeight(5);
 	d->combobox->setInsertionPolicy(TQComboBox::NoInsertion);
 	d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index 540dcc39d..e35ee5b2f 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent,
 	: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
 	, d( new Private() )
 {
-	TQHBoxLayout* layout = new TQHBoxLayout(this);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
 	d->editor = new KTextEdit(this);
 	d->editor->setTextFormat(TQt::PlainText);
 	d->editor->setWordWrap(TQTextEdit::NoWrap);
-	layout->addWidget(d->editor);
+	tqlayout->addWidget(d->editor);
 
 	connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged()));
 }
@@ -72,7 +72,7 @@ bool KexiMacroTextView::loadData()
 		return false;
 	}
 
-	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").arg(data) << endl;
+	kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").tqarg(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").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()).arg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(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 19e789f04..e9f9cd333 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").arg(domdoc.toString()) << endl;
+	kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").tqarg(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]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id());
-	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl;
+	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;
 	return storeDataBlock(xml);
 }
 
diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp
index fc729b579..45c03d125 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\"").arg(name()) << endl;
+	//kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(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").arg(name());
+	return TQString("Action:%1").tqarg(name());
 }
 
 const TQString Action::name() const
diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp
index c0eea2505..7c0b6ee87 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 children of the
+			* List of @a Action instances that are tqchildren 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 children to macro children
+				, items(m->items()) // set d-pointer tqchildren to macro tqchildren
 				, 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.").arg(name));
+	throw Exception(TQString("Variable name='%1' does not exist.").tqarg(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'").arg(name).arg(variable->toString()) << endl;
+	kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(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").arg(d->macro->name()) );
+			d->exception->addTraceMessage( TQString("macro=%1").tqarg(d->macro->name()) );
 			//the action name
-			d->exception->addTraceMessage( TQString("action=%1").arg(action->name()) );
+			d->exception->addTraceMessage( TQString("action=%1").tqarg(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").arg(*vit).arg(v->toString()) );
+				d->exception->addTraceMessage( TQString("%1=%2").tqarg(*vit).tqarg(v->toString()) );
 			}
 			return; // abort execution
 		}
diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index a7986167b..2bb1bef36 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 children
+	* an instance of this class and passes it around all it's tqchildren
 	* 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 b435f2f25..91cfa03c8 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\"").arg(errormessage) << endl;
+	kdDebug() << TQString("Exception errormessage=\"%1\"").tqarg(errormessage) << endl;
 }
 
 //copy constructor
diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp
index 808c40433..6bcdc21d2 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").arg(name());
+	return TQString("Macro:%1").tqarg(name());
 }
 
 //get (d-pointer) itemlist
diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h
index 5e5decf8d..86e0122ae 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 children of this @a Macro .
+			* are tqchildren 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 05bd22c32..16b938037 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\"").arg(d->signature));
+		throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature));
 	}
 
 	d->signaturetag = d->signature.left(startpos).stripWhiteSpace();
 	if(d->signaturetag.isEmpty()) {
-		throw Exception(TQString("Invalid tagname in signature \"%1\"").arg(d->signature));
+		throw Exception(TQString("Invalid tagname in signature \"%1\"").tqarg(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\"").arg(d->signature));
+				throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(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\"").arg(d->signature));
+		throw Exception(TQString("To less arguments for slot with siganture \"%1\"").tqarg(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\"").arg(d->signature).arg(metaargument->type()).arg(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()));
 		}
 
 		switch(metaargument->type()) {
@@ -287,7 +287,7 @@ KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
 		return new Variable(v);
 	}
 
-	throw Exception(TQString("Invalid parameter '%1'").arg(desc));
+	throw Exception(TQString("Invalid parameter '%1'").tqarg(desc));
 }
 
 Variable::List MetaMethod::toVariableList(TQUObject* uo)
diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp
index ee865c821..e9e56b448 100644
--- a/kexi/plugins/macros/lib/metaobject.cpp
+++ b/kexi/plugins/macros/lib/metaobject.cpp
@@ -77,31 +77,31 @@ TQObject* const MetaObject::object() const
 /*
 TQStrList MetaObject::signalNames() const
 {
-	return object()->metaObject()->signalNames();
+	return object()->tqmetaObject()->signalNames();
 }
 
 TQStrList MetaObject::slotNames() const
 {
-	return object()->metaObject()->slotNames();
+	return object()->tqmetaObject()->slotNames();
 }
 */
 
 int MetaObject::indexOfSignal(const char* signal) const
 {
-	TQMetaObject* metaobject = object()->metaObject();
+	TQMetaObject* metaobject = object()->tqmetaObject();
 	int signalid = metaobject->findSignal(signal, false);
 	if(signalid < 0) {
-		throw Exception(TQString("Invalid signal \"%1\"").arg(signal));
+		throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal));
 	}
 	return signalid;
 }
 
 int MetaObject::indexOfSlot(const char* slot) const
 {
-	TQMetaObject* metaobject = object()->metaObject();
+	TQMetaObject* metaobject = object()->tqmetaObject();
 	int slotid = metaobject->findSlot(slot, false);
 	if(slotid < 0) {
-		throw Exception(TQString("Invalid slot \"%1\"").arg(slot));
+		throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot));
 	}
 	return slotid;
 }
@@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
 {
 	TQObject* obj = object();
 	MetaMethod::Type type = MetaMethod::Slot;
-	TQMetaObject* metaobject = obj->metaObject();
+	TQMetaObject* metaobject = obj->tqmetaObject();
 
 	const TQMetaData* metadata = metaobject->slot(index, true);
 	if(! metadata) {
@@ -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\"").arg(index).arg(obj->name()));
+			throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name()));
 		}
 		type = MetaMethod::Signal;
 	}
 
 	if(metadata->access != TQMetaData::Public) {
-		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name()));
+		throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(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 3661ef9a0..f64613b0c 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 children this @a Variable has.
+			* Optional list of tqchildren this @a Variable has.
 			*/
 			// TODO Dow we use this or is it for the future??
-			Variable::List children;
+			Variable::List tqchildren;
 
 			/**
 			* 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]").arg( object()->name() );
+			return TQString("[%1]").tqarg( object()->name() );
 		} break;
 		default: {
 			throw Exception("Type is undefined.");
@@ -213,24 +213,24 @@ int Variable::toInt() const
 	return variant().toInt();
 }
 
-Variable::List Variable::children() const
+Variable::List Variable::tqchildren() const
 {
-	return d->children;
+	return d->tqchildren;
 }
 
 void Variable::appendChild(KSharedPtr<Variable> variable)
 {
-	d->children.append(variable);
+	d->tqchildren.append(variable);
 }
 
 void Variable::clearChildren()
 {
-	d->children.clear();
+	d->tqchildren.clear();
 }
 
-void Variable::setChildren(const Variable::List& children)
+void Variable::setChildren(const Variable::List& tqchildren)
 {
-	d->children = children;
+	d->tqchildren = tqchildren;
 }
 
 /*
diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h
index 14adf09c0..108a6005e 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 children of this @a Variable .
+			* that are tqchildren 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 children() const;
+			List tqchildren() const;
 
 			/**
-			* Append a @a Variable to the list of children this
+			* Append a @a Variable to the list of tqchildren this
 			* @a Variable has.
 			*/
 			void appendChild(KSharedPtr<Variable> variable);
 
 			/**
-			* Clear the list of children this @a Variable has.
+			* Clear the list of tqchildren this @a Variable has.
 			*/
 			void clearChildren();
 
 			/**
-			* Set the children this @a Variable has.
+			* Set the tqchildren this @a Variable has.
 			*/
-			void setChildren(const List& children);
+			void setChildren(const List& tqchildren);
 
 #if 0
 			/**
diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp
index 5b53d51b9..4894c6190 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\"").arg(element.tagName()) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").tqarg(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\"").arg(element.attribute("xmlversion")) << endl;
+		kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").tqarg(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 children this item has and try
+			// Iterate through the tqchildren 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-children a Macro provides.
+	// The list of MacroItem-tqchildren 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 children the Macro provides.
+	// ...and iterate over the list of tqchildren 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 bdc2e6ad6..1086a340b 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").arg(argument2) + "</argument>"
+			"<argument>" + TQString("%1").tqarg(argument2) + "</argument>"
 		"</function>"
 	));
 
@@ -677,7 +677,7 @@ void CommonTests::testMacro()
 //	KOMACROTEST_ASSERT( actionptr->comment(), TQString("") );
 /*
 	//fetch the second one
-	KSharedPtr<KoMacro::Action> myfuncptr = children[1];
+	KSharedPtr<KoMacro::Action> myfuncptr = tqchildren[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 children from yanMacro
-	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children();
+	//create a list of the tqchildren from yanMacro
+	//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->tqchildren();
 	//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 children
-		yanChildren = yanMacro->children();
-		//get count of children
+		//get the tqchildren
+		yanChildren = yanMacro->tqchildren();
+		//get count of tqchildren
 		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 children
-		yanChildren = yanMacro->children();
-		//get count of children
+		//get the tqchildren
+		yanChildren = yanMacro->tqchildren();
+		//get count of tqchildren
 		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 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 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 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 ee7469914..e301730df 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").arg(#actual).arg(#expected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 == %2").tqarg(#actual).tqarg(#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").arg(#actual).arg(#notexpected).latin1() << std::endl; \
+		std::cout << TQString("Testing: %1 != %2").tqarg(#actual).tqarg(#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 2634d71a3..e0db481e6 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").arg(s);
+	TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").tqarg(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 90454d354..29c538319 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>").arg(INT_MAX).arg(DBL_MAX);
+				    "</macro>").tqarg(INT_MAX).tqarg(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>").arg(INT_MAX+1).arg(DBL_MAX+1);
+				    "</macro>").tqarg(INT_MAX+1).tqarg(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>").arg(INT_MIN).arg(DBL_MIN);
+				    "</macro>").tqarg(INT_MIN).tqarg(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>").arg(INT_MIN-1).arg(DBL_MIN-1);
+				    "</macro>").tqarg(INT_MIN-1).tqarg(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>").arg(DBL_MAX+1);
+				    "</macro>").tqarg(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 f32416c03..ac176f890 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>").arg(INT_MAX).arg(DBL_MAX);
+				    "</macro>").tqarg(INT_MAX).tqarg(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>").arg(INT_MAX+1).arg(DBL_MAX+1);
+				    "</macro>").tqarg(INT_MAX+1).tqarg(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>").arg(INT_MIN).arg(DBL_MIN);
+				    "</macro>").tqarg(INT_MIN).tqarg(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>").arg(INT_MIN-1).arg(DBL_MIN-1);
+				    "</macro>").tqarg(INT_MIN-1).tqarg(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 01a3ee3cb..a1f28a794 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -50,7 +50,7 @@
                             <property name="text">
                                 <string>kexi_</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -82,7 +82,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -105,7 +105,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index 26b7d0f25..e7526413b 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 6425d97c7..e215ab909 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -20,7 +20,7 @@
 
 #include "kexiquerydesignerguieditor.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqdom.h>
 #include <tqregexp.h>
@@ -193,8 +193,8 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
 	addChildView(d->relations);
 	addChildView(d->dataTable);
 	setViewWidget(d->dataTable, true);
-	d->relations->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
-	d->head->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+	d->relations->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
+	d->head->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
 	updateGeometry();
 	d->spl->setSizes(TQValueList<int>()<< 800<<400);
 }
@@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 			d->dataTable->dataAwareObject()->setCursorPosition(i,0);
 			if (errMsg)
 				*errMsg = i18n("Select column for table \"%1\"")
-					.arg(it.current()->at(COLUMN_ID_TABLE).toString());
+					.tqarg(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\"").arg(criteriaStr);
+						*errMsg = i18n("Invalid criteria \"%1\"").tqarg(criteriaStr);
 					delete whereExpr;
 					return false;
 				}
@@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg)
 						false/*!allowRelationalOperator*/);
 					if (!columnExpr) {
 						if (errMsg)
-							*errMsg = i18n("Invalid expression \"%1\"").arg(fieldName);
+							*errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName);
 						return false;
 					}
 					temp->query()->addExpression(columnExpr, fieldVisible);
@@ -624,7 +624,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 		if (!m_dialog->neverSaved()) {
 			if (!loadLayout()) {
 				//err msg
-				parentDialog()->setStatus(conn,
+				parentDialog()->settqStatus(conn,
 					i18n("Query definition loading failed."),
 					i18n("Query design may be corrupted so it could not be opened even in text view.\n"
 						"You can delete the query and create it again."));
@@ -639,7 +639,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsForQuery( q, result );
 				if (!result.success) {
-					parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true;
 					return false;
 				}
@@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsAndRelationsForQuery( tempData()->query(), result );
 				if (!result.success) {
-					parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					return false;
 				}
 			}
@@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			columnAlias = query->columnAlias(row_num);
 			if (field->isExpression()) {
 //				if (columnAlias.isEmpty()) {
-//					columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO
+//					columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO
 //				}
 //				if (columnAlias.isEmpty())
 //TODO: ok? perhaps do not allow to omit aliases?
@@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 //		return false;
 //	}
 	if (xml.isEmpty()) {
-		//in a case when query layout was not saved, build layout by hand
+		//in a case when query tqlayout was not saved, build tqlayout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
 		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
@@ -1083,7 +1083,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 			KexiDB::ResultInfo result;
 			showRelationsForQuery( q, result );
 			if (!result.success) {
-				parentDialog()->setStatus(&result, i18n("Query definition loading failed."));
+				parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 				return false;
 			}
 		}
@@ -1177,10 +1177,10 @@ bool KexiQueryDesignerGuiEditor::storeLayout()
 	return true;
 }
 
-TQSize KexiQueryDesignerGuiEditor::sizeHint() const
+TQSize KexiQueryDesignerGuiEditor::tqsizeHint() const
 {
-	TQSize s1 = d->relations->sizeHint();
-	TQSize s2 = d->head->sizeHint();
+	TQSize s1 = d->relations->tqsizeHint();
+	TQSize s2 = d->head->tqsizeHint();
 	return TQSize(TQMAX(s1.width(),s2.width()), s1.height()+s2.height());
 }
 
@@ -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 /*repaint*/)
+void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*tqrepaint*/)
 {
 	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.")
-							.arg(alias.data());
+							.tqarg(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\"").arg(fieldName);
+					result->msg = i18n("Invalid expression \"%1\"").tqarg(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)")
-				.arg(table=="*" ? table : (table+".*"));
+				.tqarg(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\"")
-					.arg(table=="*" ? table : field);
+					.tqarg(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\"").arg(newValue.toString());
+			result->msg = i18n("Invalid criteria \"%1\"").tqarg(newValue.toString());
 		}
 	}
 }
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index f85125c64..c97c140dc 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -69,7 +69,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 
 		KexiRelationWidget *relationView() const;
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	public slots:
 		virtual void setFocus();
@@ -129,15 +129,15 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
 		void slotBeforeCellChanged(KexiTableItem *item, int colnum,
 			TQVariant& newValue, KexiDB::ResultInfo* result);
 
-		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
 		void slotTablePositionChanged(KexiRelationViewTableContainer*);
 		void slotAboutConnectionRemove(KexiRelationViewConnection*);
 		void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
 
-		/*! Loads layout of relation GUI diagram. */
+		/*! Loads tqlayout of relation GUI diagram. */
 		bool loadLayout();
 
-		/*! Stores layout of relation GUI diagram. */
+		/*! Stores tqlayout of relation GUI diagram. */
 		bool storeLayout();
 
 		void showTablesForQuery(KexiDB::QuerySchema *query);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 022b47a07..37fab0e61 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqtimer.h>
@@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private
 		}
 		KexiQueryDesignerSQLEditor *editor;
 		KexiQueryDesignerSQLHistory *history;
-		TQLabel *pixmapStatus, *lblStatus;
+		TQLabel *pixmaptqStatus, *lbltqStatus;
 		TQHBox *status_hbox;
 		TQVBox *history_section;
 		KexiSectionHeader *head, *historyHead;
@@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	d->status_hbox->installEventFilter(this);
 	d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize);
 	d->status_hbox->setSpacing(0);
-	d->pixmapStatus = new TQLabel(d->status_hbox);
-	d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
-	d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
-	d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
-
-	d->lblStatus = new TQLabel(d->status_hbox);
-	d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
-	d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-	d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
-	d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
+	d->pixmaptqStatus = new TQLabel(d->status_hbox);
+	d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
+	d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop);
+	d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+
+	d->lbltqStatus = new TQLabel(d->status_hbox);
+	d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak);
+	d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+	d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3);
+	d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
 
 	TQHBoxLayout *b = new TQHBoxLayout(this);
 	b->addWidget(d->splitter);
@@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const
 
 void KexiQueryDesignerSQLView::setStatusOk()
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapOk);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapOk);
 	setStatusText("<h2>"+i18n("The query is correct")+"</h2>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString());
 }
 
 void KexiQueryDesignerSQLView::setStatusError(const TQString& msg)
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapErr);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapErr);
 	setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg);
 }
 
 void KexiQueryDesignerSQLView::setStatusEmpty()
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapInfo);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapInfo);
 	setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it."));
 }
 
 void KexiQueryDesignerSQLView::setStatusText(const TQString& text)
 {
 	if (!d->action_toggle_history->isChecked()) {
-		TQSimpleRichText rt(text, d->lblStatus->font());
-		rt.setWidth(d->lblStatus->width());
+		TQSimpleRichText rt(text, d->lbltqStatus->font());
+		rt.setWidth(d->lbltqStatus->width());
 		TQValueList<int> sz = d->splitter->sizes();
-		const int newHeight = rt.height()+d->lblStatus->margin()*2;
+		const int newHeight = rt.height()+d->lbltqStatus->margin()*2;
 		if (sz[1]<newHeight) {
 			sz[1] = newHeight;
 			d->splitter->setSizes(sz);
 		}
-		d->lblStatus->setText(text);
+		d->lbltqStatus->setText(text);
 	}
 }
 
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
 {
 	Q_UNUSED( cancel );
 
-	//here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
+	//here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
 	bool queryOK = slotCheckQuery();
 	bool ok = true;
 	KexiDB::SchemaData* query = 0;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 16bfffcef..7cc626207 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqpainter.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqregexp.h>
 
 #include <kpopupmenu.h>
@@ -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->geometry(y, visibleWidth(), fontMetrics())))
+		if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics())))
 		{
 			p->saveWorldMatrix();
 			p->translate(0, y);
-			it->drawItem(p, visibleWidth(), colorGroup());
+			it->drawItem(p, visibleWidth(), tqcolorGroup());
 			p->restoreWorldMatrix();
 		}
-		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 }
 
@@ -79,27 +79,27 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e)
 		if(it.current()->isSelected())
 		{
 			//clear
-			it.current()->setSelected(false, colorGroup());
-			updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics()));
+			it.current()->setSelected(false, tqcolorGroup());
+			updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()));
 		}
 
-		if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
+		if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos()))
 		{
 			popupHistory = it.current();
 			pos = y;
 		}
-		y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	//now do update
 	if (popupHistory) {
 			if (m_selected && m_selected != popupHistory) {
-				m_selected->setSelected(false, colorGroup());
-				updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
+				m_selected->setSelected(false, tqcolorGroup());
+				updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics()));
 			}
 			m_selected = popupHistory;
-			m_selected->setSelected(true, colorGroup());
-			updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics()));
+			m_selected->setSelected(true, tqcolorGroup());
+			updateContents(m_selected->tqgeometry(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());
-			repaint();
+			tqrepaint();
 			return;
 		}
 	}
@@ -137,25 +137,25 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 	int y = 0;
 	for(HistoryEntry *it = m_history->first(); it; it = m_history->next())
 	{
-		y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5;
+		y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5;
 	}
 
 	resizeContents(visibleWidth() - 1, y);
 	if (m_selected) {
-		m_selected->setSelected(false, colorGroup());
+		m_selected->setSelected(false, tqcolorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, colorGroup());
+	m_selected->setSelected(true, tqcolorGroup());
 	ensureVisible(0,y+5);
 	updateContents();
 /*	ensureVisible(0, 0);
 	if (m_selected) {
-		m_selected->setSelected(false, colorGroup());
+		m_selected->setSelected(false, tqcolorGroup());
 	}
 	m_selected = e;
-	m_selected->setSelected(true, colorGroup());
+	m_selected->setSelected(true, tqcolorGroup());
 //	updateContents();
-	updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/
+	updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/
 }
 
 /*void
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
 	if(!m_selected)
 		return;
 
-	TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+	TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
 }
 
 void
@@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg)
 	}
 	else
 	{
-		text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement);
+		text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(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").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>";
+//		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>";
 
 	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::geometry(int y, int width, TQFontMetrics f)
+HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f)
 {
 	Q_UNUSED( f );
 
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 6c828c39a..a6d55285e 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	geometry(int y, int width, TQFontMetrics f);
+		TQRect	tqgeometry(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/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index 1b3c16d7d..c57224ead 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 	}
 	d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params);
 	if (!d->cursor) {
-		parentDialog()->setStatus(parentDialog()->mainWin()->project()->dbConnection(), 
+		parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), 
 			i18n("Query executing failed."));
 		//todo: also provide server result and sql statement
 		return false;
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index 0e42ef805..6c5fae1da 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kexidb/connection.h>
 
@@ -61,7 +61,7 @@ KexiRelationMainDlg::~KexiRelationMainDlg()
 {
 }
 
-TQSize KexiRelationMainDlg::sizeHint() const
+TQSize KexiRelationMainDlg::tqsizeHint() const
 {	
 	return TQSize(600,300);
 }
diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h
index 69f43242b..a2f8ca578 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.h
+++ b/kexi/plugins/relations/kexirelationmaindlg.h
@@ -34,7 +34,7 @@ class KexiRelationMainDlg : public KexiViewBase
 		KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0);
 		~KexiRelationMainDlg();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		virtual TQWidget* mainWidget();
 
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index 7cf7dae97..f45b30bf1 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->geometry(), label->alignment());
+			createEditor(c, label->text(), label, container, label->tqgeometry(), label->tqalignment());
 		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 == "alignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
 			return false;
 	}
 
@@ -180,7 +180,7 @@ KexiReportFactory::changeText(const TQString &text)
 	TQWidget *w = WidgetFactory::m_widget;
 	changeProperty("text", text, m_container);
 
-	int width = w->sizeHint().width();
+	int width = w->tqsizeHint().width();
 
 	if(w->width() < width)
 		w->resize(width, w->height() );
@@ -212,7 +212,7 @@ KexiReportFactory::editText()
 	}
 
 	if(classname == "Label")
-		m_widget->resize(m_widget->sizeHint());
+		m_widget->resize(m_widget->tqsizeHint());
 }
 
 bool
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index cacf40b7f..89423b037 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -40,13 +40,13 @@ KexiReportForm::~KexiReportForm()
 	kexipluginsdbg << "KexiReportForm::~KexiReportForm(): close" << endl;
 }
 
-//repaint all children widgets
+//tqrepaint all tqchildren 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)->repaint();
+		static_cast<TQWidget*>(obj)->tqrepaint();
 	}
 	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->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -178,7 +178,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 }
 
 TQSize
-KexiReportForm::sizeHint() const
+KexiReportForm::tqsizeHint() const
 {
 	//todo: find better size (user configured?)
 	return TQSize(400,300);
diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h
index 7898ec984..8813a2c37 100644
--- a/kexi/plugins/reports/kexireportform.h
+++ b/kexi/plugins/reports/kexireportform.h
@@ -47,7 +47,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig
 		virtual void clearForm();
 		virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/);
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	private:
 		/*TQString m_ds;
diff --git a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp
index 9d577ec18..f64a089f8 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").arg(m_connection->errorMsg())) );
+    //    throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").tqarg(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").arg(parser.error().type()).arg(parser.error().error())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").tqarg(parser.error().type()).tqarg(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\"").arg(parser.operationString()) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").tqarg(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 00b5a21dc..c24752768 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").arg(m_drivermanager.errorMsg())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").tqarg(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").arg(drivername).arg(driver->errorMsg())) );
+    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())) );
     return new KexiDBDriver(driver);
 }
 
@@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
             data->password = config.readEntry("encryptedPassword");
             uint len = data->password.length();
             for (uint i=0; i<len; i++)
-                data->password[i] = TQChar( data->password[i].unicode() - 47 - i );
+                data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i );
         }
         if(data->password.isEmpty())
             data->password = config.readEntry("password");
diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp
index c45eedfcb..2ac403422 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\".").arg(key).arg(m_schema->name())) );
+                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())) );
 
             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\"").arg(key).arg(v.typeName()).arg(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())) );
 
             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 e9de3f460..421bc31fb 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -28,12 +28,12 @@
 #include <kross/main/scriptaction.h>
 #include <kross/api/interpreter.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsplitter.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
 
@@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
 
     TQSplitter* splitter = new TQSplitter(this);
     splitter->setOrientation(Qt::Vertical);
-    TQHBoxLayout* layout = new TQHBoxLayout(this);
-    layout->addWidget(splitter);
+    TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+    tqlayout->addWidget(splitter);
 
     d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor");
     splitter->setFocusProxy(d->editor);
@@ -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").arg(language) << endl;
+        kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").tqarg(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'.").arg(TQString(property.name())) << endl;
+            kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").tqarg(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.").arg(d->scriptaction->name()) );
+    d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").tqarg(d->scriptaction->name()) );
 
     d->scriptaction->activate();
     if( d->scriptaction->hadException() ) {
         TQString errormessage = d->scriptaction->getException()->getError();
-        d->statusbrowser->append(TQString("<b>%2</b><br>").arg(TQStyleSheet::escape(errormessage)) );
+        d->statusbrowser->append(TQString("<b>%2</b><br>").tqarg(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").arg(time.elapsed()) );
+        d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").tqarg(time.elapsed()) );
     }
 }
 
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 088205222..8aec288b9 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"
-        ).arg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n";
+        ).tqarg("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 84fbe4ece..cb66734d6 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.").arg(scriptaction->text()),
+				i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").tqarg(scriptaction->text()),
 				i18n("Execute Script?"), KGuiItem(i18n("Execute"), "exec"),
 				dontAskAgainName, KMessageBox::Notify | KMessageBox::Dangerous
 			) == KMessageBox::Continue;
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index f244ae39e..6f75bdeab 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -93,10 +93,10 @@ def runGuiApp(copycenter, name):
 			qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
 			self.parent = parent
 			self.setCaption(caption)
-			layout = qt.QVBoxLayout(self)
+			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(2)
-			layout.addWidget(box)
+			tqlayout.addWidget(box)
 			self.listview = qt.QListView(box)
 			self.listview.setAllColumnsShowFocus(True)
 			self.listview.header().setStretchEnabled(True,0)
@@ -216,7 +216,7 @@ def runGuiApp(copycenter, name):
 			print "CopyJobWidget.writeOptions"
 			writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname))
 			for optionname in plugininst.options:
-				value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") )
+				value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") )
 				writer.write("\t<%s value=\"%s\" />\n" % (optionname,value))
 			writer.write("</%s>\n" % plugininst.plugintype)
 
@@ -309,31 +309,31 @@ def runGuiApp(copycenter, name):
 			self.starttime = None
 			qt.QDialog.__init__(self, dialog, "ProgressDialog", 1)
 			self.setCaption("Copying...")
-			layout = qt.QVBoxLayout(self)
+			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setSpacing(6)
 			box.setMargin(6)
-			layout.addWidget(box)
+			tqlayout.addWidget(box)
 			self.textbrowser = qt.QTextBrowser(box)
 			self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth)
 			self.textbrowser.setTextFormat(qt.Qt.RichText)
 			statusbox = qt.QFrame(box)
-			layout = qt.QGridLayout(statusbox,4,2,0,2)
-			layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
+			tqlayout = qt.QGridLayout(statusbox,4,2,0,2)
+			tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
 			self.donecounter = 0
 			self.donelabel = qt.QLabel("-",statusbox)
-			layout.addWidget(self.donelabel,0,1)
-			layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
+			tqlayout.addWidget(self.donelabel,0,1)
+			tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
 			self.successcounter = 0
 			self.successlabel = qt.QLabel("-",statusbox)
-			layout.addWidget(self.successlabel,1,1)
-			layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
+			tqlayout.addWidget(self.successlabel,1,1)
+			tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
 			self.failedcounter = 0
 			self.failedlabel = qt.QLabel("-",statusbox)
-			layout.addWidget(self.failedlabel,2,1)
-			layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
+			tqlayout.addWidget(self.failedlabel,2,1)
+			tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
 			self.elapsedlabel = qt.QLabel("-",statusbox)
-			layout.addWidget(self.elapsedlabel,3,1)
+			tqlayout.addWidget(self.elapsedlabel,3,1)
 			btnbox = qt.QHBox(box)
 			btnbox.setSpacing(6)
 			self.donebtn = qt.QPushButton(btnbox)
@@ -530,11 +530,11 @@ def runGuiApp(copycenter, name):
 			self.ListViewDialog = ListViewDialog
 			qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 			self.setCaption("Copy Center")
-			layout = qt.QVBoxLayout(self)
+			tqlayout = qt.QVBoxLayout(self)
 			box = qt.QVBox(self)
 			box.setMargin(6)
 			box.setSpacing(6)
-			layout.addWidget(box)
+			tqlayout.addWidget(box)
 			self.tab = qt.QTabWidget(box)
 			self.tab.setMargin(6)
 			box.setStretchFactor(self.tab,1)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index 985d757d8..678cf40ba 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -84,7 +84,7 @@ class CopyCenterPlugin:
 				return None
 			record = []
 			for fieldname in self.fieldlist:
-				record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
+				record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
 			#print "read record: %s" % record
 			return record
 
@@ -145,8 +145,8 @@ class CopyCenterPlugin:
 				cursorrecord.setValue(self.fieldlist[i], v)
 			rowcount = self.cursor.insert()
 			if rowcount < 1:
-				drv = unicode(self.cursor.lastError().driverText()).encode("latin-1")
-				db = unicode(self.cursor.lastError().databaseText()).encode("latin-1")
+				drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1")
+				db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1")
 				print "failed: %s %s" % (drv,db)
 				self.copierer.writeFailed(record)
 			else:
diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
index cace0340c..d0d1f0cc2 100644
--- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
+++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py
@@ -131,7 +131,7 @@ class HtmlExporter:
 			if items == None: break
 			output.write("<tr>")
 			for item in items:
-				u = unicode(str(self.htmlescape(item)),"latin-1")
+				u = tqunicode(str(self.htmlescape(item)),"latin-1")
 				output.write("<td>%s</td>" % u.encode("utf-8"))
 			output.write("</tr>\n")
 		output.write("</table>\n")
diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
index 200b3dee6..6ca94f9a6 100755
--- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
+++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
@@ -124,9 +124,9 @@ class SaxInput:
 				was parsed. """
 
 				if self.field != None:
-					# the xml-data is unicode and we need to encode it
+					# the xml-data is tqunicode and we need to encode it
 					# to latin-1 cause KexiDB deals only with latin-1.
-					u = unicode(chars[offset:offset+length])
+					u = tqunicode(chars[offset:offset+length])
 					self.field.append(u.encode("latin-1"))
 
 		# start the job
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index d47f02264..443f26d4d 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -20,7 +20,7 @@
 #include "kexilookupcolumnpage.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqheader.h>
 
@@ -142,10 +142,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 
 	TQHBoxLayout *hlyr = new TQHBoxLayout(contentsVlyr);
 	d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents);
-	d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->rowSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->rowSourceLabel->setMargin(2);
 	d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->rowSourceLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->rowSourceLabel);
 
 	d->gotoRowSourceButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoRowSourceButton");
@@ -170,10 +170,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	//- Bound Column
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents);
-	d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->boundColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->boundColumnLabel->setMargin(2);
 	d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->boundColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->boundColumnLabel);
 
 	d->clearBoundColumnButton = new KexiSmallToolButton(contents, TQString(),
@@ -192,10 +192,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	//- Visible Column
 	hlyr = new TQHBoxLayout(contentsVlyr);
 	d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents);
-	d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	d->visibleColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->visibleColumnLabel->setMargin(2);
 	d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
-	d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
+	d->visibleColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->visibleColumnLabel);
 
 	d->clearVisibleColumnButton = new KexiSmallToolButton(contents, TQString(),
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index a019eac24..298363c49 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -18,7 +18,7 @@
 */
 #include <tqdom.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 #include <tqmetaobject.h>
@@ -72,8 +72,8 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand()
 TQString ChangeFieldPropertyCommand::name() const
 {
 	return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"")
-		.arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString())
-		.arg(m_alterTableAction.newValue().toString());
+		.tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString())
+		.tqarg(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]")
-			.arg( m_oldListData ? 
+			.tqarg( m_oldListData ? 
 				TQString("%1 -> %2")
-				.arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(","))
+				.tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(","))
 				: TQString("<NONE>"))
-			.arg( m_listData ?
+			.tqarg( m_listData ?
 				TQString("%1 -> %2")
-				.arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(","))
+				.tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(","))
 				: TQString("<NONE>"));
-	return s + TQString(" (UID=%1)").arg(m_alterTableAction.uid());
+	return s + TQString(" (UID=%1)").tqarg(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\"").arg(m_alterTableAction.fieldName());
+		return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName());
 
-	return TQString("Remove empty row at position %1").arg(m_fieldIndex);
+	return TQString("Remove empty row at position %1").tqarg(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)").arg(m_alterTableAction.uid());
+		+ TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
 }
 
 KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction()
@@ -192,7 +192,7 @@ InsertFieldCommand::~InsertFieldCommand()
 
 TQString InsertFieldCommand::name() const
 {
-	return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString());
+	return i18n("Insert table field \"%1\"").tqarg(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\"")
-		.arg(m_alterTableAction.propertyName())
-		.arg(m_oldVisibility ? "true" : "false")
-		.arg(m_alterTableAction.newValue().toBool() ? "true" : "false");
+		.tqarg(m_alterTableAction.propertyName())
+		.tqarg(m_oldVisibility ? "true" : "false")
+		.tqarg(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").arg(m_row);
+	return TQString("Insert empty row at position %1").tqarg(m_row);
 }
 
 void InsertEmptyRowCommand::execute()
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 0563cde32..84ea686c6 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -22,7 +22,7 @@
 #include "kexilookupcolumnpage.h"
 #include "kexitabledesignercommands.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 
@@ -168,7 +168,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 	connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
 
-	setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height());
+	setMinimumSize(d->view->tqminimumSizeHint().width(), d->view->tqminimumSizeHint().height());
 	d->view->setFocus();
 
 	d->sets = new KexiDataAwarePropertySet( this, d->view );
@@ -495,11 +495,11 @@ void KexiTableDesignerView::slotTogglePrimaryKey()
 /*	CommandGroup *setPrimaryKeyCommand;
 	if (isSet) {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Set primary key for field \"%1\"")
-			.arg(set["name"].value().toString()) );
+			.tqarg(set["name"].value().toString()) );
 	}
 	else {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Unset primary key for field \"%1\"")
-			.arg(set["name"].value().toString()) );
+			.tqarg(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\"")
-						.arg(oldName).arg(propertySetForItem->property("name").value().toString())
-						.arg(oldCaption).arg(newValue.toString() ));
+						.tqarg(oldName).tqarg(propertySetForItem->property("name").value().toString())
+						.tqarg(oldCaption).tqarg(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\"")
-				.arg(set["name"].value().toString()).arg( KexiDB::Field::typeName( fieldType ) ) );
+				.tqarg(set["name"].value().toString()).tqarg( 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\"").arg(set["name"].value().toString()) );
+					i18n("Assign autonumber for field \"%1\"").tqarg(set["name"].value().toString()) );
 				toplevelCommand = setAutonumberCommand;
 				d->setPropertyValueIfNeeded( set, "autoIncrement", TQVariant(true,1), setAutonumberCommand );
 			}
 			else {
 				setAutonumberCommand = new CommandGroup(
-					i18n("Remove autonumber from field \"%1\"").arg(set["name"].value().toString()) );
+					i18n("Remove autonumber from field \"%1\"").tqarg(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\"").arg(property.caption()).arg(set["name"].value().toString()) );
+			i18n("Set \"%1\" property for field \"%2\"").tqarg(property.caption()).tqarg(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\"").arg(set["name"].value().toString())
-			.arg(typeName) );
+			i18n("Change type for field \"%1\" to \"%2\"").tqarg(set["name"].value().toString())
+			.tqarg(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\"")
-					.arg(set["name"].value().toString()) );
+					.tqarg(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\"")
-					.arg(set["name"].value().toString()) );
+					.tqarg(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 repaint)
+	KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
 {
 	Q_UNUSED(result)
-	Q_UNUSED(repaint)
+	Q_UNUSED(tqrepaint)
 	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>").arg(schema.name()),
+				"to cancel saving table design.</p>").tqarg(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.arg(idIndex==1?TQString() : TQString::number(idIndex))
+							== pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex))
 						|| (*set)["caption"].value().toString()
-							== pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex)))
+							== pkFieldCaption.tqarg(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.arg(idIndex==1?TQString() : TQString::number(idIndex));
-				pkFieldCaption = pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldName = pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldCaption = pkFieldCaption.tqarg(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...")
-						.arg(i+1) << endl;
+						.tqarg(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'")
-				.arg((*b)["name"].value().toString()) << endl;
+				.tqarg((*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.")
-				.arg((*b)["name"].value().toString()) );
+				.tqarg((*b)["name"].value().toString()) );
 		}
 		res = cancelled;
 	}
@@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData
 		KexiDB::Connection *conn = mainWin()->project()->dbConnection();
 		res = conn->createTable(tempData()->table);
 		if (res!=true)
-			parentDialog()->setStatus(conn, "");
+			parentDialog()->settqStatus(conn, "");
 	}
 
 	if (res == true) {
@@ -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:")
-			.arg(tempData()->table->name()));
+			.tqarg(tempData()->table->name()));
 	}
 
 	if (res == true) {
@@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 
 			res = conn->alterTable(*tempData()->table, *newTable);
 			if (res != true)
-				parentDialog()->setStatus(conn, "");
+				parentDialog()->settqStatus(conn, "");
 		}
 		else {
 			KexiDB::AlterTableHandler::ExecutionArguments args;
@@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 				<< res.toString() << endl;
 			if (true != res) {
 				alterTableHandler->debugError();
-				parentDialog()->setStatus(alterTableHandler, "");
+				parentDialog()->settqStatus(alterTableHandler, "");
 			}
 		}
 	}
@@ -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\"").arg(captionOrName) );
+		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").tqarg(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 5b9d02159..13ce495d5 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 repaint);
+//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool tqrepaint);
 
 		//! Called before row deleting in tableview.
-		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
+		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
 
 		/*! 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/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index 30bdb557d..c546327b6 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -20,7 +20,7 @@
 #include "kexitabledesignerview_p.h"
 #include "kexitabledesignerview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqsplitter.h>
 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 55c8be5df..4efd237aa 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:")
-			.arg(sch->name()));
+			.tqarg(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>").arg(it.current()->listenerInfoString);
+			openedObjectsStr += TQString("<li>%1</li>").tqarg(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 5a1b4ebd8..8c13ad399 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 765457afc..6155eb63d 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -25,7 +25,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kdebug.h>
 
@@ -56,7 +56,7 @@ KexiProject* prj = 0;
 void showError(const TQString& msg)
 {
 	TQString msg_(msg);
-	msg_.prepend(TQString("Error at line %1: ").arg(testLineNumber));
+	msg_.prepend(TQString("Error at line %1: ").tqarg(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'")
-			.arg(testFileLine[0]).arg(expectedCommandName));
+			.tqarg(testFileLine[0]).tqarg(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")
-			.arg(testFileLine.count()).arg(testFileLine[0]).arg(expectedNumberOfItems);
+			.tqarg(testFileLine.count()).tqarg(testFileLine[0]).tqarg(expectedNumberOfItems);
 		if (optionalNumberOfItems>0)
-			msg.append( TQString(" or %1").arg(optionalNumberOfItems) );
+			msg.append( TQString(" or %1").tqarg(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'").arg(name_));
+	showError(TQString("Invalid type '%1'").tqarg(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'").arg(argument));
+			showError(TQString("Invalid value '%1'").tqarg(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'")
-				.arg(propertyName).arg(propertyValueString).arg(propertyType) );
+				.tqarg(propertyName).tqarg(propertyValueString).tqarg(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")
-			.arg(~result ? "cancelled" : "false") );
+			.tqarg(~result ? "cancelled" : "false") );
 		return false;
 	}
 	schemaDebugString.remove(TQRegExp(",$")); //no need to have "," at the end of lines
@@ -296,9 +296,9 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getSchemaDump(dlg, schemaDebugString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::clipboard()->setText( schemaDebugString );
+		TQApplication::tqclipboard()->setText( schemaDebugString );
 	else
-		kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name())
+		kdDebug() << TQString("Schema for '%1' table:\n").tqarg(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").arg(dlg->partItem()->name())
-		.arg(result ? "OK" : "Failed") << endl;
+	kdDebug() << TQString("Schema check for table '%1': %2").tqarg(dlg->partItem()->name())
+		.tqarg(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.").arg(dlg->partItem()->name()) );
+		showError( TQString("Computing simplified actions for table '%1'  failed.").tqarg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -379,9 +379,9 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getActionsDump(dlg, actionsDebugString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::clipboard()->setText( actionsDebugString );
+		TQApplication::tqclipboard()->setText( actionsDebugString );
 	else
-		kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name())
+		kdDebug() << TQString("Simplified actions for altering table '%1':\n").tqarg(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").arg(dlg->partItem()->name())
-		.arg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Actions check for table '%1': %2").tqarg(dlg->partItem()->name())
+		.tqarg(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.").arg(dlg->partItem()->name()) );
+		showError( TQString("Saving design of table '%1' failed.").tqarg(dlg->partItem()->name()) );
 		return false;
 	}
 	return true;
@@ -439,9 +439,9 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard)
 	if (!getTableDataDump(dlg, dataString))
 		return false;
 	if (copyToClipboard)
-		TQApplication::clipboard()->setText( dataString );
+		TQApplication::tqclipboard()->setText( dataString );
 	else
-		kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl;
+		kdDebug() << TQString("Contents of table '%1':\n").tqarg(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").arg(dlg->partItem()->name())
-			.arg(result ? "OK" : "Failed") << endl;
+		kdDebug() << TQString("Table '%1' contents: %2").tqarg(dlg->partItem()->name())
+			.tqarg(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").arg(name)
-		.arg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
+	kdDebug() << TQString("Closing window for table '%1': %2").tqarg(name)
+		.tqarg(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'").arg(tableName));
+		showError(TQString("No such table '%1'").tqarg(tableName));
 		return false;
 	}
 	bool openingCancelled;
 	KexiDialogBase* dlg = win->openObject(item, Kexi::DesignViewMode, openingCancelled);
 	if (!dlg) {
-		showError(TQString("Could not open table '%1'").arg(item->name()));
+		showError(TQString("Could not open table '%1'").tqarg(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'").arg(command));
+					showError(TQString("Invalid variable initialization '%1'").tqarg(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.").arg(testLineNumber) << endl;
+			kdDebug() << TQString("Test STOPPED at line %1.").tqarg(testLineNumber) << endl;
 			break;
 		}
 		else if (command=="closeWindow") {
@@ -640,7 +640,7 @@ tristate AlterTableTester::run(bool &closeAppRequested)
 			break;
 		}
 		else {
-			showError( TQString("No such command '%1'").arg(command) );
+			showError( TQString("No such command '%1'").tqarg(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.").arg(testFilename) << endl;
+		kdWarning() << TQString("Opening test file %1 failed.").tqarg(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.").arg(testFilename) << endl;
+			kdWarning() << TQString("Running test for file '%1' failed.").tqarg(testFilename) << endl;
 		return quit(res==false ? 1 : 0);
 	}
-	kdDebug() << TQString("Tests from file '%1': OK").arg(testFilename) << endl;
+	kdDebug() << TQString("Tests from file '%1': OK").tqarg(testFilename) << endl;
 	result = (closeOnFinish || closeAppRequested) ? 0 : tqApp->exec();
 	quit(result);
 	return result;
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index bf5fcd32e..0f2248e65 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -180,7 +180,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -222,7 +222,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -231,7 +231,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -279,7 +279,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
diff --git a/kexi/tests/newapi/dr_prop_test.h b/kexi/tests/newapi/dr_prop_test.h
index 2cbee8b2f..d7bfd5b30 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:").arg(names.count()) << endl;
+	kdDebug() << TQString("%1 properties found:").tqarg(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 9eaff2ab6..d02dbc9be 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.").arg(test_name.data()) << endl;
+		kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(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.").arg(minargs) << endl;
+		kdDebug() << TQString("Not enough args (%1 required). Use --help.").tqarg(minargs) << endl;
 		RETURN(1);
 	}
 	
diff --git a/kexi/tests/newapi/parser_test.h b/kexi/tests/newapi/parser_test.h
index d02017ecc..90c25d7c4 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").arg(err.error())
-			.arg(err.type()).arg(err.at()) << endl;
+		kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").tqarg(err.error())
+			.tqarg(err.type()).tqarg(err.at()) << endl;
 		r = 1;
 	}
 	delete q;
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index c497903e7..1ada79b17 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -22,7 +22,7 @@
  *   OTHER DEALINGS IN THE SOFTWARE.                                       *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index af893ddf4..4c279382d 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...").arg( part->instanceName() ));
+			m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( 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...").arg( part->instanceCaption() ));
+				m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( 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").arg( part->instanceCaption().lower() ));
+						i18n("Create object: %1").tqarg( part->instanceCaption().lower() ));
 					TQWhatsThis::add(m_newObjectToolButton, 
-						i18n("Creates a new object: %1").arg( part->instanceCaption().lower() ));
+						i18n("Creates a new object: %1").tqarg( part->instanceCaption().lower() ));
 				}
 			}
 		} else {
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index 28c4521ae..ff277e7da 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicharencodingcombobox.h"
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
  : KComboBox( parent, "KexiCharacterEncodingComboBox" )
  , m_defaultEncodingAdded(false)
 {
-	TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
+	TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding()));
 	TQString defaultEncodingDescriptiveName;
 
 	TQString _selectedEncoding = selectedEncoding;
 	if (_selectedEncoding.isEmpty())
-		_selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+		_selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
 
 	TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
 	TQStringList::ConstIterator it = descEncodings.constBegin();
@@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
 	if (!defaultEncodingDescriptiveName.isEmpty()) {
 		m_defaultEncodingAdded = true;
 		TQString desc = i18n("Text encoding: Default", "Default: %1")
-			.arg(defaultEncodingDescriptiveName);
+			.tqarg(defaultEncodingDescriptiveName);
 		insertItem( desc, 0 );
 		if (_selectedEncoding==defaultEncoding) {
 			setCurrentItem(0);
@@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
 TQString KexiCharacterEncodingComboBox::selectedEncoding() const
 {
 	if (defaultEncodingSelected()) {
-		return TQString::fromLatin1(KGlobal::locale()->encoding());
+		return TQString::tqfromLatin1(KGlobal::locale()->encoding());
 	}
 	else {
 		return KGlobal::charsets()->encodingForName( currentText() );
diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index 2cdd0bfc0..20e85b04f 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -50,7 +50,7 @@ void KexiImagePropertyEdit::selectPixmap()
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
 	TQString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
 	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
@@ -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\".").arg(string).arg(identifier) << endl;
+			"String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl;
 	StringEdit::setValue( identifier, emitChange );
 }
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index f73b059ec..113f8be47 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -23,7 +23,7 @@
 #include <utils/kexisharedactionclient.h>
 #include <core/keximainwindow.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kpopupmenu.h>
 
@@ -59,9 +59,9 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 	TQVBoxLayout *box = new TQVBoxLayout(this);
 	box->addWidget(m_internalView);
 
-	setMinimumSize(m_internalView->minimumSizeHint().width(), 
-		m_internalView->minimumSizeHint().height());
-	resize( preferredSizeHint( m_internalView->sizeHint() ) );
+	setMinimumSize(m_internalView->tqminimumSizeHint().width(), 
+		m_internalView->tqminimumSizeHint().height());
+	resize( preferredSizeHint( m_internalView->tqsizeHint() ) );
 	setFocusProxy(m_internalView);
 	
 	if (!noDataAware) {
@@ -165,14 +165,14 @@ TQWidget* KexiDataAwareView::mainWidget()
 	return m_internalView;
 }
 
-TQSize KexiDataAwareView::minimumSizeHint() const
+TQSize KexiDataAwareView::tqminimumSizeHint() const
 {
-	return m_internalView ? m_internalView->minimumSizeHint() : TQSize(0,0);//KexiViewBase::minimumSizeHint();
+	return m_internalView ? m_internalView->tqminimumSizeHint() : TQSize(0,0);//KexiViewBase::tqminimumSizeHint();
 }
 
-TQSize KexiDataAwareView::sizeHint() const
+TQSize KexiDataAwareView::tqsizeHint() const
 {
-	return m_internalView ? m_internalView->sizeHint() : TQSize(0,0);//KexiViewBase::sizeHint();
+	return m_internalView ? m_internalView->tqsizeHint() : TQSize(0,0);//KexiViewBase::tqsizeHint();
 }
 
 void KexiDataAwareView::updateActions(bool activated)
@@ -241,7 +241,7 @@ void KexiDataAwareView::slotCellSelected(int /*col*/, int row)
 
 void KexiDataAwareView::deleteAllRows()
 {
-	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*repaint*/);
+	m_dataAwareObject->deleteAllRows(true/*ask*/, true/*tqrepaint*/);
 }
 
 void KexiDataAwareView::deleteCurrentRow()
diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 8a787bd72..5cc76e974 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -49,9 +49,9 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 
 		TQWidget* mainWidget();
 
-		virtual TQSize minimumSizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 		
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 		
 		KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; }
 
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index db75e0106..09680b148 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -20,7 +20,7 @@
 */
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kiconloader.h>
@@ -42,10 +42,10 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiTableView *view;
 	if (dbAware)
 		view = new KexiDataTableView(this, 
-			TQString("%1_datatableview").arg(name ? name : "KexiDataTableView").latin1());
+			TQString("%1_datatableview").tqarg(name ? name : "KexiDataTableView").latin1());
 	else
 		view = new KexiTableView(0, this, 
-			TQString("%1_tableview").arg(name ? name : "KexiTableView").latin1());
+			TQString("%1_tableview").tqarg(name ? name : "KexiTableView").latin1());
 
 	KexiDataAwareView::init( view, view, view );
 }
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index 00918d5bc..78b67c8d6 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -95,7 +95,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 	hbox->addWidget( d->btnSaveChanges );
 	hbox->addSpacing( KDialogBase::spacingHint() );
 	TQWidget::setTabOrder(titleEdit, d->btnSaveChanges);
-	d->btnSaveChanges->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnSaveChanges->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	d->btnTestConnection = new KPushButton(KGuiItem(i18n("&Test Connection"), "", 
 		i18n("Test database connection"), 
@@ -103,7 +103,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 		frmBottom, "testConnection");
 	hbox->addWidget( d->btnTestConnection );
 	TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection);
-	d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	d->btnTestConnection->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
 	connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) );
 	connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) );
@@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
  : KTabWidget( parent, name )
 {
 	mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
-	mainWidget->layout()->setMargin(KDialog::marginHint());
+	mainWidget->tqlayout()->setMargin(KDialog::marginHint());
 	addTab( mainWidget, i18n("Parameters") );
 
 //	TQVBox *page2 = new TQVBox(this);
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index d121f1b7c..6dd4fbf8d 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>331</height>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -111,7 +111,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>90</width>
                             <height>20</height>
@@ -337,7 +337,7 @@
                     <property name="text">
                         <string>&amp;Title (optional):</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -356,7 +356,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32</width>
                             <height>32767</height>
@@ -395,7 +395,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -411,7 +411,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 46d2dfac1..f1f161deb 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -62,7 +62,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>129</width>
                             <height>20</height>
@@ -125,7 +125,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index d8cead894..88b72596d 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
@@ -37,7 +37,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 	KexiDSPixmap *pic = new KexiDSPixmap(this);
 
 	TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this);
-	lText->setAlignment(AlignTop | AlignLeft | WordBreak);
+	lText->tqsetAlignment(AlignTop | AlignLeft | WordBreak);
 	TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this);
 	connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool)));
 	useWizard->setChecked(true);
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 6d3848cee..07627f32c 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -23,7 +23,7 @@
 
 #include <keximainwindow.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	: KexiViewBase(mainWin, parent, name)
 	, d(new KexiEditorPrivate())
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
 	d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
 	//adjust font
@@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 #else
 	TQFrame *fr = new TQFrame(this);
 	fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel);
-	layout->addWidget(fr);
-	layout = new TQVBoxLayout(fr);
-	layout->setMargin( 2 );
+	tqlayout->addWidget(fr);
+	tqlayout = new TQVBoxLayout(fr);
+	tqlayout->setMargin( 2 );
 
 	d->doc =  KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr));
 	if (!d->doc)
@@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 	KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view));
 	d->view->installEventFilter(this);
 
-	layout->addWidget(d->view);
+	tqlayout->addWidget(d->view);
 	setViewWidget(d->view, true/*focus*/);
 	d->view->show();
 }
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index cc1845abb..317950490 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldcombobox.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -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)").arg(index).arg(count()-1) << endl;
+			"out of range (0..%2)").tqarg(index).tqarg(count()-1) << endl;
 		index = -1;
 	}
 	if (index<=0) {
@@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e )
 {
 	KComboBox::focusOutEvent( e );
 	// accept changes if the focus is moved
-	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
+	if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) //(a check needed because drop-down listbox also causes a focusout)
 		slotReturnPressed(currentText());
 }
 
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 406bcb8ad..532ec0574 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -20,7 +20,7 @@
 #include "kexifieldlistview.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -117,7 +117,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema)
 }
 
 #if 0
-TQSize KexiFieldListView::sizeHint()
+TQSize KexiFieldListView::tqsizeHint()
 {
 	TQFontMetrics fm(font());
 
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index 536824365..50d94dbac 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -60,7 +60,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
 		TQStringList selectedFieldNames() const;
 
 //		void setReadOnly(bool);
-//		virtual TQSize sizeHint();
+//		virtual TQSize tqsizeHint();
 
 	signals:
 		/*! Emitted when a field is double clicked */
diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp
index 89225823c..e41681ab3 100644
--- a/kexi/widget/kexifilterdlg.cpp
+++ b/kexi/widget/kexifilterdlg.cpp
@@ -19,7 +19,7 @@
 
 #include <tqlistview.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
 
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index c6ff117a0..059bf0803 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -88,7 +88,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -110,7 +110,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index e3576a172..02b050b84 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
@@ -40,7 +40,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
 	hlyr->addWidget(m_objectIconLabel);
 	m_objectNameLabel = new TQLabel(this);
 	m_objectNameLabel->setMargin(2);
-	m_objectNameLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	m_objectNameLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	hlyr->addWidget(m_objectNameLabel);
 }
 
@@ -76,7 +76,7 @@ void KexiObjectInfoLabel::updateName()
 	if (txt.isEmpty())
 		txt = m_objectName;
 	else if (!m_objectName.isEmpty())
-		txt += TQString(" \"%1\"").arg(m_objectName);
+		txt += TQString(" \"%1\"").tqarg(m_objectName);
 	m_objectNameLabel->setText(txt);
 }
 
@@ -125,7 +125,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	vlyr->addWidget(d->objectIcon);
 	d->objectClassName = new TQLabel(this);
 	d->objectClassName->setMargin(2);
-	d->objectClassName->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->objectClassName->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	vlyr->addWidget(d->objectClassName);*/
 
 	d->editor = new KoProperty::Editor(this, true /*AutoSync*/, "propeditor");
@@ -146,14 +146,14 @@ KexiPropertyEditorView::~KexiPropertyEditorView()
 	delete d;
 }
 
-TQSize KexiPropertyEditorView::sizeHint() const
+TQSize KexiPropertyEditorView::tqsizeHint() const
 {
-	return TQSize(200,200);//m_editor->sizeHint();
+	return TQSize(200,200);//m_editor->tqsizeHint();
 }
 
-TQSize KexiPropertyEditorView::minimumSizeHint() const
+TQSize KexiPropertyEditorView::tqminimumSizeHint() const
 {
-	return TQSize(200,200);//m_editor->sizeHint();
+	return TQSize(200,200);//m_editor->tqsizeHint();
 }
 
 /*void KexiPropertyEditorView::setGeometry ( const TQRect &r )
diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 008e6759d..66cc0ac7e 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -99,8 +99,8 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
 			KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, 
 			const TQString& textToDisplayForNullSet = TQString());
 
-		virtual TQSize sizeHint() const;
-		virtual TQSize minimumSizeHint() const;
+		virtual TQSize tqsizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 		KoProperty::Editor *editor() const;
 
 //	public slots:
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index ba4c8f9e5..db9dbb14f 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -52,8 +52,8 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
  , m_scrollViewNavPanel(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(colorGroup().mid());
-	TQColor fc = palette().active().foreground(),
+	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	TQColor fc = tqpalette().active().foreground(),
 		bc = viewport()->paletteBackgroundColor();
 	m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
 //	m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, 
@@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 //! @todo allow to hide navigator
 		updateScrollBars();
 		m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav");
-		m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+		m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 	}
 }
 
@@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize()
 			change = true;
 		}
 		if (change) {
-	repaint();
-	viewport()->repaint();
+	tqrepaint();
+	viewport()->tqrepaint();
 	repaintContents();
 	updateContents(0, 0, 2000,2000);
-	clipper()->repaint();
+	clipper()->tqrepaint();
 
 			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->geometry().right() + 10));
-			tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10));
+			tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10));
+			tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10));
 		}
 		delete list;
 
@@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in
 		//draw right and bottom borders
 		const int wx = childX(m_widget);
 		const int wy = childY(m_widget);
-		p->setPen(palette().active().foreground());
+		p->setPen(tqpalette().active().foreground());
 		p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height());
 		p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height());
 //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 0c1b9f76e..7e6989f36 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -22,7 +22,7 @@
 #include <kexiutils/utils.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqtooltip.h>
 
@@ -65,7 +65,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o,
 	d->lyr->setAutoAdd(true);
 	d->lbl_b = new TQHBox(this);
 	d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b);
-	d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+	d->lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
 	d->lbl->setFocusPolicy(TQ_StrongFocus);
 	d->lbl->installEventFilter(this);
 	installEventFilter(this);
@@ -83,7 +83,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 	KPushButton *btn = new KPushButton(d->lbl_b);
 	btn->setFlat(true);
 	btn->setFocusPolicy(TQ_NoFocus);
-	btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	if (receiver && member) {
 		connect(btn, TQT_SIGNAL(clicked()), receiver, member);
 	}
@@ -113,19 +113,19 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e )
 
 void KexiSectionHeader::slotFocus(bool in)
 {
-	in = in || focusWidget()==this;
+	in = in || tqfocusWidget()==this;
 	d->lbl->setPaletteBackgroundColor( 
-		in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) );
+		in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) );
 	d->lbl->setPaletteForegroundColor( 
-		in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) );
+		in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) );
 }
 
-TQSize KexiSectionHeader::sizeHint() const
+TQSize KexiSectionHeader::tqsizeHint() const
 {
 	if (!d->lyr->view)
-		return TQWidget::sizeHint();
-	TQSize s = d->lyr->view->sizeHint();
-	return TQSize(s.width(), d->lbl->sizeHint().height() + s.height());
+		return TQWidget::tqsizeHint();
+	TQSize s = d->lyr->view->tqsizeHint();
+	return TQSize(s.width(), d->lbl->tqsizeHint().height() + s.height());
 }
 
 /*void KexiSectionHeader::setFocus()
diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h
index a8d08a450..9ed31a35e 100644
--- a/kexi/widget/kexisectionheader.h
+++ b/kexi/widget/kexisectionheader.h
@@ -41,7 +41,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	public slots:
 		void slotFocus(bool in);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index a2ccf3184..81bab0c62 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -70,8 +70,8 @@ void KexiSmallToolButton::updateAction()
 
 void KexiSmallToolButton::init()
 {
-	setPaletteBackgroundColor(palette().active().background());
-	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	setPaletteBackgroundColor(tqpalette().active().background());
+	tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	TQFont f(KGlobalSettings::toolBarFont());
 	f.setPixelSize(Kexi::smallFont().pixelSize());
 	setFont(f);
@@ -125,7 +125,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
 		if (isEnabled())
 			arrowFlags |= TQStyle::Style_Enabled;
 		tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
-			TQRect(width()-7, height()-7, 5, 5), colorGroup(),
+			TQRect(width()-7, height()-7, 5, 5), tqcolorGroup(),
 			arrowFlags, TQStyleOption() );
 	}
 }
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index eade3cdd3..0aeddca46 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstringlist.h>
 #include <tqtoolbutton.h>
@@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Name input
 	TQLabel *name = new TQLabel(i18n("&Name:"), frame);
 	l->addWidget(name, 0, 0);
-	name->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	m_nameInput = new KLineEdit("kexi", frame);
 	l->addWidget(m_nameInput, 0, 1);
 	name->setBuddy(m_nameInput);
@@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	// Choose size
 	TQLabel *size = new TQLabel(i18n("&Size:"), frame);
 	l->addWidget(size, 1, 0);
-	size->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
+	size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter);
 
 	KComboBox *combo = new KComboBox(frame);
 	l->addWidget(combo, 1, 1);
@@ -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").arg(collection->collectionName()), Close, Close, false)
+	i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false)
 {
 	m_collection = collection;
 	TQFrame *frame = makeMainWidget();
@@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	setInitialSize(TQSize(400, 200), true);
 
 	//// Setup the icon toolbar /////////////////
-	TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3);
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3);
 	TQToolButton *newItemPath = new TQToolButton(frame);
 	newItemPath->setIconSet(BarIconSet("fileopen"));
 	newItemPath->setTextLabel(i18n("&Add File"), true);
-	vlayout->addWidget(newItemPath);
+	vtqlayout->addWidget(newItemPath);
 	m_buttons.insert(BNewItemPath, newItemPath);
 	connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
 
 	TQToolButton *newItemName = new TQToolButton(frame);
 	newItemName->setIconSet(BarIconSet("icons"));
 	newItemName->setTextLabel(i18n("&Add an Icon"), true);
-	vlayout->addWidget(newItemName);
+	vtqlayout->addWidget(newItemName);
 	m_buttons.insert(BNewItemName, newItemName);
 	connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
 
 	TQToolButton *delItem = new TQToolButton(frame);
 	delItem->setIconSet(BarIconSet("edit_remove"));
 	delItem->setTextLabel(i18n("&Remove Selected Item"), true);
-	vlayout->addWidget(delItem);
+	vtqlayout->addWidget(delItem);
 	m_buttons.insert(BDelItem, delItem);
 	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
-	vlayout->addStretch();
+	vtqlayout->addStretch();
 
 	// Setup the iconView
 	m_iconView = new KIconView(frame, "pixcollection_iconView");
@@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem()
 
 	int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+
 		i18n("Do you want to remove item \"%1\" from collection \"%2\"?")
-		.arg(item->text()).arg(m_collection->collectionName()) + "</qt>");
+		.tqarg(item->text()).tqarg(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").arg(collection->collectionName()),
+: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()),
    User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection...")))
 {
 	m_collection = collection;
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index e3537aa51..18c19ef93 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 
 #include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqevent.h>
@@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 
 //	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
 
-	viewport()->setPaletteBackgroundColor(colorGroup().mid());
+	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
 	setFocusPolicy(TQ_WheelFocus);
 	setResizePolicy(Manual);
 /*MOVED TO KexiRelationDialog
@@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	invalidateActions();
 #endif
 
-	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
+	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
 }
 
 KexiRelationView::~KexiRelationView()
@@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
-		TQSize finalSize = c->size().expandedTo( c->sizeHint() );
+		TQSize finalSize = c->size().expandedTo( c->tqsizeHint() );
 		TQRect r = rect;
 		r.setSize( finalSize + TQSize(0,10) );
 		moveChild( c, rect.left(), rect.top() );
 		//we're doing this instead of setGeometry(rect)
 		//because the geomenty might be saved on other system with bigger fonts :)
-		c->resize(c->sizeHint());
+		c->resize(c->tqsizeHint());
 //		c->setGeometry(r);
 //TODO
 
@@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 	updateGeometry();
 	if (!rect.isValid()) {
 		c->updateGeometry();
-		c->resize(c->sizeHint());
+		c->resize(c->tqsizeHint());
 	}
 	int x, y;
 
@@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus()
 	emit tableViewGotFocus();
 }
 
-TQSize KexiRelationView::sizeHint() const
+TQSize KexiRelationView::tqsizeHint() const
 {
-	return TQSize(TQScrollView::sizeHint());//.width(), 600);
+	return TQSize(TQScrollView::tqsizeHint());//.width(), 600);
 }
 
 void KexiRelationView::clear()
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 33d988b92..6bc31b31e 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 geometry will be initialized.
+		 If \a rect is valid, table widget tqgeometry will be initialized.
 		 \return added table container or 0 on failure.
 		 */
 		KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, 
@@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; }
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		const ConnectionList* connections() const { return &m_connectionViews; }
 
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index fe3b5a53a..c0635c1b7 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection()
 void
 KexiRelationViewConnection::drawConnection(TQPainter *p)
 {
-	p->setPen(m_parent->palette().active().foreground());
+	p->setPen(m_parent->tqpalette().active().foreground());
 	int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX();
 	int sy = m_masterTable->globalY(m_masterField);
 	int rx = m_detailsTable->x() + m_parent->contentsX();
@@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, rx - 4, ry - 3);
 		pa.setPoint(1, rx - 4, ry + 3);
 		pa.setPoint(2, rx - 1, ry);
-		p->drawPolygon(pa, true);
+		p->tqdrawPolygon(pa, true);
 		
 		//master side
 		p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1);
@@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p)
 		pa.setPoint(0, lx + 3, ry - 3);
 		pa.setPoint(1, lx + 3, ry + 3);
 		pa.setPoint(2, lx, ry);
-		p->drawPolygon(pa, true);
+		p->tqdrawPolygon(pa, true);
 		
 //		p->drawLine(lx, ry, lx + 8, ry);
 //		p->drawPoint(lx + 1, ry - 1);
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 5de32b91f..55440da43 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcursor.h>
@@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this);
 
 	m_tableHeader->unsetFocus();
-	m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+	m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 	lyr->addWidget(m_tableHeader);
 	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
 	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
-	m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+	m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 	
-	m_tableView->setMaximumSize( m_tableView->sizeHint() );
+	m_tableView->setMaximumSize( m_tableView->tqsizeHint() );
 	
-//	m_tableView->resize( m_tableView->sizeHint() );
+//	m_tableView->resize( m_tableView->tqsizeHint() );
 	lyr->addWidget(m_tableView, 0);
 	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
 	connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
@@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field)
 }
 
 #if 0//js
-TQSize KexiRelationViewTableContainer::sizeHint()
+TQSize KexiRelationViewTableContainer::tqsizeHint()
 {
 #ifdef TQ_WS_WIN
-	TQSize s = m_tableView->sizeHint()
+	TQSize s = m_tableView->tqsizeHint()
 		+ TQSize(  2 * 5 , m_tableHeader->height() + 2 * 5 );
 #else
-	TQSize s = m_tableView->sizeHint();
+	TQSize s = m_tableView->tqsizeHint();
 	s.setWidth(s.width() + 4);
 	s.setHeight(m_tableHeader->height() + s.height());
 #endif
@@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus()
 	m_tableView->setPalette(p);*/
 
 	raise();
-	repaint();
+	tqrepaint();
 	emit gotFocus();
 }
 
@@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus()
 	m_tableView->setPalette(p);*/
 	
 	clearFocus();
-	repaint();
+	tqrepaint();
 }
 
 
@@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable()
 {
 }
 
-TQSize KexiRelationViewTable::sizeHint() const
+TQSize KexiRelationViewTable::tqsizeHint() const
 {
 	TQFontMetrics fm(fontMetrics());
 
@@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item)
 	TQListViewItem *i = findItem(item, 0);
 	if (!i)
 		return -1;
-	int y = itemRect(i).y() + (itemRect(i).height() / 2);
+	int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2);
 	if (contentsY() > itemPos(i))
 		y = 0;
 	else if (y == 0)
@@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+		tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
-	return itemRect(item);
+	return tqitemRect(item);
 }
 
 #include "kexirelationviewtable.moc"
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 6578cdd53..5c622dad1 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView
 //		KexiDB::TableSchema *table() const { return m_table; };
 		int globalY(const TQString &item);
 //		void setReadOnly(bool);
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	signals:
 		void tableScrolling();
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 0ff65f385..4b9521637 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -21,7 +21,7 @@
 
 #include "kexirelationwidget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
@@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion);
 	hlyr->addWidget(lbl);
 	hlyr->addWidget(m_tableCombo);
-	m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
+	m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred));
 	fillTablesCombo();
 
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
@@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable()
 		Kexi::DesignViewMode, openingCancelled);
 }
 
-TQSize KexiRelationWidget::sizeHint() const
+TQSize KexiRelationWidget::tqsizeHint() const
 {
-	return m_relationView->sizeHint();
+	return m_relationView->tqsizeHint();
 }
 
 void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table)
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 6899a434a..39ac549a9 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 
 //		void openTable(KexiDB::TableSchema* table, bool designMode);
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		/*! Used to add newly created object information to the combo box. */
 		void objectCreated(const TQCString &mime, const TQCString& name);
@@ -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 rgeometry will be initialized.
+		 If \a rect is valid, table widget rtqgeometry will be initialized.
 		 */
 		void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect());
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 2700477a3..7ad76c341 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -25,8 +25,8 @@
 #include <tqdatastream.h>
 #include <tqfile.h>
 #include <tqpopupmenu.h>
-#include <textedit.h>
-#include <layout.h>
+#include <tqtextedit.h>
+#include <tqlayout.h>
 #include <tqstatusbar.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqbuffer.h>
 
 #include <kdebug.h>
@@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data)
 	TQPixmap pixmap;
 	if (!pixmap.loadFromData(data))
 		return;
-	tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
+	tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
 }
 
 void KexiBlobTableEdit::handlePasteAction()
 {
 	if (isReadOnly())
 		return;
-	TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
+	TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
 	TQByteArray ba;
 	TQBuffer buffer( ba );
 	buffer.open( IO_WriteOnly );
@@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	s = TQMIN( h-3, s );
 	s = TQMIN( w-3, s );//avoid too large box
 	TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-	p->setPen(TQPen(colorGroup().text(), 1));
+	p->setPen(TQPen(tqcolorGroup().text(), 1));
 	p->drawRect(r);
 	if (val.asBool()) {
 		p->drawLine(r.x(), r.y(), r.right(), r.bottom());
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index 950d19b73..8f199b5d1 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria
 		s = TQMIN( h-3, s );
 		s = TQMIN( w-3, s );//avoid too large box
 		TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s);
-//already set ouotside:		p->setPen(TQPen(colorGroup().text(), 1));
+//already set ouotside:		p->setPen(TQPen(tqcolorGroup().text(), 1));
 		p->drawRect(r);
 		if (val.isNull()) { // && !field()->isNotNull()) {
 			p->drawText( r, TQt::AlignCenter, "?" );
@@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
 	if (actionName=="edit_paste") {
 		emit editRequested();
 		bool ok;
-		const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
+		const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
 		if (ok) {
 			m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1);
 		}
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index be2f81bee..89ba63cf9 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 5e74a20e5..6a2feec87 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 
 /*! @internal
@@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			a.rowHighlightingEnabled = true;
 			a.rowMouseOverHighlightingEnabled = true;
 			a.persistentSelections = false;
-			a.rowMouseOverHighlightingColor = colorGroup().highlight();
-			a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText();
+			a.rowMouseOverHighlightingColor = tqcolorGroup().highlight();
+			a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText();
 			a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor;
 			a.gridEnabled = false;
 			setAppearance(a);
@@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView
 			setContextMenuEnabled( false );
 			setScrollbarToolTipsEnabled( false );
 			installEventFilter(this);
-			setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() );
+			setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() );
 		}
 		virtual void setData( KexiTableViewData *data, bool owner = true )
 			{ KexiTableView::setData( data, owner ); }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 24c4c38fe..3ae979744 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -18,12 +18,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstyle.h>
 #include <tqwindowsstyle.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "kexicomboboxtableedit.h"
 #include <widget/utils/kexicomboboxdropdownbutton.h>
@@ -80,11 +80,11 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 //	m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_lineedit->setLineWidth( 1 );
 //	if (f.isNumericType()) {
-//		m_lineedit->setAlignment(AlignRight);
+//		m_lineedit->tqsetAlignment(AlignRight);
 //	}
 //	setView( m_lineedit );
 
-//	layout->addWidget(m_view);
+//	tqlayout->addWidget(m_view);
 //	m_combo->setEditable( true );
 //	m_combo->clear();
 //	m_combo->insertStringList(f.enumHints());
@@ -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->geometry().topLeft()), 
-			d->button->mapToGlobal(d->button->geometry().bottomRight()));
+		TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), 
+			d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
 		if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
 			m_mouseBtnPressedWhenPopupVisible = true;
 		}
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
 			m_lineedit->clear();
 		}
 //! @todo does not work with BLOBs!
-		setValueInInternalEditor( tqApp->clipboard()->text() );
+		setValueInInternalEditor( tqApp->tqclipboard()->text() );
 	}
 	else
 		KexiInputTableEdit::handleAction(actionName);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index ce0b76958..79613d9db 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface()
 	m_scrollBarTip->setPalette(TQToolTip::palette());
 	m_scrollBarTip->setMargin(2);
 	m_scrollBarTip->setIndent(0);
-	m_scrollBarTip->setAlignment(TQt::AlignCenter);
+	m_scrollBarTip->tqsetAlignment(TQt::AlignCenter);
 	m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 	m_scrollBarTip->setLineWidth(1);
 
@@ -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").arg(m_curCol)
-			.arg(m_curRow).arg(newcol).arg(newrow) << endl;
+		kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").tqarg(m_curCol)
+			.tqarg(m_curRow).tqarg(newcol).tqarg(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")
-					.arg(m_curRow).arg((ulong)itemAt(m_curRow)) << endl;
+					.tqarg(m_curRow).tqarg((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 repaint properly!!
+//TODO: still doesn't tqrepaint 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").arg(m_editor->columnInfo()->field->typeName())+"?", 
+						i18n("Error: %1").tqarg(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().arg(m_editor->columnInfo()->field->captionOrName())
-				msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
+//				msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
+				msg = Validator::msgColumnNotEmpty().tqarg(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().arg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().tqarg(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().arg(m_editor->columnInfo()->field->captionOrName())
-					msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName())
+//					msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName())
+					msg = Validator::msgColumnNotEmpty().tqarg(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 /*repaint*/);
+	m_data->insertRow(*newItem, row, true /*tqrepaint*/);
 
 	if (changeCurrentRow) {
 		//update iter...
@@ -1281,15 +1281,15 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row)
 	*/
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool repaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint)
 {
 	int row = m_data->findRef(item);
-	slotRowInserted( item, row, repaint );
+	slotRowInserted( item, row, tqrepaint );
 }
 
-void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool repaint)
+void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool tqrepaint)
 {
-	if (repaint && (int)row<rows()) {
+	if (tqrepaint && (int)row<rows()) {
 		updateWidgetContentsSize();
 
 /* updateAllVisibleRowsBelow() used instead
@@ -1317,7 +1317,7 @@ void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uin
 	}
 }
 
-tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
+tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint)
 {
 	if (!hasData())
 		return true;
@@ -1331,7 +1331,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 			tableName.append("\"");
 		}
 		if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(this),
-				i18n("Do you want to clear the contents of table %1?").arg(tableName),
+				i18n("Do you want to clear the contents of table %1?").tqarg(tableName),
 				0, KGuiItem(i18n("&Clear Contents")) ))
 			return cancelled;
 	}
@@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 	cancelRowEdit();
 //	acceptRowEdit();
 //	m_verticalHeader->clear();
-	const bool repaintLater = repaint && m_spreadSheetMode;
+	const bool repaintLater = tqrepaint && m_spreadSheetMode;
 	const int oldRows = rows();
 
-	bool res = m_data->deleteAllRows(repaint && !repaintLater);
+	bool res = m_data->deleteAllRows(tqrepaint && !repaintLater);
 
 	if (res) {
 		if (m_spreadSheetMode) {
@@ -1359,21 +1359,21 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint)
 //	m_verticalHeader->setCurrentRow(-1);
 
 //	d->pUpdateTimer->start(1,true);
-//	if (repaint)
-//		viewport()->repaint();
+//	if (tqrepaint)
+//		viewport()->tqrepaint();
 	return res;
 }
 
-void KexiDataAwareObjectInterface::clearColumns(bool repaint)
+void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint)
 {
 	cancelRowEdit();
 	m_data->clearInternal();
 
-	clearColumnsInternal(repaint);
+	clearColumnsInternal(tqrepaint);
 	updateIndicesForVisibleValues();
 
-	if (repaint)
-//		viewport()->repaint();
+	if (tqrepaint)
+//		viewport()->tqrepaint();
 //OK?
 		updateWidgetContents();
 
@@ -1393,7 +1393,7 @@ void KexiDataAwareObjectInterface::clearColumns(bool repaint)
 
 	m_verticalHeader->setCurrentRow(-1);
 
-	viewport()->repaint();
+	viewport()->tqrepaint();
 
 //	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 repaint)
+	KexiDB::ResultInfo* /*result*/, bool tqrepaint)
 {
-	if (repaint) {
+	if (tqrepaint) {
 		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 /*repaint*/)) {
+	if (!m_data->deleteRow(*item, true /*tqrepaint*/)) {
 		/*const int button =*/ 
 		showErrorMessageForResult( m_data->result() );
 //		if (KMessageBox::No == button) {
@@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c
 		if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
 			firstCharacter = -1;
 		}
-		else if (where.startsWith(stringValue, caseSensitive)) {
+		else if (where.tqstartsWith(stringValue, caseSensitive)) {
 			if (wholeWordsOnly) {
 				// If where.length() < stringValue.length(), true will be returned too - fine.
 				return !where.at( stringValue.length() ).isLetterOrNumber();
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 0fed82b66..389c1c742 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 repaint is true (the default). 
+		 Repaints widget if \a tqrepaint 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 repaint = true);
+		tristate deleteAllRows(bool ask = false, bool tqrepaint = 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 repaint is true. */
-		virtual void clearColumns(bool repaint = true);
+		 and its visible representation. Repaints widget if \a tqrepaint is true. */
+		virtual void clearColumns(bool tqrepaint = true);
 
 		/*! Called by clearColumns() to clear internals of the object.
 		 For example, KexiTableView removes contents of it's horizontal header. */
-		virtual void clearColumnsInternal(bool repaint) = 0;
+		virtual void clearColumnsInternal(bool tqrepaint) = 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 repaint);
+			bool tqrepaint);
 
-		//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
+		//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
 		virtual void slotRowDeleted();
 
-		//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
-		virtual void slotRowInserted(KexiTableItem *item, bool repaint);
+		//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
+		virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint);
 
 		//! Like above, not db-aware version
-		virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint);
+		virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint);
 
 		virtual void slotRowsDeleted( const TQValueList<int> & ) {}
 
@@ -675,7 +675,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void selectCellInternal() {}
 
 		/*! Used in KexiDataAwareObjectInterface::slotRowDeleted() 
-		 to repaint tow \a row and all visible below. 
+		 to tqrepaint 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 3b9fe3afb..257cf0aae 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const
 	return m_sets.size();
 }
 
-void KexiDataAwarePropertySet::clear(uint minimumSize)
+void KexiDataAwarePropertySet::clear(uint tqminimumSize)
 {
 	m_sets.clear();
-	m_sets.resize(TQMAX(minimumSize, MAX_FIELDS));
+	m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS));
 	m_view->setDirty(true);
 	m_view->propertySetSwitched();
 }
@@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows )
 }
 
 //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/)
-void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/)
+void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/)
 {
 	m_view->setDirty();
 
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index 8db82ba2a..e24fbd8a8 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 	public slots:
 		void removeCurrentPropertySet();
 
-		void clear(uint minimumSize = 0);
+		void clear(uint tqminimumSize = 0);
 
 		/*! Inserts \a set property set at \a row position.
 		 If there was a buffer at this position before, it will be destroyed.
@@ -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 repaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
 
 		//! 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 5a8cf2973..b68b47879 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -163,7 +163,7 @@ void
 KexiDateTableEdit::slotDateChanged(TQDate date)
 {
 	m_edit->setDate(date);
-	repaint();
+	tqrepaint();
 }
 
 void
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index 7d33b3547..35c599cc3 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -25,16 +25,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index d057f5177..1b834fe90 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -22,11 +22,11 @@
 
 #include <tqregexp.h>
 #include <tqevent.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqtooltip.h>
 
 #include <kglobal.h>
@@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit
 		{}
 	protected:
 		virtual void drawFrame ( TQPainter * p ) {
-			p->setPen( TQPen( colorGroup().text() ) );
+			p->setPen( TQPen( tqcolorGroup().text() ) );
 			TQRect r = rect();
 			p->moveTo( r.topLeft() );
 			p->lineTo( r.topRight() );
@@ -100,7 +100,7 @@ void KexiInputTableEdit::init()
 	m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit");
 	setViewWidget(m_lineedit);
 	if (align_right)
-		m_lineedit->setAlignment(AlignRight);
+		m_lineedit->tqsetAlignment(AlignRight);
 //	m_cview->setFrame(false);
 //	m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box );
 //	m_cview->setLineWidth( 1 );
@@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant&
 void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ )
 {
 	TQPainter p(this);
-	p.setPen( TQPen( colorGroup().text() ) );
+	p.setPen( TQPen( tqcolorGroup().text() ) );
 	p.drawRect( rect() );
 }
 
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index 68991f49f..e531b814a 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/field.h>
 #include <kexidb/utils.h>
 
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpainter.h>
 
 #include <kglobal.h>
@@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h)
 {
 	TQWidget::resize(w, h);
 	if (m_view) {
-		if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic
+		if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic
 			m_view->move(0,0);
 			m_view->resize(w, h);
 		}
diff --git a/kexi/widget/tableview/kexitableitem.cpp b/kexi/widget/tableview/kexitableitem.cpp
index d398dabb6..659e341ec 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)").arg(size());
+	TQString s = TQString("KexiTableItem (%1 items)").tqarg(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 eeb4e3789..4ed993cda 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -33,7 +33,7 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqstyle.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
@@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis
 			const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0;
 			//const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0;
 			//const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0;
-			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) {
+			if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
 				return i18n("Contains a pointer to the currently selected row");
 			}
-			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) {
+			else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) {
 				return i18n("Row navigator");
 //				return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin ));
 			}
@@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	setBackgroundMode(TQt::PaletteBackground);
 //	setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base));
 
-//	d->baseColor = colorGroup().base();
-//	d->textColor = colorGroup().text();
+//	d->baseColor = tqcolorGroup().base();
+//	d->textColor = tqcolorGroup().text();
 
 //	d->altColor = KGlobalSettings::alternateBackgroundColor();
 //	d->grayColor = TQColor(200,200,200);
@@ -240,21 +240,21 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	// Create headers
 	m_horizontalHeader = new KexiTableViewHeader(this, "topHeader");
-	m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
+	m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
 	m_horizontalHeader->setOrientation(Qt::Horizontal);
 	m_horizontalHeader->setTracking(false);
 	m_horizontalHeader->setMovingEnabled(false);
 	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int)));
 
 	m_verticalHeader = new KexiRecordMarker(this, "rm");
-	m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
+	m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
 	m_verticalHeader->setCellHeight(d->rowHeight);
 //	m_verticalHeader->setFixedWidth(d->rowHeight);
 	m_verticalHeader->setCurrentRow(-1);
 
 	setMargins(
-		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
-		m_horizontalHeader->sizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
+		m_horizontalHeader->tqsizeHint().height(), 0, 0);
 
 	setupNavigator();
 
@@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	
 //	horizontalScrollBar()->show();
 	updateScrollBars();
-//	resize(sizeHint());
+//	resize(tqsizeHint());
 //	updateContents();
 //	setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin());
 
@@ -333,7 +333,7 @@ void KexiTableView::setupNavigator()
 	
 	m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel");
 	m_navPanel->setRecordHandler(this);
-	m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
+	m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred);
 }
 
 void KexiTableView::initDataContents()
@@ -366,7 +366,7 @@ void KexiTableView::updateWidgetContentsSize()
 
 void KexiTableView::slotRowsDeleted( const TQValueList<int> &rows )
 {
-	viewport()->repaint();
+	viewport()->tqrepaint();
 	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 repaint)
+void KexiTableView::updateFonts(bool tqrepaint)
 {
 #ifdef TQ_WS_WIN
 	d->rowHeight = fontMetrics().lineSpacing() + 4;
@@ -399,15 +399,15 @@ void KexiTableView::updateFonts(bool repaint)
 //	if(d->rowHeight < 22)
 //		d->rowHeight = 22;
 	setMargins(
-		TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
-		m_horizontalHeader->sizeHint().height(), 0, 0);
+		TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
+		m_horizontalHeader->tqsizeHint().height(), 0, 0);
 //	setMargins(14, d->rowHeight, 0, 0);
 	m_verticalHeader->setCellHeight(d->rowHeight);
 
 	KexiDisplayUtils::initDisplayForAutonumberSign(d->autonumberSignDisplayParameters, this);
 	KexiDisplayUtils::initDisplayForDefaultValue(d->defaultValueDisplayParameters, this);
 
-	if (repaint)
+	if (tqrepaint)
 		updateContents();
 }
 
@@ -425,7 +425,7 @@ void KexiTableView::updateAllVisibleRowsBelow(int row)
 		clipper()->width(), clipper()->height() - (rowPos(row) - contentsY()) );
 }
 
-void KexiTableView::clearColumnsInternal(bool /*repaint*/)
+void KexiTableView::clearColumnsInternal(bool /*tqrepaint*/)
 {
 	while(m_horizontalHeader->count()>0)
 		m_horizontalHeader->removeLabel(0);
@@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const
 	return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 }
 
-TQSize KexiTableView::sizeHint() const
+TQSize KexiTableView::tqsizeHint() const
 {
 	const TQSize &ts = tableSize();
-	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2, 
+	int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2, 
 		(m_navPanel->isVisible() ? m_navPanel->width() : 0) );
-	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
-		minimumSizeHint().height() );
+	int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
+		tqminimumSizeHint().height() );
 	w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch
 	h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch
 
-//	kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl;
+//	kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl;
 
 	return TQSize(w, h);
 		/*TQSize(
 		TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ),
 		//+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2,
-		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), 
-			minimumSizeHint().height() )
+		TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), 
+			tqminimumSizeHint().height() )
 	);*/
-//		TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) );
+//		TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) );
 }
 
-TQSize KexiTableView::minimumSizeHint() const
+TQSize KexiTableView::tqminimumSizeHint() const
 {
 	return TQSize(
 		leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2, 
@@ -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)")
-			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;*/
+			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;*/
 
 	if (rowlast == -1) {
 		rowlast = rows() - 1;
@@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch)
 	if(d->pBufferPm->isNull())
 		return;
 	TQPainter *pb = new TQPainter(d->pBufferPm, this);
-//	pb->fillRect(0, 0, cw, ch, colorGroup().base());
+//	pb->fillRect(0, 0, cw, ch, tqcolorGroup().base());
 
 //	int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1)));
 	int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1);
@@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
 		&& usesSelectedTextColor)
 	{
-		defaultPen = TQPen(colorGroup().highlightedText()); //selected text
+		defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text
 	}
 	else if (d->appearance.rowHighlightingEnabled && row == m_curRow 
 		&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
@@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) {
 		if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted)
 			edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h,
-				isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
+				isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor,
 				p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection );
 	}
 
@@ -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)")
-			.arg(cx).arg(cy).arg(cw).arg(ch) << endl;
+			.tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;
 	kdDebug(44021) << TQString(" (w:%3 h:%4)")
-			.arg(ts.width()).arg(ts.height()) << endl;*/
+			.tqarg(ts.width()).tqarg(ts.height()) << endl;*/
 	
 	// Region of the rect we should draw, calculated in viewport
 	// coordinates, as a region can't handle bigger coordinates
@@ -945,26 +945,26 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch
 	// Subtract the table from it
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) );
 	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts
-		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height())
-			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
+		-TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height())
+			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
 			+ (horizontalScrollBar()->isVisible() ? 0 : 
 				d->internal_bottomMargin
-//	horizontalScrollBar()->sizeHint().height()/2
+//	horizontalScrollBar()->tqsizeHint().height()/2
 		)
-//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
+//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
 			+ contentsY()
-//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0)
+//			- (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0)
 			)
 		) );
 //	reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) );
 
 	// And draw the rectangles (transformed inc contents coordinates as needed)
-	TQMemArray<TQRect> r = reg.rects();
+	TQMemArray<TQRect> r = reg.tqrects();
 	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)")
-			.arg(rect.x()).arg(rect.y())
-			.arg(rect.width()).arg(rect.height()) << endl;*/
+			.tqarg(rect.x()).tqarg(rect.y())
+			.tqarg(rect.width()).tqarg(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() );
@@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e)
 
 	const int k = e->key();
 	const bool ro = isReadOnly();
-	TQWidget *w = focusWidget();
+	TQWidget *w = tqfocusWidget();
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) {
 //	if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) {
 	if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) {
@@ -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").arg(k,0,16) <<endl;
+					kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").tqarg(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, repaint
+	// if focus cell changes, tqrepaint
 	setCursorPosition(curRow, curCol);
 
 	m_vScrollBarValueChanged_enabled=true;
@@ -1630,29 +1630,29 @@ void KexiTableView::resizeEvent(TQResizeEvent *e)
 		slotUpdate();
 		triggerUpdate();
 	}
-//	d->pTopHeader->repaint();
+//	d->pTopHeader->tqrepaint();
 
 
 /*		m_navPanel->setGeometry(
 			frameWidth(),
 			viewport()->height() +d->pTopHeader->height() 
-			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
+			-(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
 			+frameWidth(),
-			m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(),
-			horizontalScrollBar()->sizeHint().height()
+			m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(),
+			horizontalScrollBar()->tqsizeHint().height()
 		);*/
 //		updateContents();
 //		m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(),
 	//		m_navPanel->width(), horizontalScrollBar()->height());
 //	updateContents(0,0,2000,2000);//js
-//	erase(); repaint();
+//	erase(); tqrepaint();
 }
 
 void KexiTableView::viewportResizeEvent( TQResizeEvent *e )
 {
 	TQScrollView::viewportResizeEvent( e );
 	updateGeometries();
-//	erase(); repaint();
+//	erase(); tqrepaint();
 }
 
 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()->repaint();
+	//	viewport()->tqrepaint();
 	}
 
 //	updateContents(0, 0, d->pBufferPm->width(), d->pBufferPm->height());
@@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const
 	if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) {
 /*		kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 ) 
 			<< ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight
-//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height())
-			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
+//			+ TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height())
+			+ (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
 			+ margin() << endl;
 */
 //		kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" "
-//		<<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
+//		<<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl;
 
-		//int xx = horizontalScrollBar()->sizeHint().height()/2;
+		//int xx = horizontalScrollBar()->tqsizeHint().height()/2;
 
 		TQSize s( 
 			columnPos( columns() - 1 ) + columnWidth( columns() - 1 ),
-//			+ verticalScrollBar()->sizeHint().width(),
+//			+ verticalScrollBar()->tqsizeHint().width(),
 			rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight
-			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height())
+			+ (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height())
 			+ d->internal_bottomMargin
-//				horizontalScrollBar()->sizeHint().height()/2
-//			- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2
+//				horizontalScrollBar()->tqsizeHint().height()/2
+//			- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2
 
 //			+ ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible()
 	//			&& !horizontalScrollBar()->isVisible()) 
-		//		? horizontalScrollBar()->sizeHint().height() : 0)
+		//		? horizontalScrollBar()->tqsizeHint().height() : 0)
 
 //			+ TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0, 
-//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0)
+//				horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0)
 
 //			+ (m_navPanel->isVisible() 
-//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 )
+//				? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 )
 
-//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 )
+//			- (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 )
 			+ margin() 
 //-2*d->rowHeight
 		);
 
 //		kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " <<  s << endl;
 		return s;
-//			+horizontalScrollBar()->sizeHint().height() + margin() );
+//			+horizontalScrollBar()->tqsizeHint().height() + margin() );
 	}
 	return TQSize(0,0);
 }
@@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set)
 	int left_width;
 	if (set) {
 		m_verticalHeader->show();
-		left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight);
+		left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight);
 	}
 	else {
 		m_verticalHeader->hide();
 		left_width = 0;
 	}
-	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0);
+	setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0);
 }
 
 bool KexiTableView::horizontalHeaderVisible() const
@@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set)
 	d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate
 	if (set) {
 		m_horizontalHeader->show();
-		top_height = m_horizontalHeader->sizeHint().height();
+		top_height = m_horizontalHeader->tqsizeHint().height();
 	}
 	else {
 		m_horizontalHeader->hide();
@@ -2478,10 +2478,10 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e )
 	}
 /*	else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 		//hp==true if currently focused widget is a child of this table view
-		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget());
+		const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
 		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 children
+			//(not a child, like eg. editor) from one of our table view's tqchildren
 			//or from table view itself
 			if (!acceptRowEdit()) {
 				static_cast<TQWidget*>(o)->setFocus();
@@ -2508,9 +2508,9 @@ void KexiTableView::paletteChange( const TQPalette &oldPalette )
 	Q_UNUSED(oldPalette);
 	//update:
 	if (m_verticalHeader)
-		m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
+		m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
 	if (m_horizontalHeader)
-		m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() );
+		m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() );
 }
 
 const KexiTableView::Appearance& KexiTableView::appearance() const
@@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a)
 		m_verticalHeader->setCellHeight(d->rowHeight);
 	if (m_horizontalHeader) {
 		setMargins(
-			TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight),
-			m_horizontalHeader->sizeHint().height(), 0, 0);
+			TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight),
+			m_horizontalHeader->tqsizeHint().height(), 0, 0);
 	}
 //	}
 	if (a.rowHighlightingEnabled)
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index b602168a7..9cfcf47e0 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -223,8 +223,8 @@ public:
 
 	// reimplemented for internal reasons
 	virtual TQSizePolicy sizePolicy() const;
-	virtual TQSize sizeHint() const;
-	virtual TQSize minimumSizeHint() const;
+	virtual TQSize tqsizeHint() const;
+	virtual TQSize tqminimumSizeHint() const;
 
 	/*! Reimplemented to update cached fonts and row sizes for the painter. */
 	void setFont(const TQFont &f);
@@ -263,7 +263,7 @@ public slots:
 	virtual void setData( KexiTableViewData *data, bool owner = true )
 		{ KexiDataAwareObjectInterface::setData( data, owner ); }
 
-	virtual void clearColumnsInternal(bool repaint);
+	virtual void clearColumnsInternal(bool tqrepaint);
 
 	/*! 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 repaint)
-	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); }
+	virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
+	{ KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); }
 
-	//! Handles KexiTableViewData::rowDeleted() signal to repaint when needed.
+	//! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed.
 	virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); }
 
-	//! Handles KexiTableViewData::rowInserted() signal to repaint when needed.
-	virtual void slotRowInserted(KexiTableItem *item, bool repaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, repaint); }
+	//! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed.
+	virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, tqrepaint); }
 
 	//! Like above, not db-aware version
-	virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint)
-	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, repaint); }
+	virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint)
+	{ KexiDataAwareObjectInterface::slotRowInserted(item, row, tqrepaint); }
 
 	/*! Handles verticalScrollBar()'s valueChanged(int) signal. 
 	 Called when vscrollbar's value has been changed. */
@@ -504,7 +504,7 @@ protected:
 	 *value is set to the default value. */
 	bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0);
 
-	//! painting and layout
+	//! painting and tqlayout
 	void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
 	void createBuffer(int width, int height);
 	void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false);
@@ -588,7 +588,7 @@ protected:
 	virtual void removeEditor();
 
 	//! Internal: updated sched fonts for painting.
-	void updateFonts(bool repaint = false);
+	void updateFonts(bool tqrepaint = 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 repaint tow \a row and all visible below. */
+	 to tqrepaint 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 repaint contents after a row is deleted.
+//	//! Called to tqrepaint contents after a row is deleted.
 //	void repaintAfterDelete();
 
 	KexiTableViewPrivate *d;
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index 983378cb2..d5e1641ae 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
 //moved	scrollBarTipTimerCnt = 0;
 //moved	scrollBarTip = 0;
 	ensureCellVisibleOnShow = TQPoint(-1,-1);
-	internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2;
+	internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2;
 	highlightedRow = -1;
 	moveCursorOnMouseRelease = false;
 	horizontalHeaderVisible = true;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index a4e45daf8..5905706b1 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 	const TQString &as = m_leftTmp.toString();
 	const TQString &bs = m_rightTmp.toString();
 
-	const TQChar *a = as.unicode();
-	const TQChar *b = bs.unicode();
+	const TQChar *a = as.tqunicode();
+	const TQChar *b = bs.tqunicode();
 
 	if ( a == b )
 		return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
 
 	int l=TQMIN(as.length(),bs.length());
 
-	au = a->unicode();
-	bu = b->unicode();
+	au = a->tqunicode();
+	bu = b->tqunicode();
 	au = (au <= 0x17e ? charTable[au] : 0xffff);
 	bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 
 	while (l-- && au == bu)
 	{
 		a++,b++;
-		au = a->unicode();
-		bu = b->unicode();
+		au = a->tqunicode();
+		bu = b->tqunicode();
 		au = (au <= 0x17e ? charTable[au] : 0xffff);
 		bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
 	}
@@ -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 repaint)
+bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint)
 {
 	if (!m_pRowEditBuffer)
 		return true; //nothing to do
@@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint)
 			if (val->isNull() && !f->isAutoIncrement()) {
 				//NOT NULL violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.tqarg(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 repaint)
 			if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) {
 				//NOT EMPTY violated
 				m_result.msg = i18n("\"%1\" column requires a value to be entered.")
-					.arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData();
+					.tqarg(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 (repaint)
+	if (tqrepaint)
 		emit rowRepaintRequested(item);
 	return true;
 }
 
-bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint)
 {
 	kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl;
 	m_result.clear();
@@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint)
 	if (!m_result.success)
 		return false;
 
-	if (saveRow(item, false /*update*/, repaint)) {
+	if (saveRow(item, false /*update*/, tqrepaint)) {
 		emit rowUpdated(&item);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint)
 {
 	kdDebug() << "KexiTableViewData::saveNewRow()..." << endl;
 	m_result.clear();
-	emit aboutToInsertRow(&item, &m_result, repaint);
+	emit aboutToInsertRow(&item, &m_result, tqrepaint);
 	if (!m_result.success)
 		return false;
 	
-	if (saveRow(item, true /*insert*/, repaint)) {
-		emit rowInserted(&item, repaint);
+	if (saveRow(item, true /*insert*/, tqrepaint)) {
+		emit rowInserted(&item, tqrepaint);
 		return true;
 	}
 	return false;
 }
 
-bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
+bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint)
 {
 	m_result.clear();
-	emit aboutToDeleteRow(item, &m_result, repaint);
+	emit aboutToDeleteRow(item, &m_result, tqrepaint);
 	if (!m_result.success)
 		return false;
 
@@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint)
 	return true;
 }
 
-void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint )
+void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint )
 {
-	Q_UNUSED( repaint );
+	Q_UNUSED( tqrepaint );
 
 	if (rowsToDelete.isEmpty())
 		return;
@@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool r
 	emit rowsDeleted( rowsToDelete );
 }
 
-void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint)
+void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint)
 {
 	if (!insert( index = TQMIN(index, count()), &item ))
 		return;
-	emit rowInserted(&item, index, repaint);
+	emit rowInserted(&item, index, tqrepaint);
 }
 
 void KexiTableViewData::clearInternal()
@@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal()
 		removeLast();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if (i % 1000 == 0)
-			tqApp->processEvents( 1 );
+			tqApp->tqprocessEvents( 1 );
 #endif
 	}
 }
 
-bool KexiTableViewData::deleteAllRows(bool repaint)
+bool KexiTableViewData::deleteAllRows(bool tqrepaint)
 {
 	clearInternal();
 
@@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool repaint)
 		res = m_cursor->deleteAllRows();
 	}
 
-	if (repaint)
+	if (tqrepaint)
 		emit reloadRequested();
 	return res;
 }
@@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows()
 		m_cursor->moveNext();
 #ifndef KEXI_NO_PROCESS_EVENTS
 		if ((i % 1000) == 0)
-			tqApp->processEvents( 1 );
+			tqApp->tqprocessEvents( 1 );
 #endif
 	}
 }
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index eb3d20df6..7263f3fee 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 repaint = false);
+	bool saveRowChanges(KexiTableItem& item, bool tqrepaint = false);
 
-	bool saveNewRow(KexiTableItem& item, bool repaint = false);
+	bool saveNewRow(KexiTableItem& item, bool tqrepaint = false);
 
-	bool deleteRow(KexiTableItem& item, bool repaint = false);
+	bool deleteRow(KexiTableItem& item, bool tqrepaint = 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 repaint = false );
+	void deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint = 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 repaint is true, reloadRequested() signal 
+	 If \a tqrepaint is true, reloadRequested() signal 
 	 is emitted after deleting (if at least one row was deleted), 
-	 so presenters can repaint their contents. 
+	 so presenters can tqrepaint their contents. 
 
 	 \return true on success. */
-	virtual bool deleteAllRows(bool repaint = false);
+	virtual bool deleteAllRows(bool tqrepaint = 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 repaint = false);
+	void insertRow(KexiTableItem& item, uint index, bool tqrepaint = 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 repaint);
+	void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool tqrepaint);
 
 	/*! 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 repaint); //!< A row has been inserted
+	void rowInserted(KexiTableItem*, bool tqrepaint); //!< 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 repaint);
+	void rowInserted(KexiTableItem*, uint index, bool tqrepaint);
 
 	/*! 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 repaint);
+	void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
 
 	//! 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 repaint);
+	bool saveRow(KexiTableItem& item, bool insert, bool tqrepaint);
 
 	//! (logical) sorted column number, set by setSorting()
 	//! can differ from m_realSortedColumn if there's lookup column used
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index ef4c83da6..4a00be38c 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
 		 : KexiUtils::StyleProxy(parentStyle)
 		{
-			setBackgroundColor( widget->palette().active().background() );
+			setBackgroundColor( widget->tqpalette().active().background() );
 		}
 		~KexiTableViewHeaderStyle() {}
 
@@ -61,7 +61,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) 
 	: TQHeader(parent, name)
 	, m_lastToolTipSection(-1)
-	, m_selectionBackgroundColor(tqApp->palette().active().highlight())
+	, m_selectionBackgroundColor(tqApp->tqpalette().active().highlight())
 	, m_selectedSection(-1)
 	, m_styleChangeEnabled(true)
 {
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
 			TQString tip = m_toolTips[ section ];
 			if (tip.isEmpty()) { //try label
 				TQFontMetrics fm(font());
-				int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
+				int minWidth = fm.width( label( section ) ) + tqstyle().tqpixelMetric( TQStyle::PM_HeaderMargin );
 				TQIconSet *iset = iconSet( section );
 				if (iset)
 					minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -188,14 +188,14 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
 	if (paintSelection) {
 		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
 			KexiUtils::blendedColors( 
-				palette().active().background(), m_selectionBackgroundColor, 2, 1) );
+				tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) );
 	}
 
 	TQHeader::paintSection( p, index, fr );
 
 	if (paintSelection) { //revert the color for subsequent paints
 		static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
-			palette().active().background());
+			tqpalette().active().background());
 	}
 }
 
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index 6035aed51..8110716b5 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -23,16 +23,16 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 #include <tqrect.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqcolor.h>
 #include <tqfontmetrics.h>
 #include <tqdatetime.h>
 #include <tqcursor.h>
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqdatetimeedit.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index 6279aa049..fa5c35abd 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete )
 
 void KexiArrowTip::drawContents(TQPainter& p)
 {
-	p.setPen( TQPen(palette().active().foreground(), 1) );
+	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
 	p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), 
 		TQt::AlignCenter, m_value.toString());
 }
 
 void KexiArrowTip::drawFrame(TQPainter& p)
 {
-	TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+	TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	p.setPen( pen );
 	/*
 	   /\
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 60f99f85c..777fea1bf 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -53,18 +53,18 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 
 	TQRect r = rect();
 	r.setHeight(r.height()+m_fixForHeight);
-	if (m_drawComplexControl) {
+	if (m_tqdrawComplexControl) {
 		if (m_fixForHeight>0 && m_paintedCombo->size()!=size()) {
 			m_paintedCombo->move(0,0);
 			m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
 		}
-		tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p,
-			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(),
+		tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, p,
+			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, tqcolorGroup(),
 			flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None );
 	}
 	else {
 		r.setWidth(r.width()+2);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, tqcolorGroup(), flags);
 	}
 }
 
@@ -77,7 +77,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 	else
 		m_fixForHeight = 0;
 	//</hack>
-	m_drawComplexControl =
+	m_tqdrawComplexControl =
 		(tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
 		|| qstricmp(tqstyle().name(),"platinum")==0;
 	if (m_fixForHeight==0)
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h
index 94c264844..f480de742 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.h
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h
@@ -41,7 +41,7 @@ class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton
 		virtual void styleChange( TQStyle & oldStyle );
 
 		int m_fixForHeight;
-		bool m_drawComplexControl : 1;
+		bool m_tqdrawComplexControl : 1;
 		KComboBox *m_paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle 
 		                           //!< (because styles use \<static_cast\>)
 };
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index aeeec86dd..3c6b22f06 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -96,7 +96,7 @@ KexiImageContextMenu::~KexiImageContextMenu()
 
 void KexiImageContextMenu::insertFromFile()
 {
-//	TQWidget *focusWidget = tqApp->focusWidget();
+//	TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
 #ifdef TQ_WS_WIN
 	TQString recentDir;
 	TQString fileName = TQFileDialog::getOpenFileName(
@@ -116,8 +116,8 @@ void KexiImageContextMenu::insertFromFile()
 	if (!url.isValid()) {
 		//focus the app again because to avoid annoying the user with unfocused main window
 		if (tqApp->mainWidget()) {
-			//focusWidget->raise();
-			//focusWidget->setFocus();
+			//tqfocusWidget->raise();
+			//tqfocusWidget->setFocus();
 			tqApp->mainWidget()->raise();
 		}
 		return;
@@ -133,8 +133,8 @@ void KexiImageContextMenu::insertFromFile()
 
 	emit insertFromFileRequested(url);
 	if (tqApp->mainWidget()) {
-//		focusWidget->raise();
-//		focusWidget->setFocus();
+//		tqfocusWidget->raise();
+//		tqfocusWidget->setFocus();
 		tqApp->mainWidget()->raise();
 	}
 }
@@ -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?")
-		.arg(TQDir::convertSeparators(fileName))+"</qt>",0, 
+		.tqarg(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")
-		.arg( objectName[0].upper() + objectName.mid(1) )
-		.arg( objectTypeName ));
+		.tqarg( objectName[0].upper() + objectName.mid(1) )
+		.tqarg( objectTypeName ));
 
 	if (iconName.isEmpty())
 		title->setTitle(realTitle);
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 298eda482..718fcbf6a 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").arg(yearMask).arg(m_separator).arg(m_separator);
+			m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(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").arg(m_separator).arg(m_separator).arg(yearMask);
+			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(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").arg(m_separator).arg(m_separator).arg(yearMask);
+			m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(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").arg(yearMask).arg(m_separator).arg(m_separator);
+		m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator);
 		m_qtFormat = yearDateFormat+m_separator+monthDateFormat+m_separator+dayDateFormat;
 		m_yearpos = 0;
 		m_monthpos = yearMask.length()+separatorLen;
@@ -294,20 +294,20 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
 	TQString s(m_outputFormat);
 	if (m_24h) {
 		if (m_hoursWithLeadingZero)
-			s.replace( "%H", TQString::fromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
+			s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) );
 		else
 			s.replace( "%k", TQString::number(time.hour()) );
 	}
 	else {
 		int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour();
 		if (m_hoursWithLeadingZero)
-			s.replace( "%I", TQString::fromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
+			s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) );
 		else
 			s.replace( "%l", TQString::number(time12) );
 	}
-	s.replace( "%M", TQString::fromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
+	s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) );
 	if (m_secpos>=0)
-		s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
+		s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
 	if (m_ampmpos>=0)
 		s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
 	return s;
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 11b1d7428..1943b0869 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,8 +92,8 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
 
 KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
 {
-	textColor = w->palette().active().foreground();
-	selectedTextColor = w->palette().active().highlightedText();
+	textColor = w->tqpalette().active().foreground();
+	selectedTextColor = w->tqpalette().active().highlightedText();
 	font = w->font();
 }
 
@@ -113,7 +113,7 @@ void KexiDisplayUtils::initDisplayForAutonumberSign(DisplayParameters& par, TQWi
 void KexiDisplayUtils::initDisplayForDefaultValue(DisplayParameters& par, TQWidget *widget)
 {
 	par.textColor = SPECIAL_TEXT_COLOR;
-	par.selectedTextColor = widget->palette().active().highlightedText();
+	par.selectedTextColor = widget->tqpalette().active().highlightedText();
 	par.font = widget->font();
 	par.font.setItalic(true);
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 054192ce7..909d507ca 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -28,7 +28,7 @@
 KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
  : TQToolButton(parent, "KexiDBImageBox::Button")
 {
-	setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 //! @todo get this from a KStyle
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
@@ -55,11 +55,11 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
 	tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
-		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
+		TQRect((width()-7)/2, height()-9, 7, 7), tqcolorGroup(),
 		arrowFlags, TQStyleOption() );
 }
 
-TQSize KexiDropDownButton::sizeHint () const
+TQSize KexiDropDownButton::tqsizeHint () const
 {
 	return TQSize( fontMetrics().maxWidth() + 2*2, fontMetrics().height()*2 + 2*2 );
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h
index 178f17a72..e61ab9f5c 100644
--- a/kexi/widget/utils/kexidropdownbutton.h
+++ b/kexi/widget/utils/kexidropdownbutton.h
@@ -38,7 +38,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton
 
 		virtual void drawButton( TQPainter *p );
 		
-		virtual TQSize sizeHint () const;
+		virtual TQSize tqsizeHint () const;
 
 		virtual void keyPressEvent ( TQKeyEvent * e );
 };
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index e2397ede8..e4bc4207e 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent()
 	return (m_idx < (int)count()) ? m_list->take(m_idx) : 0;
 }
 
-//// The layout itself
+//// The tqlayout itself
 
 KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
  : TQLayout(parent, border, space, name)
@@ -134,10 +134,10 @@ KexiFlowLayout::widgetList() const
 }
 
 void
-KexiFlowLayout::invalidate()
+KexiFlowLayout::tqinvalidate()
 {
-	TQLayout::invalidate();
-	m_cached_sizeHint = TQSize();
+	TQLayout::tqinvalidate();
+	m_cached_tqsizeHint = TQSize();
 	m_cached_minSize = TQSize();
 	m_cached_width = 0;
 }
@@ -169,22 +169,22 @@ KexiFlowLayout::heightForWidth(int w) const
 }
 
 TQSize
-KexiFlowLayout::sizeHint() const
+KexiFlowLayout::tqsizeHint() const
 {
-	if(m_cached_sizeHint.isEmpty()) {
+	if(m_cached_tqsizeHint.isEmpty()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
 		TQRect r = TQRect(0, 0, 2000, 2000);
 		mthis->simulateLayout(r);
 	}
-	return m_cached_sizeHint;
+	return m_cached_tqsizeHint;
 }
 
 TQSize
-KexiFlowLayout::minimumSize() const
+KexiFlowLayout::tqminimumSize() const
 {
-//js: do we really need to simulate layout here?
-//    I commented this out because it was impossible to stretch layout conveniently.
-//    Now, minimum size is computed automatically based on item's minimumSize...
+//js: do we really need to simulate tqlayout here?
+//    I commented this out because it was impossible to stretch tqlayout conveniently.
+//    Now, minimum size is computed automatically based on item's tqminimumSize...
 #if 0
 	if(m_cached_minSize.isEmpty()) {
 		KexiFlowLayout *mthis = (KexiFlowLayout*)this;
@@ -234,7 +234,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, sizeHint(20, 20);
+	TQSize minSize, tqsizeHint(20, 20);
 	int minSizeHeight = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -244,20 +244,20 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		}
 
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
-		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if ((x + oSizeHint.width()) > r.right() && h > 0) {
-			// do the layout of current line
+			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wx = r.x();
 			int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->minimumSize(); // a while to get them
+				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
+						if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
 							s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 								, r.width()), itemSizeHint.height() );
 						else
@@ -277,7 +277,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 				lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 				++it2;
 			}
-			sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
+			tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) );
 			minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) );
 			minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 			// start a new line
@@ -292,24 +292,24 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		x = x + spacing() + oSizeHint.width();
 		h = TQMAX( h,  oSizeHint.height() );
 		currentLine.append(o);
-		if(o->expanding() == TQSizePolicy::Horizontally || o->expanding() == TQSizePolicy::BothDirections)
+		if(o->expandingDirections() == TQSizePolicy::Horizontally || o->expandingDirections() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.width());
 		++it;
 	}
 
-	// don't forget to layout the last line
+	// don't forget to tqlayout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wx = r.x();
 	int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->minimumSize(); // a while to get them
+		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections)
+				if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections)
 					s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets
 						, r.width()), itemSizeHint.height() );
 				else
@@ -329,12 +329,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() );
 		++it2;
 	}
-	sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
+	tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) );
 	minSizeHeight = minSizeHeight + spacing() + lineMinHeight;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store sizeHint() and minimumSize()
-	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
+	// store tqsizeHint() and tqminimumSize()
+	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin() , 2*margin());
 	// return our height
 	return y + h - r.y();
@@ -351,7 +351,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 	TQPtrListIterator<TQLayoutItem> it(m_list);
 	TQPtrList<TQLayoutItem> currentLine;
 	TQLayoutItem *o;
-	TQSize minSize, sizeHint(20, 20);
+	TQSize minSize, tqsizeHint(20, 20);
 	int minSizeWidth = 0 - spacing();
 
 	while ( (o = it.current()) != 0 ) {
@@ -360,20 +360,20 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 			continue;
 		}
 
-		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if (y + oSizeHint.height() > r.bottom() && w > 0) {
-			// do the layout of current line
+			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wy = r.y();
 			int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 			while( (item = it2.current()) != 0 ) {
-				TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
-				TQSize itemMinSize = item->minimumSize(); // a while to get them
+				TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
+				TQSize itemMinSize = item->tqminimumSize(); // a while to get them
 				TQSize s;
 				if(m_justify) {
 					if(expandingWidgets != 0) {
-						if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
+						if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
 							s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 								, r.height()) );
 						else
@@ -393,7 +393,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 				colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 				++it2;
 			}
-			sizeHint = sizeHint.expandedTo( TQSize(0, sizeHintHeight) );
+			tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) );
 			minSize = minSize.expandedTo( TQSize(0, minSizeHeight) );
 			minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 			// start a new column
@@ -408,24 +408,24 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		y = y + spacing() + oSizeHint.height();
 		w = TQMAX( w,  oSizeHint.width() );
 		currentLine.append(o);
-		if(o->expanding() == TQSizePolicy::Vertically || o->expanding() == TQSizePolicy::BothDirections)
+		if(o->expandingDirections() == TQSizePolicy::Vertically || o->expandingDirections() == TQSizePolicy::BothDirections)
 			++expandingWidgets;
 		availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.height());
 		++it;
 	}
 
-	// don't forget to layout the last line
+	// don't forget to tqlayout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wy = r.y();
 	int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0;
 	while( (item = it2.current()) != 0 ) {
-		TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take
-		TQSize itemMinSize = item->minimumSize(); // a while to get them
+		TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take
+		TQSize itemMinSize = item->tqminimumSize(); // a while to get them
 		TQSize s;
 		if(m_justify) {
 			if(expandingWidgets != 0) {
-				if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections)
+				if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections)
 					s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets
 						, r.height()) );
 				else
@@ -445,12 +445,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		colMinWidth = TQMAX( colMinWidth, itemMinSize.width() );
 		++it2;
 	}
-	sizeHint = sizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
+	tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) );
 	minSizeWidth = minSizeWidth + spacing() + colMinWidth;
 	minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) );
 
-	// store sizeHint() and minimumSize()
-	m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin());
+	// store tqsizeHint() and tqminimumSize()
+	m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin());
 	m_cached_minSize = minSize + TQSize(2* margin(), 2*margin());
 	// return our width
 	return x + w - r.x();
@@ -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).at(index)) : 0;
+	return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).tqat(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.at(index);
-	m_list.remove(m_list.at(index));
+	TQLayoutItem *item = m_list.tqat(index);
+	m_list.remove(m_list.tqat(index));
 	delete item;
 	
 	invalidate();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index f48ed1400..0f6d83845 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -20,10 +20,10 @@
 #ifndef KEXIFLOWLAYOUT_H
 #define KEXIFLOWLAYOUT_H
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 
-//! @short a special "flow" layout
+//! @short a special "flow" tqlayout
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
@@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 
 		~KexiFlowLayout();
 
-		/*! \return the widgets in the order of the layout,
+		/*! \return the widgets in the order of the tqlayout,
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
-		/*! \return layout's orientation. */
+		/*! \return tqlayout's orientation. */
 		Qt::Orientation orientation() const { return m_orientation; }
 
 		void setJustified(bool justify) { m_justify = justify; }
@@ -49,12 +49,12 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		virtual void addItem(TQLayoutItem *item);
 		virtual void addSpacing(int size);
 		virtual TQLayoutIterator iterator();
-		virtual void  invalidate();
+		virtual void  tqinvalidate();
 
 		virtual bool hasHeightForWidth() const;
 		virtual int heightForWidth(int width) const;
-		virtual TQSize sizeHint() const;
-		virtual TQSize minimumSize() const;
+		virtual TQSize tqsizeHint() const;
+		virtual TQSize tqminimumSize() const;
 		virtual TQSizePolicy::ExpandData expanding() const;
 
 		virtual bool isEmpty();
@@ -75,7 +75,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		int m_cached_hfw;
 		bool m_justify;
 		Qt::Orientation m_orientation;
-		TQSize m_cached_sizeHint;
+		TQSize m_cached_tqsizeHint;
 		TQSize m_cached_minSize;
 };
 
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index d93b13ffc..18d34447c 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -155,7 +155,7 @@ void KexiGradientWidget::rebuildCache( void ) {
 	}
 
 	/**
-	All children need to have our background set.
+	All tqchildren 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->geometry();
+			area = childWidget->tqgeometry();
 		} 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 children are removed
+	This happens when tqchildren 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->geometry();
+		area = childWidget->tqgeometry();
 	} 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 d11c4f048..3f9b894de 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 children of \a p.
+		Builds a list of tqchildren 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 children of \a p
+		The method recursively calls itself until all tqchildren of \a p
 		have been found and stored in the list.
 		*/
 		static void buildChildrenList( WidgetList& list, TQWidget* p );
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index 55a7c47a0..b22e0500d 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -100,7 +100,7 @@ public:
 	 , highlightedRow(-1)
 	 , editRow(-1)
 	 , rows(0)
-	 , selectionBackgroundColor(tqApp->palette().active().highlight())
+	 , selectionBackgroundColor(tqApp->tqpalette().active().highlight())
 	 , showInsertRow(true)
 	{
 	}
@@ -188,13 +188,13 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 	if(last > (d->rows-1+(d->showInsertRow?1:0)))
 		last = d->rows-1+(d->showInsertRow?1:0);
 
-	TQColorGroup selectedColorGroup(colorGroup());
+	TQColorGroup selectedColorGroup(tqcolorGroup());
 	selectedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 2, 1) );
 	selectedColorGroup.setColor( TQColorGroup::Background, 
 		selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik)
-	TQColorGroup highlightedColorGroup(colorGroup());
+	TQColorGroup highlightedColorGroup(tqcolorGroup());
 	highlightedColorGroup.setColor( TQColorGroup::Button, 
 		KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), 
 			d->selectionBackgroundColor, 4, 1) );
@@ -206,7 +206,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
 		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
-			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
+			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
 	if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) {
@@ -220,7 +220,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		&& (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ 
 	{
 		//show marker
-		p.setBrush(colorGroup().foreground());
+		p.setBrush(tqcolorGroup().foreground());
 		p.setPen(TQPen(TQt::NoPen));
 		TQPointArray points(3);
 		int ofs = d->rowHeight / 4;
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index f4c96b583..4c1dd02b0 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
@@ -102,7 +102,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	d->lyr->addSpacing( 6 );
 	
 	d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) );
-	m_navRecordNumber->setAlignment(AlignRight | AlignVCenter);
+	m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter);
 	m_navRecordNumber->setFocusPolicy(TQ_ClickFocus);
 	m_navRecordNumber->installEventFilter(this);
 //	m_navRowNumber->setFixedWidth(fw);
@@ -112,20 +112,20 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	TQToolTip::add(m_navRecordNumber, i18n("Current row number"));
 	
 	KLineEdit *lbl_of = new KLineEdit(i18n("of"), this);
-	lbl_of->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8);
 	lbl_of->setReadOnly(true);
 	lbl_of->setLineWidth(0);
 	lbl_of->setFocusPolicy(TQ_NoFocus);
-	lbl_of->setAlignment(AlignCenter);
+	lbl_of->tqsetAlignment(AlignCenter);
 	d->lyr->addWidget( lbl_of );
 	
 	d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) );
-	m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
+	m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred);
 	m_navRecordCount->setReadOnly(true);
 	m_navRecordCount->setLineWidth(0);
 	m_navRecordCount->setFocusPolicy(TQ_NoFocus);
-	m_navRecordCount->setAlignment(AlignLeft | AlignVCenter);
+	m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter);
 	TQToolTip::add(m_navRecordCount, i18n("Number of rows"));
 
 	lbl_of->setFont(f);
@@ -337,7 +337,7 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 	if (m_view) {
 		int navWidth;
 		if (m_view->horizontalScrollBar()->isVisible()) {
-			navWidth = sizeHint().width();
+			navWidth = tqsizeHint().width();
 		}
 		else {
 			navWidth = leftMargin + m_view->clipper()->width();
@@ -345,9 +345,9 @@ void KexiRecordNavigator::updateGeometry(int leftMargin)
 		
 		setGeometry(
 			m_view->frameWidth(),
-			m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(),
+			m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(),
 			navWidth,
-			m_view->horizontalScrollBar()->sizeHint().height()
+			m_view->horizontalScrollBar()->tqsizeHint().height()
 		);
 
 		m_view->updateScrollBars();
@@ -361,7 +361,7 @@ void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int
 
 void KexiRecordNavigator::setLabelText(const TQString& text)
 {
-	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::fromLatin1(" ")+text+" "));
+	m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" "));
 }
 
 void KexiRecordNavigator::setInsertingButtonVisible(bool set)
@@ -429,7 +429,7 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set)
 	if (d->editingIndicatorEnabled) {
 		if (!d->editingIndicatorLabel) {
 			d->editingIndicatorLabel = new TQLabel(this);
-			d->editingIndicatorLabel->setAlignment(TQt::AlignCenter);
+			d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter);
 			TQPixmap pix;
 			pix.convertFromImage( *KexiRecordMarker::penImage() );
 			d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 );
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 6c666e786..9eae328b3 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) geometry so this record navigator
+		/*! Sets horizontal bar's \a hbar (at the bottom) tqgeometry 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/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index 2a36ef093..7d71752c1 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -42,7 +42,7 @@ KexiToolTip::~KexiToolTip()
 {
 }
 
-TQSize KexiToolTip::sizeHint() const
+TQSize KexiToolTip::tqsizeHint() const
 {
 	TQSize sz(fontMetrics().boundingRect(m_value.toString()).size());
 	return sz;
@@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev )
 
 void KexiToolTip::drawFrame(TQPainter& p)
 {
-	p.setPen( TQPen(palette().active().foreground(), 1) );
+	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
 	p.drawRect(rect());
 }
 
diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h
index 83d0d7e01..cfa1b4838 100644
--- a/kexi/widget/utils/kexitooltip.h
+++ b/kexi/widget/utils/kexitooltip.h
@@ -32,7 +32,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget
 		KexiToolTip(const TQVariant& value, TQWidget* parent);
 		virtual ~KexiToolTip();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 	public slots:
 		virtual void show();
diff --git a/kformula/DESIGN b/kformula/DESIGN
index eec708699..0e8280432 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 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
+- 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
   in this rect. (Only width and height are needed. Positions are
   handled by the parent)
-//- knows its middle line. (for alignment)
-- knows it's zero point for midline (vertical alignment) and 
+//- knows its middle line. (for tqalignment)
+- knows it's zero point for midline (vertical tqalignment) and 
   keep open the possibility of negative positions (out of bounding rect)
-- draws itself (given a painter); children are drawn, too
+- draws itself (given a painter); tqchildren 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 children must be a SequenceElement. Except for SequenceElement's
-  children that might be of any type.
+- all tqchildren must be a SequenceElement. Except for SequenceElement's
+  tqchildren 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 children. The children are aligned horizontally at
+Manages a list of tqchildren. The tqchildren are aligned horizontally at
 one middle line. No gaps, no overlaps.
 
-Has no own look. It just draws all its children and is done. Except if
+Has no own look. It just draws all its tqchildren 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
-children. These are before, between and after the children.
+tqchildren. These are before, between and after the tqchildren.
 
 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 children. content and index. index is optional.
+contains two tqchildren. content and index. index is optional.
 
 
 IndexElement from BasicElement
 ------------
 
-contains five children. content and four indexes. all indexes are
+contains five tqchildren. 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 children at all.
+contains one char and no tqchildren 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 children: numerator, denominator
+2 tqchildren: 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 children. Above,
+draws all sorts of mathematical symbols with three tqchildren. 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 children.
+A matrix of tqchildren.
 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 children at all. Provides the facility to insert horizontal spaces
+No tqchildren 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 children. The element might not
-own the cursor except when it is owned by one of its children. The
+- 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
 only exception is SequenceElement which has valid cursor positions
-before, between and after its children, too.
+before, between and after its tqchildren, too.
 
 (Therefore the cursor is always owned by a SequenceElement.)
 
-- Each element's children are ordered. If the cursor leaves one child
+- Each element's tqchildren 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
-alignment. So if you type some formulas each on its own line the
+tqalignment. 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 children.
+can give this font to its tqchildren.
 
 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 d58faa5db..b22c85768 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cc
@@ -18,9 +18,9 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -112,7 +112,7 @@ void FormulaString::helpButtonClicked()
 
 void FormulaString::cursorPositionChanged( int para, int pos )
 {
-    position->setText( TQString( "%1:%2" ).arg( para+1 ).arg( pos+1 ) );
+    position->setText( TQString( "%1:%2" ).tqarg( para+1 ).tqarg( pos+1 ) );
 }
 
 #include "formulastring.moc"
diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc
index 863cc9eba..3d425a169 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cc
@@ -50,20 +50,20 @@ public:
     //virtual void output( ostream& stream ) { stream << "PrimaryNode {" << m_primary << "}" << endl; }
     virtual void buildXML( TQDomDocument& doc, TQDomElement element );
     virtual bool isSimple() { return true; }
-    void setUnicode( TQChar unicode ) { m_unicode = unicode; }
+    void setUnicode( TQChar tqunicode ) { m_tqunicode = tqunicode; }
     void setFunctionName( bool functionName ) { m_functionName = functionName; }
     TQString primary() const { return m_primary; }
 private:
     TQString m_primary;
-    TQChar m_unicode;
+    TQChar m_tqunicode;
     bool m_functionName;
 };
 
 void PrimaryNode::buildXML( TQDomDocument& doc, TQDomElement element )
 {
-    if ( m_unicode != TQChar::null ) {
+    if ( m_tqunicode != TQChar::null ) {
         TQDomElement de = doc.createElement( "TEXT" );
-        de.setAttribute( "CHAR", TQString( m_unicode ) );
+        de.setAttribute( "CHAR", TQString( m_tqunicode ) );
         de.setAttribute( "SYMBOL", "3" );
         element.appendChild( de );
     }
@@ -447,7 +447,7 @@ TQDomDocument FormulaStringParser::parse()
     head = parseAssign();
     //head->output( cout );
     if ( !eol() ) {
-        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).arg( line ).arg( column ) );
+        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).tqarg( line ).tqarg( column ) );
     }
 
     TQDomDocument doc = KFormula::Document::createDomDocument();
@@ -543,7 +543,7 @@ ParserNode* FormulaStringParser::parsePrimary()
     }
     case NAME: {
         PrimaryNode* node = new PrimaryNode( current );
-        node->setUnicode( m_symbolTable.unicode( current ) );
+        node->setUnicode( m_symbolTable.tqunicode( current ) );
         nextToken();
         if ( currentType == LP ) {
             nextToken();
@@ -556,7 +556,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                     nextToken();
                 }
             }
-            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
+            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
             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" ) ).arg( line ).arg( column ).arg( ")" ) );
+        expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
         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" ) ).arg( line ).arg( column ).arg( "[" ) );
+                expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "[" ) );
             }
             TQPtrList<ParserNode> row;
             row.setAutoDelete( false );
@@ -594,7 +594,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                 }
             }
             if ( innerBrackets ) {
-                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
+                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
                 if ( currentType == COMMA ) {
                     nextToken();
                 }
@@ -605,20 +605,20 @@ ParserNode* FormulaStringParser::parsePrimary()
                         nextToken();
                     }
                     else {
-                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ";" ) );
+                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ";" ) );
                     }
                 }
             }
             rows.append( new RowNode( row ) );
         }
         m_newlineIsSpace = true;
-        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
+        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
         MatrixNode* node = new MatrixNode( rows );
         if ( node->columns() == 0 ) {
-            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
+            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
         }
         if ( node->rows() == 0 ) {
-            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
+            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
         }
         return node;
     }
@@ -628,7 +628,7 @@ ParserNode* FormulaStringParser::parsePrimary()
         return node;
     }
     default:
-        error( TQString( i18n( "Unexpected token at %1:%2" ) ).arg( line ).arg( column ) );
+        error( TQString( i18n( "Unexpected token at %1:%2" ) ).tqarg( line ).tqarg( 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" ) ).arg( line ).arg( column ) );
+                error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).tqarg( line ).tqarg( column ) );
                 return;
             }
         }
diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc
index ae0b59bab..7dbabc002 100644
--- a/kformula/kformula_view.cc
+++ b/kformula/kformula_view.cc
@@ -22,7 +22,7 @@ class KPrinter;
 
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtimer.h>
 
 #include <kaction.h>
diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc
index c8d4a2843..dc2593202 100644
--- a/kformula/kformulawidget.cc
+++ b/kformula/kformulawidget.cc
@@ -68,11 +68,11 @@ void KFormulaWidget::setReadOnly(bool ro)
 
 void KFormulaWidget::paintEvent(TQPaintEvent* event)
 {
-    // Always repaint the buffer. This is not so much more work
-    // than it seems to be as each cursor movement requires a repaint.
+    // Always tqrepaint the buffer. This is not so much more work
+    // than it seems to be as each cursor movement requires a tqrepaint.
     TQPainter p( &buffer );
     //p.translate( -fr.x(), -fr.y() );
-    formulaView.draw( p, event->rect(), colorGroup() );
+    formulaView.draw( p, event->rect(), tqcolorGroup() );
 
     TQPainter painter;
     painter.begin(this);
diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp
index 74e8572b5..6428c1fd4 100644
--- a/kivio/kiviopart/config/kivio_config.cpp
+++ b/kivio/kiviopart/config/kivio_config.cpp
@@ -28,30 +28,30 @@ namespace Kivio {
 
   KoPageLayout Config::defaultPageLayout()
   {
-    KoPageLayout layout;
+    KoPageLayout tqlayout;
     
-    layout.format = KoPageFormat::formatFromString(Settings::format());
-    layout.orientation = Kivio::orientationFromString(Settings::orientation());
-    layout.ptTop = Settings::borderTop();
-    layout.ptBottom = Settings::borderBottom();
-    layout.ptLeft = Settings::borderLeft();
-    layout.ptRight = Settings::borderRight();
-    layout.ptWidth = Settings::width();
-    layout.ptHeight = Settings::height();
+    tqlayout.format = KoPageFormat::formatFromString(Settings::format());
+    tqlayout.orientation = Kivio::orientationFromString(Settings::orientation());
+    tqlayout.ptTop = Settings::borderTop();
+    tqlayout.ptBottom = Settings::borderBottom();
+    tqlayout.ptLeft = Settings::borderLeft();
+    tqlayout.ptRight = Settings::borderRight();
+    tqlayout.ptWidth = Settings::width();
+    tqlayout.ptHeight = Settings::height();
     
-    return layout;
+    return tqlayout;
   }
   
-  void Config::setDefaultPageLayout(const KoPageLayout& layout)
+  void Config::setDefaultPageLayout(const KoPageLayout& tqlayout)
   {
-    Settings::setFormat(KoPageFormat::formatString(layout.format));
-    Settings::setOrientation(Kivio::orientationString(layout.orientation));
-    Settings::setBorderTop(layout.ptTop);
-    Settings::setBorderBottom(layout.ptBottom);
-    Settings::setBorderLeft(layout.ptLeft);
-    Settings::setBorderRight(layout.ptRight);
-    Settings::setWidth(layout.ptWidth);
-    Settings::setHeight(layout.ptHeight);
+    Settings::setFormat(KoPageFormat::formatString(tqlayout.format));
+    Settings::setOrientation(Kivio::orientationString(tqlayout.orientation));
+    Settings::setBorderTop(tqlayout.ptTop);
+    Settings::setBorderBottom(tqlayout.ptBottom);
+    Settings::setBorderLeft(tqlayout.ptLeft);
+    Settings::setBorderRight(tqlayout.ptRight);
+    Settings::setWidth(tqlayout.ptWidth);
+    Settings::setHeight(tqlayout.ptHeight);
   }
 
   void Config::setGrid(const KivioGridData& /*grid*/)
diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h
index 651ec121a..b4df785a4 100644
--- a/kivio/kiviopart/config/kivio_config.h
+++ b/kivio/kiviopart/config/kivio_config.h
@@ -34,12 +34,12 @@ namespace Kivio {
   {
     public:
       /**
-      * Set the default page layout
+      * Set the default page tqlayout
       */
-      static void setDefaultPageLayout(const KoPageLayout& layout);
+      static void setDefaultPageLayout(const KoPageLayout& tqlayout);
 
       /**
-      * Get the default page layout
+      * Get the default page tqlayout
       */
       static KoPageLayout defaultPageLayout();
 
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index e2125cbb8..96fee8cbf 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev )
   painter.save();
   painter.setClipRegion(grayRegion, TQPainter::CoordPainter);
   painter.setPen(TQt::NoPen);
-  painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid));
+  painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid));
   painter.restore();
   // end of copy...
 
@@ -1006,7 +1006,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn
 
   if (m_pView->isSnapGuides())
   {
-    KoGuides::SnapStatus status = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus status = KoGuides::SNAP_NONE;
     KoPoint diff;
     m_guides.snapToGuideLines(p, 4, status, diff);
     p += diff;
@@ -1115,7 +1115,7 @@ void KivioCanvas::startPasteMoving()
   beginUnclippedSpawnerPainter();
   drawSelectedStencilsXOR();
 
-  // Build the list of old geometry
+  // Build the list of old tqgeometry
   KoRect *pData;
   m_lstOldGeometry.clear();
   KivioStencil* pStencil = activePage()->selectedStencils()->first();
@@ -1245,7 +1245,7 @@ void KivioCanvas::endPasteMoving()
 
   endUnclippedSpawnerPainter();
 
-  // Clear the list of old geometry
+  // Clear the list of old tqgeometry
   m_lstOldGeometry.clear();
   m_pasteMoving = false;
 }
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index 7989a4c6e..6381d76bf 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kbuttonbox.h>
 #include <tqstrlist.h>
 #include <tqptrlist.h>
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index d25bcfa06..a7dee3d4d 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqbuffer.h>
 #include <tqtabwidget.h>
 #include <tqpaintdevicemetrics.h>
@@ -119,7 +119,7 @@ KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* pa
   if ( !name )
   {
     TQString tmp( "Document%1" );	//lukas: FIXME
-    tmp = tmp.arg( s_docId++ );
+    tmp = tmp.tqarg( s_docId++ );
     setName( tmp.latin1() );
   }
 
@@ -307,7 +307,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis();
     TQString layoutName = styles.lookup(pageLayout, "PL");
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-layout-name", layoutName);
+    masterPage.addAttribute("style:page-tqlayout-name", layoutName);
     styles.lookup(masterPage, "Standard", false);
 
     if(!store->open("content.xml")) {
@@ -345,7 +345,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin();
 
     for ( ; it != styleList.end(); ++it) {
-        (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties");
+        (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties");
     }
 
     styleList = styles.styles(Kivio::STYLE_PAGE);
@@ -627,7 +627,7 @@ bool KivioDoc::completeLoading( KoStore* )
 KivioPage* KivioDoc::createPage()
 {
   TQString s( i18n("Page%1") );
-  s = s.arg( m_iPageId++ );
+  s = s.tqarg( m_iPageId++ );
 
   KivioPage* t = new KivioPage(m_pMap, s);
   t->setPageName(s,true);
diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp
index 944633668..179b6a49a 100644
--- a/kivio/kiviopart/kivio_icon_view.cpp
+++ b/kivio/kiviopart/kivio_icon_view.cpp
@@ -26,9 +26,9 @@
 #include "kivioglobal.h"
 #include "kivio_stencil.h"
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcursor.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h
index 8ceede64f..ec6fa1631 100644
--- a/kivio/kiviopart/kivio_icon_view.h
+++ b/kivio/kiviopart/kivio_icon_view.h
@@ -23,7 +23,7 @@
 #include <tqiconview.h>
 #include <tqptrlist.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqdragobject.h>
 
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 41fe984ba..0b60344ba 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -30,10 +30,10 @@
 #include <tqptrstack.h>
 #include <tqbuffer.h>
 #include <tqmessagebox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqpicture.h>
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdragobject.h>
 #include <tqmime.h>
 #include <tqsortedlist.h>
@@ -153,7 +153,7 @@ TQDomElement KivioPage::save( TQDomDocument& doc )
     page.setAttribute( "name", m_strName );
     page.setAttribute( "hide", (int)m_bPageHide );
 
-    // Create a child element for the page layout
+    // Create a child element for the page tqlayout
     TQDomElement layoutE = saveLayout( doc );
     page.appendChild( layoutE );
 
@@ -194,7 +194,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
     TQString layoutName = styles->lookup(pageLayout, "PL");
 
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-layout-name", layoutName);
+    masterPage.addAttribute("style:page-tqlayout-name", layoutName);
     TQString masterName = styles->lookup(masterPage, "MP");
 
     docWriter->addAttribute("draw:master-page-name", masterName);
@@ -324,17 +324,17 @@ bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles)
     return false;
   }
 
-  const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) );
+  const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) );
 
   if(!pageLayout) {
-    kdDebug(430000) << "Couldn't find the pagelayout!" << endl;
+    kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl;
     return false;
   }
 
   m_pPageLayout.loadOasis(*pageLayout);
 
   if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) {
-    kdDebug(430000) << "Non valid pagelayout!" << endl;
+    kdDebug(430000) << "Non valid pagetqlayout!" << endl;
     return false;
   }
 
@@ -941,7 +941,7 @@ void KivioPage::copy()
   KivioDragObject* kdo = new KivioDragObject();
   kdo->setStencilList(m_lstSelection);
   kdo->setStencilRect(getRectForAllSelectedStencils());
-  TQApplication::clipboard()->setData(kdo, TQClipboard::Clipboard);
+  TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard);
 }
 
 void KivioPage::cut()
@@ -987,7 +987,7 @@ void KivioPage::paste(KivioView* view)
   list.setAutoDelete(false);
   KivioDragObject kdo;
 
-  if(kdo.decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), list, this)) {
+  if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) {
     unselectAllStencils();
     KivioStencil* stencil = list.first();
 
diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h
index bc7daeca6..16d9db482 100644
--- a/kivio/kiviopart/kivio_page.h
+++ b/kivio/kiviopart/kivio_page.h
@@ -41,7 +41,7 @@ class DCOPObject;
 #include <tqintdict.h>
 #include <tqmemarray.h>
 #include <tqrect.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqwidget.h>
 #include <KoPoint.h>
 
diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp
index 249138b06..7f1ba9850 100644
--- a/kivio/kiviopart/kivio_spawner_drag.cpp
+++ b/kivio/kiviopart/kivio_spawner_drag.cpp
@@ -47,13 +47,13 @@ const char *KivioSpawnerDrag::format( int i ) const
         return 0L;
 }
 
-TQByteArray KivioSpawnerDrag::encodedData( const char *mime ) const
+TQByteArray KivioSpawnerDrag::tqencodedData( const char *mime ) const
 {
     TQByteArray a;
 
     if( TQString(mime) == "application/x-qiconlist" )
     {
-        a = TQIconDrag::encodedData(mime);
+        a = TQIconDrag::tqencodedData(mime);
     }
     else if( TQString(mime) == "kivio/stencilSpawner" )
     {
diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h
index cb4942211..9bd68dfea 100644
--- a/kivio/kiviopart/kivio_spawner_drag.h
+++ b/kivio/kiviopart/kivio_spawner_drag.h
@@ -33,7 +33,7 @@ public:
     virtual ~KivioSpawnerDrag();
 
     const char *format(int i) const;
-    TQByteArray encodedData( const char *mime ) const;
+    TQByteArray tqencodedData( const char *mime ) const;
     static bool canDecode( TQMimeSource* e );
     void append( const TQIconDragItem &item, const TQRect &pr,
                 const TQRect &tr, KivioStencilSpawner &spawner );
diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 25ea7af21..4b42fa09b 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -19,7 +19,7 @@
 #include "kivio_stackbar.h"
 #include "stencilbarbutton.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqapplication.h>
 
@@ -52,8 +52,8 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
   w->hide();
   w->setFocusPolicy(TQ_NoFocus);
 
-  setMinimumWidth( TQMAX(minimumSize().width(),w->minimumSize().width() ) );
-  setMaximumWidth( TQMAX(maximumSize().width(),w->maximumSize().width() ) );
+  setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) );
+  setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) );
 
   DragBarButton* b = new DragBarButton( title, this );
   b->setOrientation(orientation());
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
index 064c8b50f..f7ea91211 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
@@ -1,6 +1,6 @@
 #include "kivio_stencil_geometry_panel.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 282312a09..8d5294496 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -24,7 +24,7 @@
 #include <time.h>
 #include <assert.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqsplitter.h>
 #include <tqpushbutton.h>
@@ -37,7 +37,7 @@
 #include <tqtoolbutton.h>
 #include <tqtimer.h>
 #include <tqbutton.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqprogressbar.h>
 
 #include <tqstringlist.h>
@@ -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").arg(0).arg(0), PAGECOUNT_TEXT, sb);
+                                          "Page %1/%2").tqarg(0).tqarg(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").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-                        .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(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);
     m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
     addStatusBarItem(m_coordSLbl, 0, true);
   }
@@ -245,20 +245,20 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
           &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
   connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*)));
 
-  TQGridLayout* layout = new TQGridLayout(pRightSide);
-  layout->addWidget(hRuler, 0, 1);
-  layout->addWidget(vRuler, 1, 0);
-  layout->addWidget(canvasBase, 1, 1);
-  layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
-  layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
-  layout->setRowStretch(1, 10);
-  layout->setColStretch(1, 10);
+  TQGridLayout* tqlayout = new TQGridLayout(pRightSide);
+  tqlayout->addWidget(hRuler, 0, 1);
+  tqlayout->addWidget(vRuler, 1, 0);
+  tqlayout->addWidget(canvasBase, 1, 1);
+  tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
+  tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
+  tqlayout->setRowStretch(1, 10);
+  tqlayout->setColStretch(1, 10);
 
   TQWidget::setFocusPolicy( TQ_StrongFocus );
   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( repaint( const TQRegion&, bool ) ) );
+  connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
 
   setInstance(KivioFactory::global());
   if ( !m_pDoc->isReadWrite() )
@@ -390,7 +390,7 @@ void KivioView::setupActions()
   m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" );
   m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" );
   m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
-  connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
+  connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
 
   m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
   m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
@@ -1134,13 +1134,13 @@ void KivioView::ungroupStencils()
 void KivioView::selectAllStencils()
 {
     m_pActivePage->selectAllStencils();
-    m_pCanvas->repaint();
+    m_pCanvas->tqrepaint();
 }
 
 void KivioView::unselectAllStencils()
 {
     m_pActivePage->unselectAllStencils();
-    m_pCanvas->repaint();
+    m_pCanvas->tqrepaint();
 }
 
 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 repaint
+    // Mark the page as modified and tqrepaint
     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->repaint();
+    m_pCanvas->tqrepaint();
   }
 
   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").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-      .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(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);
     m_coordSLbl->setText(text);
   }
 }
@@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager()
 
 void KivioView::clipboardDataChanged()
 {
-  TQMimeSource* data = TQApplication::clipboard()->data();
+  TQMimeSource* data = TQApplication::tqclipboard()->data();
   KivioDragObject decoder(this);
   bool paste = decoder.canDecode(data);
   m_editPaste->setEnabled(paste);
@@ -2191,7 +2191,7 @@ int KivioView::vTextAlign()
 
 void KivioView::updatePageStatusLabel()
 {
-  TQString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count());
+  TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count());
   m_pageCountSLbl->setText(text);
 }
 
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index dde3103a7..c500f34a9 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%").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");
+  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");
   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%").arg(*it) );
+    lst.append( i18n("%1%").tqarg(*it) );
   setItems(lst);
-  setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom)));
+  setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom)));
 }
 
 void ZoomAction::setEditZoom( int zoom )
 {
-  const TQString zt(i18n("%1%").arg(zoom));
+  const TQString zt(i18n("%1%").tqarg(zoom));
   setEditText(zt);
 }
 #include "kivio_zoomaction.moc"
diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp
index 574afddce..35a6d7fff 100644
--- a/kivio/kiviopart/kiviodragobject.cpp
+++ b/kivio/kiviopart/kiviodragobject.cpp
@@ -22,7 +22,7 @@
 #include <tqcstring.h>
 #include <tqstringlist.h>
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 
@@ -56,7 +56,7 @@ const char* KivioDragObject::format(int i) const
   return id.format(i - NumEncodeFormats);
 }
 
-TQByteArray KivioDragObject::encodedData(const char* mimetype) const
+TQByteArray KivioDragObject::tqencodedData(const char* mimetype) const
 {
   if((m_encodeMimeList[0] == mimetype) ||
       (m_encodeMimeList[1] == mimetype))
@@ -90,7 +90,7 @@ bool KivioDragObject::decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, Kivio
 
   if(e->provides("application/vnd.kde.kivio")) {
     TQDomDocument doc("KivioSelection");
-    TQByteArray data = e->encodedData("application/vnd.kde.kivio");
+    TQByteArray data = e->tqencodedData("application/vnd.kde.kivio");
     doc.setContent( TQCString( data, data.size()+1 ) );
     KivioLayer l(page);
     ok = l.loadXML(doc.documentElement());
@@ -178,7 +178,7 @@ TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const
 
   TQImageDrag id;
   id.setImage(buffer.convertToImage());
-  return id.encodedData(mimetype);
+  return id.tqencodedData(mimetype);
 }
 
 #include "kiviodragobject.moc"
diff --git a/kivio/kiviopart/kiviodragobject.h b/kivio/kiviopart/kiviodragobject.h
index d441af197..99d632f76 100644
--- a/kivio/kiviopart/kiviodragobject.h
+++ b/kivio/kiviopart/kiviodragobject.h
@@ -36,7 +36,7 @@ class KivioDragObject : public TQDragObject
     KivioDragObject(TQWidget* dragSource = 0, const char* name = 0);
 
     const char* format(int i) const;
-    TQByteArray encodedData(const char* mimetype) const;
+    TQByteArray tqencodedData(const char* mimetype) const;
     bool canDecode(TQMimeSource*);
     bool decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page);
     void setStencilList(TQPtrList<KivioStencil> l);
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index 201eea08c..7479af081 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -44,52 +44,52 @@ struct PaperSizeDef {
   int unit;
 };
 
-void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& layout)
+void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout)
 {
-  XmlWriteFloat(e, "width", layout.ptWidth);
-  XmlWriteFloat(e, "height", layout.ptHeight);
-  XmlWriteFloat(e, "marginLeft", layout.ptLeft);
-  XmlWriteFloat(e, "marginRight", layout.ptRight);
-  XmlWriteFloat(e, "marginTop", layout.ptTop);
-  XmlWriteFloat(e, "marginBottom", layout.ptBottom);
-  XmlWriteString(e, "format", KoPageFormat::formatString(layout.format));
-  XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation));
+  XmlWriteFloat(e, "width", tqlayout.ptWidth);
+  XmlWriteFloat(e, "height", tqlayout.ptHeight);
+  XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft);
+  XmlWriteFloat(e, "marginRight", tqlayout.ptRight);
+  XmlWriteFloat(e, "marginTop", tqlayout.ptTop);
+  XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom);
+  XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format));
+  XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation));
 }
 
-// ## TODO: remove this method, now that layout.saveOasis() does it all
-KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout)
+// ## TODO: remove this method, now that tqlayout.saveOasis() does it all
+KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout)
 {
-  return layout.saveOasis();
+  return tqlayout.saveOasis();
 }
 
 KoPageLayout Kivio::loadPageLayout(const TQDomElement& e)
 {
-  KoPageLayout layout;
+  KoPageLayout tqlayout;
 
   if(e.hasAttribute("unit")) {
     // Compatibility with Kivio <= 1.2.x
     kdDebug(43000) << "Compatibility mode..." << endl;
     KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0));
-    layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
-    layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
-    layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
-    layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
-    layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
-    layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
-    Kivio::setFormatOrientation(layout);
+    tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
+    tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
+    tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
+    tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
+    tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
+    tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
+    Kivio::setFormatOrientation(tqlayout);
     kdDebug(43000) << "Ready." << endl;
   } else {
-    layout.ptWidth = XmlReadFloat(e, "width", 0.0);
-    layout.ptHeight = XmlReadFloat(e, "height", 0.0);
-    layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
-    layout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
-    layout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
-    layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
-    layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
-    layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
+    tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0);
+    tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0);
+    tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
+    tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
+    tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
+    tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
+    tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
+    tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
   }
 
-  return layout;
+  return tqlayout;
 }
 
 KoUnit::Unit Kivio::convToKoUnit(int tkUnit)
@@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const TQString& s)
   return PG_PORTRAIT;
 }
 
-void Kivio::setFormatOrientation(KoPageLayout& layout)
+void Kivio::setFormatOrientation(KoPageLayout& tqlayout)
 {
   const PaperSizeDef PapersTable[] = {
     {"A0",841,1189,KoUnit::U_MM},
@@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& layout)
   PaperSizeDef sizeDef = PapersTable[0];
   bool found = false;
   float width, height;
-  layout.format = PG_CUSTOM;
-  layout.orientation = PG_PORTRAIT;
+  tqlayout.format = PG_CUSTOM;
+  tqlayout.orientation = PG_PORTRAIT;
 
   while((sizeDef.unit != -2) && !found) {
     width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit));
     height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit));
 
-    if((layout.ptWidth == width) && (layout.ptHeight == height)) {
-      layout.format = KoPageFormat::formatFromString(sizeDef.title);
-      layout.orientation = PG_PORTRAIT;
+    if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) {
+      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
+      tqlayout.orientation = PG_PORTRAIT;
       found = true;
-    } else if((layout.ptWidth == height) && (layout.ptHeight == width)) {
-      layout.format = KoPageFormat::formatFromString(sizeDef.title);
-      layout.orientation = PG_LANDSCAPE;
+    } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) {
+      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
+      tqlayout.orientation = PG_LANDSCAPE;
       found = true;
     }
 
diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h
index cd0fe3d68..1e94f79b3 100644
--- a/kivio/kiviopart/kivioglobal.h
+++ b/kivio/kiviopart/kivioglobal.h
@@ -37,12 +37,12 @@ namespace Kivio
   };
 
   /**
-   * Save a page layout to a TQDomElement
+   * Save a page tqlayout to a TQDomElement
    */
-  void savePageLayout(TQDomElement& e, const KoPageLayout& layout);
-  KoGenStyle savePageLayout(const KoPageLayout& layout);
+  void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout);
+  KoGenStyle savePageLayout(const KoPageLayout& tqlayout);
   /**
-   * Load a page layout from a TQDomElement
+   * Load a page tqlayout from a TQDomElement
    */
   KoPageLayout loadPageLayout(const TQDomElement& e);
   /**
@@ -57,7 +57,7 @@ namespace Kivio
    * Return the orientation based on the string
    */
   KoOrientation orientationFromString(const TQString& s);
-  void setFormatOrientation(KoPageLayout& layout);
+  void setFormatOrientation(KoPageLayout& tqlayout);
 
   /**
    * Load a KoSize from a TQDomElement
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.cpp b/kivio/kiviopart/kiviosdk/diapathparser.cpp
index e071a8e6f..1af85056b 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 *shape, float xscale, float yscale, float lowestx, float lowesty) :
-	SVGPathParser(), m_doc(doc), m_shape(shape),
+DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty) :
+	SVGPathParser(), m_doc(doc), m_tqshape(tqshape),
 	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_shape->appendChild(kivioPointElement);
+	m_tqshape->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_shape->appendChild(kivioPointElement);
+	m_tqshape->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_shape->appendChild(kivioPointElement);
+	m_tqshape->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_shape->appendChild(kivioPointElement);
+	m_tqshape->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_shape->appendChild(kivioPointElement);
+	m_tqshape->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_shape->appendChild(kivioPointElement);
+	m_tqshape->appendChild(kivioPointElement);
 	lastX = currentX;
 	lastY = currentY;
 }
diff --git a/kivio/kiviopart/kiviosdk/diapathparser.h b/kivio/kiviopart/kiviosdk/diapathparser.h
index 5308c468c..0a9439f63 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 *shape, float xscale, float yscale, float lowestx, float lowesty);
+		DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, 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_shape;
+		TQDomElement *m_tqshape;
 		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 8162bcd2f..b42d650b2 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 * );
 
 
-    // geometry management
+    // tqgeometry 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 1e0a76de7..f7e2dddbe 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 * );
 
 
-    // geometry management
+    // tqgeometry 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 b290fb621..e41f5788f 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 geometry
+    // Copy the tqgeometry
     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 3dd8b428b..b67efc23e 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp
@@ -330,7 +330,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val )
  * across two quadrants, you need to determine which side of the test point it crossed, and then
  * either add or subtract 2.
  *
- * Quad layout:
+ * Quad tqlayout:
  *   1 2
  *   4 3
  */
@@ -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]").arg(val.x()).arg(val.y()).arg(val.width()).arg(val.height()) );
+    e.setAttribute( att, TQString("[%1,%2,%3,%4]").tqarg(val.x()).tqarg(val.y()).tqarg(val.width()).tqarg(val.height()) );
 }
 
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp
index d408bee64..0208f932b 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 geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the X coordinate to a new value, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry 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 geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the Y coordinate to a new value, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry 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 geometry should be updated (def=true)
+ * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true)
  *
  * Sets the X & Y coordinates to new values, and optionally
- * updates the stencil's geometry if updateStencil is true.
+ * updates the stencil's tqgeometry 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 ada33c4c1..4407d2d09 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("shape");
+	TQDomNode diaMain = dia.namedItem("tqshape");
 
 	// Set "creator" attribute
 	TQDomElement firstElement = kivio.createElement("KivioShapeStencil");
@@ -250,7 +250,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 	//}
 	//else
 	{
-		// scale the shape to be close to 30 by 30
+		// scale the tqshape to be close to 30 by 30
 		m_yscale = 30.0/(m_highesty - m_lowesty);
 		m_xscale = 30.0/(m_highestx - m_lowestx);
 	}
@@ -294,7 +294,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Rectangle");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 					kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
 					kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
 					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale));
@@ -309,7 +309,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
 					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
 					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
@@ -324,7 +324,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
 					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
 					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
@@ -339,7 +339,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "LineArray");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					TQDomElement lineArrayElement = kivio.createElement("Line");
 					lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
@@ -358,7 +358,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polyline");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
 					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -387,7 +387,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polygon");
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
 					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 						kivioShape.setAttribute("type", "OpenPath");
 					}
 
-					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					DiaPathParser *dpp = new DiaPathParser(&kivio,
 						&kivioShape, m_xscale, m_yscale,
diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h
index ea776f20b..4be7303b8 100644
--- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h
@@ -19,7 +19,7 @@
 #ifndef KIVIO_FILL_STYLE_H
 #define KIVIO_FILL_STYLE_H
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqdom.h>
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
index f966dc07f..cc8eb0e32 100644
--- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp
@@ -25,7 +25,7 @@ KivioView *view;
 #include "kivio_page.h"
 
 #include <tqpainter.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <kdebug.h>
 #include <math.h>
@@ -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","shapes");
+                            "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","tqshapes");
 
    resizeCode = "";
 }
@@ -406,45 +406,45 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined )
 {
   KoZoomHandler* zoomHandler = d->zoomHandler;
 
-  PyObject *shapes = PyDict_Values( PyDict_GetItemString( vars, "shapes" ) );
+  PyObject *tqshapes = PyDict_Values( PyDict_GetItemString( vars, "tqshapes" ) );
 
-  if ( !shapes ) {
+  if ( !tqshapes ) {
     return;
   }
 
-  int size = PyList_Size( shapes );
+  int size = PyList_Size( tqshapes );
 
   for ( int i=0; i<size; i++ ) {
-    PyObject *shape = PyList_GetItem( shapes, i );
-    if ( !PyDict_Check(shape) )
+    PyObject *tqshape = PyList_GetItem( tqshapes, i );
+    if ( !PyDict_Check(tqshape) )
       continue;
 
     int fill = KivioFillStyle::kcsNone;
 
-    // if style dosn't defined for shape, applay default for stencil
+    // if style dosn't defined for tqshape, applay default for stencil
     setStyle( d, PyDict_GetItemString( vars, "style" ) , fill );
-    setStyle( d, shape, fill );
+    setStyle( d, tqshape, fill );
 
     if ( isSelected() )
-      setStyle( d, PyDict_GetItemString( shape, "selected" ) , fill );
+      setStyle( d, PyDict_GetItemString( tqshape, "selected" ) , fill );
 
     if ( outlined )
         fill = KivioFillStyle::kcsNone;
 
-    TQString stype = getStringFromDict( shape, "type" );
+    TQString stype = getStringFromDict( tqshape, "type" );
     stype = stype.lower();
 
-    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"));
+    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"));
 
     // get points list
     TQPtrList<KivioPoint> points;
     points.setAutoDelete(true);
-    PyObject *pyPoints = PyDict_GetItemString( shape, "points" );
+    PyObject *pyPoints = PyDict_GetItemString( tqshape, "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(shape,"text");
+      TQString text = getStringFromDict(tqshape,"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(shape,"a1");
-      double a2 = getDoubleFromDict(shape,"a2");
+      double a1 = getDoubleFromDict(tqshape,"a1");
+      double a2 = getDoubleFromDict(tqshape,"a2");
       d->painter->drawArc(x,y,w,h,a1,a2);
     }
 
     if ( stype == "roundrect" ) {
-      double rx = zoomHandler->zoomItX(getDoubleFromDict(shape,"rx"));
-      double ry = zoomHandler->zoomItY(getDoubleFromDict(shape,"ry"));
+      double rx = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"rx"));
+      double ry = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"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,"shapes"), "text" );
+   PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "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,"shapes"), "text" );
+    PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" );
     if ( to ) {
         return getStringFromDict(to, "text");
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
index 307a86e3c..07f005fa1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
@@ -23,9 +23,9 @@
 
 #include <tqimage.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqsimplerichtext.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <kdebug.h>
 
@@ -549,7 +549,7 @@ void KivioScreenPainter::drawPolyline( TQPointArray &pArray )
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
   m_pPainter->setBrush( TQBrush::NoBrush );
 
-  m_pPainter->drawPolyline( pArray, 0, pArray.size() );
+  m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() );
 }
 
 void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
@@ -586,7 +586,7 @@ void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
   m_pPainter->setBrush(b);
 
-  m_pPainter->drawPolygon( pArray, true );
+  m_pPainter->tqdrawPolygon( pArray, true );
   m_pPainter->setBrushOrigin(0, 0);
 }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.cpp b/kivio/kiviopart/kiviosdk/kivio_shape.cpp
index 302c65479..dad8459a6 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_shapeData.copyInto( &m_shapeData );
+    source.m_tqshapeData.copyInto( &m_tqshapeData );
 }
 
 
@@ -68,7 +68,7 @@ void KivioShape::copyInto( KivioShape *pTarget ) const
     if( !pTarget )
         return;
 
-    m_shapeData.copyInto( &(pTarget->m_shapeData) );
+    m_tqshapeData.copyInto( &(pTarget->m_tqshapeData) );
 }
 
 
@@ -84,13 +84,13 @@ bool KivioShape::loadXML( const TQDomElement &e )
     TQDomNode node = e.firstChild();
 
     TQString name = XmlReadString( e, "name", "" );
-    m_shapeData.setName( name );
-    m_shapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "shapeType", -1 ));
+    m_tqshapeData.setName( name );
+    m_tqshapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "tqshapeType", -1 ));
 
-    if( m_shapeData.name().isEmpty() ||
-        m_shapeData.shapeType() == -1 )
+    if( m_tqshapeData.name().isEmpty() ||
+        m_tqshapeData.tqshapeType() == -1 )
     {
-       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown shape or bad name read. Shape load aborted." << endl;
+       kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown tqshape or bad name read. Shape load aborted." << endl;
        return false;
     }
 
@@ -101,7 +101,7 @@ bool KivioShape::loadXML( const TQDomElement &e )
 
         if( nodeName == "KivioShapeData" )
         {
-            m_shapeData.loadXML( ele );
+            m_tqshapeData.loadXML( ele );
         }
 
         node = node.nextSibling();
@@ -120,17 +120,17 @@ TQDomElement KivioShape::saveXML( TQDomDocument &doc )
 {
     TQDomElement e = doc.createElement("KivioShape");
 
-    XmlWriteString( e, "name", m_shapeData.m_name );
-    XmlWriteInt( e, "shapeType", m_shapeData.m_shapeType );
+    XmlWriteString( e, "name", m_tqshapeData.m_name );
+    XmlWriteInt( e, "tqshapeType", m_tqshapeData.m_tqshapeType );
 
-    e.appendChild( m_shapeData.saveXML( doc ) );
+    e.appendChild( m_tqshapeData.saveXML( doc ) );
 
     return e;
 }
 
 
 /**
- * Loads a shape of type arc
+ * Loads a tqshape 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 shape of type closed-path.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstClosedPath;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstClosedPath;
+    pShape->m_tqshapeData.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_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
     
         node = node.nextSibling();
@@ -196,7 +196,7 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type bezier
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstBezier;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstBezier;
+    pShape->m_tqshapeData.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 shape." << endl;
+	       kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found.  Aborting tqshape." << endl;
                 delete pPoint;
                 delete pShape;
                 return NULL;
             }
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
     }
     
-    if( pShape->m_shapeData.m_pOriginalPointList->count() != 4 )
+    if( pShape->m_tqshapeData.m_pOriginalPointList->count() != 4 )
     {
-       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, shape aborted" << endl;
+       kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, tqshape aborted" << endl;
         delete pShape;
         return NULL;
     }
@@ -258,7 +258,7 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type ellipse.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstEllipse;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstEllipse;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    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 ) );
+    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 ) );
         
     // 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_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -303,7 +303,7 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type line-array.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstLineArray;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstLineArray;
+    pShape->m_tqshapeData.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_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = new KivioPoint( XmlReadFloat( lineElement, "x2", 0.0f ), XmlReadFloat( lineElement, "y2", 0.0f ) );
-            pShape->m_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -355,7 +355,7 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type open-path.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstOpenPath;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstOpenPath;
+    pShape->m_tqshapeData.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_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -403,7 +403,7 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type pie.
+ * Loads a tqshape 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 shape of type polygon.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolygon;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolygon;
+    pShape->m_tqshapeData.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_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioFillStyle" )
         {
-            pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -469,7 +469,7 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type polyline.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolyline;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolyline;
+    pShape->m_tqshapeData.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_shapeData.m_pOriginalPointList->append( pPoint );
+            pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint );
             pPoint = NULL;
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -517,7 +517,7 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type rectangle.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRectangle;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRectangle;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    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 ) );
+    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 ) );
     
     // 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_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -564,7 +564,7 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type round rectangle.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
     
     // Load the type, name, and lineWidth properties
-    pShape->m_shapeData.m_shapeType = KivioShapeData::kstRoundRectangle;
-    pShape->m_shapeData.m_name = XmlReadString( e, "name", "" );
+    pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRoundRectangle;
+    pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" );
 
-    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 ) );
+    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 ) );
     
     // 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_shapeData.m_pOriginalPointList->append( pPoint );
+    pShape->m_tqshapeData.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_shapeData.m_pFillStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() );
         }
         else if( nodeName == "KivioLineStyle" )
         {
-            pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() );
+            pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() );
         }
 
         node = node.nextSibling();
@@ -616,7 +616,7 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e )
 
 
 /**
- * Loads a shape of type textbox.
+ * Loads a tqshape 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 shape to load into
+    // Create the new tqshape to load into
     pShape = new KivioShape();
 
     // Load the type and name
-    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.setShapeType(KivioShapeData::kstTextBox);
+    pShape->m_tqshapeData.setName( XmlReadString( e, "name", "" ) );
+    pShape->m_tqshapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0)));
 
-    pShape->m_shapeData.m_position.set( 
+    pShape->m_tqshapeData.m_position.set( 
        XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) );
-    pShape->m_shapeData.m_dimensions.set( 
+    pShape->m_tqshapeData.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_shapeData.setTextStyle( &ts );
+	  pShape->m_tqshapeData.setTextStyle( &ts );
        }
 
        node = node.nextSibling();
     }
 //    TQString text = XmlReadString( e, "text", "" );
-//    pShape->m_shapeData.setText( text );
+//    pShape->m_tqshapeData.setText( text );
 
 
     return pShape;
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.h b/kivio/kiviopart/kiviosdk/kivio_shape.h
index 42adfed6e..c83607d76 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape.h
@@ -26,7 +26,7 @@
 class KivioShape
 {
 protected:
-    KivioShapeData m_shapeData; // The data inside this shape
+    KivioShapeData m_tqshapeData; // The data inside this tqshape
 
 public:
     KivioShape();
@@ -39,9 +39,9 @@ public:
     bool loadXML( const TQDomElement & );
     TQDomElement saveXML( TQDomDocument & );
 
-    KivioShapeData::KivioShapeType shapeType() { return m_shapeData.shapeType(); }
+    KivioShapeData::KivioShapeType tqshapeType() { return m_tqshapeData.tqshapeType(); }
 
-    KivioShapeData *shapeData() { return &m_shapeData; }
+    KivioShapeData *tqshapeData() { return &m_tqshapeData; }
 
     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 431d79877..5305fe13a 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 shape type
+ * Struct for holding information about a tqshape type
  */
 struct KivioShapeTypeInfo
 {
@@ -36,10 +36,10 @@ struct KivioShapeTypeInfo
 };
 
 /*
- * Array of shape info used for loading/saving.
+ * Array of tqshape info used for loading/saving.
  */
 static const int numShapeInfo = 12;
-static struct KivioShapeTypeInfo shapeInfo[] = {
+static struct KivioShapeTypeInfo tqshapeInfo[] = {
     { "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_shapeType = kstNone;
+    m_tqshapeType = 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_shapeType = source.m_shapeType;
+    m_tqshapeType = source.m_tqshapeType;
     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 shape, allocate a text data struct and copy the info
-    if( m_shapeType == kstTextBox )
+    // If this is a text tqshape, allocate a text data struct and copy the info
+    if( m_tqshapeType == 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_shapeType = m_shapeType;
+    pTarget->m_tqshapeType = m_tqshapeType;
     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_shapeType == kstTextBox )
+    if( m_tqshapeType == 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_shapeType == kstTextBox )
+            if( m_tqshapeType == 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_shapeType==kstTextBox
+            } // end if m_tqshapeType==kstTextBox
         }
         else if( nodeName == "KivioText" )
         {
             // First make sure we are a text box
-            if( m_shapeType == kstTextBox )
+            if( m_tqshapeType == 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_shapeType==kstTextBox
+            } // end if m_tqshapeType==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_shapeType == kstTextBox )
+    if( m_tqshapeType == 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 shape node
-    //XmlWriteInt( e, "shapeType", m_shapeType );
+    // Shape type & name are stored in the tqshape node
+    //XmlWriteInt( e, "tqshapeType", m_tqshapeType );
     //XmlWriteString( e, "name", m_name );
 
     return e;
 }
 
 
-KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const TQString &str )
+KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQString &str )
 {
 
     for( int i=0; i<numShapeInfo; i++ )
     {
-        if( str.compare( shapeInfo[i].name )==0 )
-            return shapeInfo[i].type;
+        if( str.compare( tqshapeInfo[i].name )==0 )
+            return tqshapeInfo[i].type;
     }
 
     return kstNone;
@@ -442,7 +442,7 @@ KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const TQStri
 
 void KivioShapeData::setShapeType( KivioShapeType st )
 {
-    m_shapeType = st;
+    m_tqshapeType = 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 bd89dcc8e..f97e5ec9c 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 shape
+    TQString m_text;                                 // The text inside this tqshape
     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 alignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
 };
 
 /**
@@ -52,7 +52,7 @@ class KivioShapeData
 {
 public:
     /**
-     * The possible shape types.
+     * The possible tqshape types.
      */
     typedef enum {
         kstNone = 0,
@@ -75,7 +75,7 @@ protected:
 
     TQPtrList <KivioPoint> *m_pOriginalPointList;       // Original point list loaded from an SML file
 
-    KivioShapeType m_shapeType;                     // The shape type
+    KivioShapeType m_tqshapeType;                     // The tqshape 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 shape
+    TQString m_name;                                 // The name of this tqshape
 
     KivioTextStyle *m_pTextData;                    // A pointer to text data (if applicable, e.g. TextBox)
 
@@ -98,10 +98,10 @@ public:
     virtual TQDomElement saveXML( TQDomDocument & );
 
 
-    KivioShapeType shapeType() const { return m_shapeType; }
+    KivioShapeType tqshapeType() const { return m_tqshapeType; }
     void setShapeType( KivioShapeType st );
 
-    static KivioShapeType shapeTypeFromString( const TQString & );
+    static KivioShapeType tqshapeTypeFromString( 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 f1ca2c8f9..fbdad979f 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->shapeData();
+    pShapeData = pShape->tqshapeData();
 
-    switch( pShapeData->shapeType() )
+    switch( pShapeData->tqshapeType() )
     {
     case KivioShapeData::kstArc:
         drawArc();
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
index 035ede787..6f00df1aa 100644
--- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp
@@ -37,9 +37,9 @@
 
 #include <tqdom.h>
 #include <tqpainter.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqrect.h>
 #include <tqbitmap.h>
 #include <kdebug.h>
@@ -50,7 +50,7 @@
 /**
  * Default constructor
  *
- * Allocates a new shape list, connector targets, and original connector targets.
+ * Allocates a new tqshape 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 shape we are supposed to load into
+            // Locate the tqshape 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 shape in the shape list by name.
+ * Locates a tqshape in the tqshape 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->shapeData()->name() == name )
+        if( pShape->tqshapeData()->name() == name )
         {
             return pShape;
         }
@@ -233,7 +233,7 @@ TQDomElement KivioSMLStencil::saveXML( TQDomDocument &doc )
     }
     e.appendChild( clE );
 
-    // The shape list
+    // The tqshape list
     KivioShape *pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -268,7 +268,7 @@ KivioStencil *KivioSMLStencil::duplicate()
     pNewStencil->m_pSpawner = m_pSpawner;
 
 
-    // Copy the shape list
+    // Copy the tqshape list
     pShape = m_pShapeList->first();
     while( pShape )
     {
@@ -313,9 +313,9 @@ void KivioSMLStencil::paintOutline( KivioIntraStencilData *pData )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShapeData = pShape->shapeData();
+        pShapeData = pShape->tqshapeData();
 
-        switch( pShapeData->shapeType() )
+        switch( pShapeData->tqshapeType() )
         {
             case KivioShapeData::kstArc:
                 drawOutlineArc( pShape, pData );
@@ -396,7 +396,7 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData
     KivioPoint *pPosition, *pDimensions;
     KivioPoint *pPoint;
 
-    pShapeData = pShape->shapeData();
+    pShapeData = pShape->tqshapeData();
     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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -546,7 +546,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -606,7 +606,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS
   KivioShapeData *pShapeData;
   KivioPoint *pPosition, *pDimensions;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -643,7 +643,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData();
+    pShapeData = pShape->tqshapeData();
 
-    switch( pShapeData->shapeType() )
+    switch( pShapeData->tqshapeType() )
     {
       case KivioShapeData::kstArc:
         drawArc( pShape, pData );
@@ -873,7 +873,7 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
 
   double defWidth = m_pSpawner->defWidth();
   double defHeight = m_pSpawner->defHeight();
 
 
   painter = pData->painter;
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1089,7 +1089,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData *
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1174,7 +1174,7 @@ void KivioSMLStencil::drawRoundRectangle( KivioShape *pShape, KivioIntraStencilD
   KivioPoint *pPosition, *pDimensions;
   KivioPoint *pPoint;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
   pPosition = pShapeData->position();
   pDimensions = pShapeData->dimensions();
 
@@ -1221,7 +1221,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD
   KivioShapeData *pShapeData;
   TQPtrList <KivioPoint> *pList;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   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->shapeData();
+  KivioShapeData *pShapeData = pShape->tqshapeData();
   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->shapeData()->lineStyle()->setColor( c );
+        pShape->tqshapeData()->lineStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1375,7 +1375,7 @@ void KivioSMLStencil::setBGColor( TQColor c )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->fillStyle()->setColor( c );
+        pShape->tqshapeData()->fillStyle()->setColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) );
+        pShape->tqshapeData()->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->shapeData()->setTextColor( c );
+        pShape->tqshapeData()->setTextColor( c );
 
         pShape = m_pShapeList->next();
     }
@@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const TQFont &f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->setTextFont( f );
+        pShape->tqshapeData()->setTextFont( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1439,7 +1439,7 @@ void KivioSMLStencil::setLineWidth( double f )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setWidth( f );
+        pShape->tqshapeData()->lineStyle()->setWidth( f );
 
         pShape = m_pShapeList->next();
     }
@@ -1451,7 +1451,7 @@ void KivioSMLStencil::setLinePattern(int p)
 
     while( pShape )
     {
-        pShape->shapeData()->lineStyle()->setStyle( p );
+        pShape->tqshapeData()->lineStyle()->setStyle( p );
         pShape = m_pShapeList->next();
     }
 }
@@ -1550,7 +1550,7 @@ KivioConnectorTarget *KivioSMLStencil::connectToTarget( KivioConnectorPoint *p,
 
 
 /**
- * Updates the geometry of this stencil.
+ * Updates the tqgeometry 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->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->textFont();
+            return pShape->tqshapeData()->textFont();
         }
 
         pShape = m_pShapeList->next();
@@ -1609,9 +1609,9 @@ TQColor KivioSMLStencil::textColor()
   pShape = m_pShapeList->first();
   while( pShape )
   {
-    if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+    if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
     {
-      return pShape->shapeData()->textColor();
+      return pShape->tqshapeData()->textColor();
     }
 
     pShape = m_pShapeList->next();
@@ -1631,8 +1631,8 @@ void KivioSMLStencil::setHTextAlign(int i)
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
-            pShape->shapeData()->setHTextAlign( i );
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+            pShape->tqshapeData()->setHTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1640,7 +1640,7 @@ void KivioSMLStencil::setHTextAlign(int i)
 
 
 /**
- * Set the vertical alignment of this stencil
+ * Set the vertical tqalignment 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->shapeData()->shapeType() == KivioShapeData::kstTextBox )
-            pShape->shapeData()->setVTextAlign( i );
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
+            pShape->tqshapeData()->setVTextAlign( i );
 
         pShape = m_pShapeList->next();
     }
@@ -1659,7 +1659,7 @@ void KivioSMLStencil::setVTextAlign(int i)
 
 
 /**
- * Get the horizontal alignment of this stencil.
+ * Get the horizontal tqalignment of this stencil.
  */
 int KivioSMLStencil::hTextAlign()
 {
@@ -1668,9 +1668,9 @@ int KivioSMLStencil::hTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->hTextAlign();
+            return pShape->tqshapeData()->hTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1681,7 +1681,7 @@ int KivioSMLStencil::hTextAlign()
 
 
 /**
- * Get the vertical text alignment of this stencil.
+ * Get the vertical text tqalignment of this stencil.
  */
 int KivioSMLStencil::vTextAlign()
 {
@@ -1690,9 +1690,9 @@ int KivioSMLStencil::vTextAlign()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->vTextAlign();
+            return pShape->tqshapeData()->vTextAlign();
         }
 
         pShape = m_pShapeList->next();
@@ -1712,9 +1712,9 @@ TQString KivioSMLStencil::text()
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            return pShape->shapeData()->text();
+            return pShape->tqshapeData()->text();
         }
 
         pShape = m_pShapeList->next();
@@ -1734,9 +1734,9 @@ void KivioSMLStencil::setText( const TQString &t )
     pShape = m_pShapeList->first();
     while( pShape )
     {
-        if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox )
+        if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox )
         {
-            pShape->shapeData()->setText(t);
+            pShape->tqshapeData()->setText(t);
         }
 
         pShape = m_pShapeList->next();
@@ -1753,7 +1753,7 @@ double KivioSMLStencil::lineWidth()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->lineStyle()->width();
+        return pShape->tqshapeData()->lineStyle()->width();
 
     return 1.0f;
 }
@@ -1763,7 +1763,7 @@ int KivioSMLStencil::linePattern()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return pShape->shapeData()->lineStyle()->style();
+        return pShape->tqshapeData()->lineStyle()->style();
 
     return 1;
 }
@@ -1777,7 +1777,7 @@ TQColor KivioSMLStencil::fgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->lineStyle()->color();
+        return pShape->tqshapeData()->lineStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -1792,7 +1792,7 @@ TQColor KivioSMLStencil::bgColor()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->fillStyle()->color();
+        return pShape->tqshapeData()->fillStyle()->color();
 
     return TQColor(0,0,0);
 }
@@ -1803,7 +1803,7 @@ int KivioSMLStencil::fillPattern()
 
     pShape = m_pShapeList->first();
     if( pShape )
-        return pShape->shapeData()->fillStyle()->brushStyle();
+        return pShape->tqshapeData()->fillStyle()->brushStyle();
 
     return 1;
 }
@@ -1923,7 +1923,7 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck
   TQPtrList<KivioPoint> *pList;
   KoPoint *pPoints;
 
-  pShapeData = pShape->shapeData();
+  pShapeData = pShape->tqshapeData();
 
   defWidth = m_pSpawner->defWidth();
   defHeight = m_pSpawner->defHeight();
@@ -2001,7 +2001,7 @@ KivioLineStyle KivioSMLStencil::lineStyle()
     KivioShape *pShape = m_pShapeList->first();
 
     if( pShape )
-        return *(pShape->shapeData()->lineStyle());
+        return *(pShape->tqshapeData()->lineStyle());
 
     return KivioLineStyle();
 }
@@ -2012,7 +2012,7 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls)
 
     while( pShape )
     {
-        pShape->shapeData()->setLineStyle(ls);;
+        pShape->tqshapeData()->setLineStyle(ls);;
         pShape = m_pShapeList->next();
     }
 }
@@ -2032,12 +2032,12 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   
   while(pShape)
   {
-    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox)
+    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox)
     {
-      double x = pShape->shapeData()->x();
-      double y = pShape->shapeData()->y();
-      double x2 = pShape->shapeData()->w() + x;
-      double y2 = pShape->shapeData()->h() + y;
+      double x = pShape->tqshapeData()->x();
+      double y = pShape->tqshapeData()->y();
+      double x2 = pShape->tqshapeData()->w() + x;
+      double y2 = pShape->tqshapeData()->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->shapeData()->name();
+        return pShape->tqshapeData()->name();
       }
       
       if(!first) {
@@ -2063,7 +2063,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p)
   }
   
   if(first) {
-    return first->shapeData()->name();
+    return first->tqshapeData()->name();
   }
   
   return TQString();
@@ -2075,9 +2075,9 @@ void KivioSMLStencil::setText(const TQString& text, const TQString& name)
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      pShape->shapeData()->setText(text);
+      pShape->tqshapeData()->setText(text);
       return;
     }
 
@@ -2091,9 +2091,9 @@ TQString KivioSMLStencil::text(const TQString& name)
   
   while(pShape)
   {
-    if(pShape->shapeData()->name() == name)
+    if(pShape->tqshapeData()->name() == name)
     {
-      return pShape->shapeData()->text();
+      return pShape->tqshapeData()->text();
     }
 
     pShape = m_pShapeList->next();
@@ -2128,7 +2128,7 @@ bool KivioSMLStencil::hasTextBox() const
 {
   KivioShape* pShape = m_pShapeList->first();
   while(pShape) {
-    if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) {
+    if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) {
       return true;
     }
 
@@ -2140,89 +2140,89 @@ bool KivioSMLStencil::hasTextBox() const
 
 TQColor KivioSMLStencil::textColor(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return textColor();
 
-  return shape->shapeData()->textColor();
+  return tqshape->tqshapeData()->textColor();
 }
 
 void KivioSMLStencil::setTextColor(const TQString& textBoxName, const TQColor& color)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  // If we didn't find the shape set the color stencil wide
-  if(!shape) {
+  // If we didn't find the tqshape set the color stencil wide
+  if(!tqshape) {
     setTextColor(color);
     return;
   }
 
-  shape->shapeData()->setTextColor(color);
+  tqshape->tqshapeData()->setTextColor(color);
 }
 
 TQFont KivioSMLStencil::textFont(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return textFont();
 
-  return shape->shapeData()->textFont();
+  return tqshape->tqshapeData()->textFont();
 }
 
 void KivioSMLStencil::setTextFont(const TQString& textBoxName, const TQFont& font)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setTextFont(font);
     return;
   }
 
-  shape->shapeData()->setTextFont(font);
+  tqshape->tqshapeData()->setTextFont(font);
 }
 
 int KivioSMLStencil::hTextAlign(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return hTextAlign();
 
-  return shape->shapeData()->hTextAlign();
+  return tqshape->tqshapeData()->hTextAlign();
 }
 
 int KivioSMLStencil::vTextAlign(const TQString& textBoxName)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape)
+  if(!tqshape)
     return vTextAlign();
 
-  return shape->shapeData()->vTextAlign();
+  return tqshape->tqshapeData()->vTextAlign();
 }
 
 void KivioSMLStencil::setHTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setHTextAlign(align);
     return;
   }
 
-  shape->shapeData()->setHTextAlign(align);
+  tqshape->tqshapeData()->setHTextAlign(align);
 }
 
 void KivioSMLStencil::setVTextAlign(const TQString& textBoxName, int align)
 {
-  KivioShape* shape = locateShape(textBoxName);
+  KivioShape* tqshape = locateShape(textBoxName);
 
-  if(!shape) {
+  if(!tqshape) {
     setVTextAlign(align);
     return;
   }
 
-  shape->shapeData()->setVTextAlign(align);
+  tqshape->tqshapeData()->setVTextAlign(align);
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h
index c9ebcc6c0..30e53e936 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> *shapeList() { return m_pShapeList; }
+    virtual TQPtrList<KivioShape> *tqshapeList() { 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 d18caae89..588a468e3 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 shape from an XML node.
+ * Loads a tqshape from an XML node.
  */
-void KivioSMLStencilSpawner::loadShape( TQDomNode &shapeNode )
+void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode )
 {
     KivioShapeData::KivioShapeType t;
     KivioShape *pShape = NULL;
-    TQDomElement shapeElement = shapeNode.toElement();
+    TQDomElement tqshapeElement = tqshapeNode.toElement();
 
-    t = KivioShapeData::shapeTypeFromString( XmlReadString( shapeElement, "type", "None" ) );
+    t = KivioShapeData::tqshapeTypeFromString( XmlReadString( tqshapeElement, "type", "None" ) );
 
     switch( t )
     {
@@ -180,51 +180,51 @@ void KivioSMLStencilSpawner::loadShape( TQDomNode &shapeNode )
             break;
 
         case KivioShapeData::kstArc:
-            pShape = KivioShape::loadShapeArc( shapeElement );
+            pShape = KivioShape::loadShapeArc( tqshapeElement );
             break;
 
         case KivioShapeData::kstPie:
-            pShape = KivioShape::loadShapePie( shapeElement );
+            pShape = KivioShape::loadShapePie( tqshapeElement );
             break;
 
         case KivioShapeData::kstLineArray:
-            pShape = KivioShape::loadShapeLineArray( shapeElement );
+            pShape = KivioShape::loadShapeLineArray( tqshapeElement );
             break;
 
         case KivioShapeData::kstPolyline:
-            pShape = KivioShape::loadShapePolyline( shapeElement );
+            pShape = KivioShape::loadShapePolyline( tqshapeElement );
             break;
 
         case KivioShapeData::kstPolygon:
-            pShape = KivioShape::loadShapePolygon( shapeElement );
+            pShape = KivioShape::loadShapePolygon( tqshapeElement );
             break;
 
         case KivioShapeData::kstBezier:
-            pShape = KivioShape::loadShapeBezier( shapeElement );
+            pShape = KivioShape::loadShapeBezier( tqshapeElement );
             break;
 
         case KivioShapeData::kstRectangle:
-            pShape = KivioShape::loadShapeRectangle( shapeElement );
+            pShape = KivioShape::loadShapeRectangle( tqshapeElement );
             break;
 
         case KivioShapeData::kstRoundRectangle:
-            pShape = KivioShape::loadShapeRoundRectangle( shapeElement );
+            pShape = KivioShape::loadShapeRoundRectangle( tqshapeElement );
             break;
 
         case KivioShapeData::kstEllipse:
-            pShape = KivioShape::loadShapeEllipse( shapeElement );
+            pShape = KivioShape::loadShapeEllipse( tqshapeElement );
             break;
 
         case KivioShapeData::kstOpenPath:
-            pShape = KivioShape::loadShapeOpenPath( shapeElement );
+            pShape = KivioShape::loadShapeOpenPath( tqshapeElement );
             break;
 
         case KivioShapeData::kstClosedPath:
-            pShape = KivioShape::loadShapeClosedPath( shapeElement );
+            pShape = KivioShape::loadShapeClosedPath( tqshapeElement );
             break;
 
         case KivioShapeData::kstTextBox:
-            pShape = KivioShape::loadShapeTextBox( shapeElement );
+            pShape = KivioShape::loadShapeTextBox( tqshapeElement );
             break;
 
         default:
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index 0fdd2ac1c..c2e54a58b 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 *.shape");
+  d.setNameFilter("*.so *.sml *.ksp *.spy *.tqshape");
   m_files = d.entryList();
 
   return true;
@@ -134,7 +134,7 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName
     {
         pSpawner = new KivioPyStencilSpawner(this);
     }
-    else if( fileName.contains( ".shape", false ) )
+    else if( fileName.contains( ".tqshape", false ) )
     {
 	pSpawner = new KivioDiaStencilSpawner(this);
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h
index 73c13e0e7..2a8ecd623 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 shape
+    TQString m_text;                                 // The text inside this tqshape
     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 alignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text tqalignment flags
 
 public:
     KivioTextStyle();
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index 67cb4d871..e0d2b363d 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -24,7 +24,7 @@
 #include "kiviostencilsetinstaller.h"
 
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
 
@@ -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.").arg(url.prettyURL()));
+      KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").tqarg(url.prettyURL()));
       return;
     }
 
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index 39fb22ef9..d3d30dae9 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -74,7 +74,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char
 
   setPixmap(stencil_xpm);
 
-  const TQColorGroup& g = colorGroup();
+  const TQColorGroup& g = tqcolorGroup();
   TQColor c = g.buttonText();
 
   int cr, cg, cb;
@@ -121,8 +121,8 @@ void DragBarButton::drawButton( TQPainter* paint )
   pix.fill(eraseColor());
   TQPainter pixPainter(&pix);
 
-  const TQColorGroup& g = colorGroup();
-  tqstyle().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() );
+  const TQColorGroup& g = tqcolorGroup();
+  tqstyle().tqdrawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), tqcolorGroup() );
 
   int m = 3;
   int tw = 0;
@@ -132,7 +132,7 @@ void DragBarButton::drawButton( TQPainter* paint )
     pw = m_pIcon->width();
     tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ),
                       AlignLeft | AlignVCenter,
-                      colorGroup(), isEnabled(),
+                      tqcolorGroup(), isEnabled(),
                       m_pIcon, TQString(), -1,
                       &g.buttonText());
   }
@@ -146,7 +146,7 @@ void DragBarButton::drawButton( TQPainter* paint )
 
     tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ),
                       AlignLeft | AlignVCenter|ShowPrefix,
-                      colorGroup(), isEnabled(),
+                      tqcolorGroup(), isEnabled(),
                       0L, t, -1,
                       &g.buttonText());
   }
@@ -183,7 +183,7 @@ void DragBarButton::setPixmap( const TQPixmap& pixmap )
   m_pIcon = new TQPixmap(pixmap);
 }
 
-TQSize DragBarButton::sizeHint() const
+TQSize DragBarButton::tqsizeHint() const
 {
   constPolish();
   int m = 3;
@@ -231,7 +231,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev )
 
   if ( closeRect.contains(ev->pos())) {
     m_bClose = true;
-    repaint();
+    tqrepaint();
     return;
   }
 
@@ -243,7 +243,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev )
 {
   if ( m_bClose ) {
     m_bClose = false;
-    repaint();
+    tqrepaint();
     TQRect closeRect;
 
     if(m_orientation == Qt::Vertical) {
@@ -285,14 +285,14 @@ void DragBarButton::enterEvent( TQEvent* ev )
 {
   TQPushButton::enterEvent(ev);
   m_bMouseOn = true;
-  repaint(false);
+  tqrepaint(false);
 }
 
 void DragBarButton::leaveEvent( TQEvent* ev )
 {
   TQPushButton::leaveEvent(ev);
   m_bMouseOn = false;
-  repaint();
+  tqrepaint();
 }
 
 void DragBarButton::setOrientation(Qt::Orientation orientation)
@@ -300,9 +300,9 @@ void DragBarButton::setOrientation(Qt::Orientation orientation)
   m_orientation = orientation;
   
   if(m_orientation == Qt::Vertical) {
-    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
   } else {
-    setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+    tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
   }
 }
 
diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h
index 67595db90..6f207a7fa 100644
--- a/kivio/kiviopart/stencilbarbutton.h
+++ b/kivio/kiviopart/stencilbarbutton.h
@@ -35,7 +35,7 @@ class DragBarButton : public TQPushButton
     void setIcon( const TQString& );
     void setPixmap( const TQPixmap& );
   
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     
     Qt::Orientation orientation() const { return m_orientation; }
   
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index aa5c30c48..ecf923f93 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->geometry(),m_destinationBar);
+  insertStencilSet(dragWidget,caption,dragPos,moveManager->tqgeometry(),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->geometry().contains(p) ) {
+    if ( bar->tqgeometry().contains(p) ) {
       if(bar->place() == TQDockWindow::OutsideDock) {
         dragPos = OnTopLevelBar;
-        globalPos = bar->geometry().topLeft();
+        globalPos = bar->tqgeometry().topLeft();
       } else {
         dragPos = AutoSelect;
-        globalPos = bar->mapToGlobal(bar->geometry().topLeft());
+        globalPos = bar->mapToGlobal(bar->tqgeometry().topLeft());
       }
       
       m_destinationBar = bar;
@@ -219,7 +219,7 @@ void StencilBarDockManager::slotMoving()
       moveManager->setGeometry(globalPos.x(),
                                moveManager->y(),
                                bar->width(),
-                               moveManager->getWidget()->sizeHint().height());
+                               moveManager->getWidget()->tqsizeHint().height());
       return;
     }
   }
@@ -556,8 +556,8 @@ void KoToolDockMoveManager::doResizeInternal()
 void KoToolDockMoveManager::setWidget( TQWidget* _w )
 {
   widget = _w;
-  minSize = widget->minimumSize();
-  maxSize = widget->maximumSize();
+  minSize = widget->tqminimumSize();
+  maxSize = widget->tqmaximumSize();
 
   rr = TQRect(widget->mapToGlobal(TQPoint(0,0)),widget->size());
   p =  rr.topLeft();
@@ -631,7 +631,7 @@ bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change)
   return f1&&f2;
 }
 
-TQRect KoToolDockMoveManager::geometry()
+TQRect KoToolDockMoveManager::tqgeometry()
 {
   int x0 = xp;
   int y0 = yp;
diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h
index 73d483019..8406e5f07 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 geometry();
+    TQRect tqgeometry();
 
     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 8ff02c320..7d7cb3cbd 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape
index 6e1388fec..b0e445535 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape
index a4f208391..d536a6b63 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
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 54babdd83..d2579d6db 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape
index 03b7787cb..b2e85882a 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape
index e3c0c008b..e70c0d2ac 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape
index 8eb15cd4f..e2e513af9 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape
index ef0f7f47c..b99c34616 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape
index 6351e8dd7..1886293be 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape
index 17d670fc7..8738ffea1 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape
index 8e9fea1d7..be5bf79c5 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
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 8d4180225..0549dbe85 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape
index e94d2d173..f0f8623e9 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape
index 791f8a780..83222aa84 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape
index 26647defb..ae10097e3 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape
index 2bc022493..2b6a598cd 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape
index 2aeef6118..88d86baa4 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape
index 889489423..a031d3697 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape
index ea2c2400f..ecfac8e20 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape
index a21aa220a..71bedc8d3 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape
index c0dceb976..794cd4b85 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape
index 1c37662b6..b85fa7372 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape
index 0f3440911..d57940806 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape
index 89db85e78..a3941127c 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape
index 67d58bf4c..e7be1a89d 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape
index d57432a95..5d66851c6 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape
index 20d55b99f..379b74c6f 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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 -->
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape
index bbaf28535..2c2f5cac4 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape
index cb008f128..adef753fc 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape
index b67bdb42e..80664b5fc 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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 -->
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape
index c68e257c4..1e97b53ba 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 <!-- 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 48ae7b4e5..b638e3155 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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 shape files 
+  <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape 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>
-</shape>
+</tqshape>
 <!-- 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 fb971a586..474317f50 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape
index 2708c5c01..74245a0c0 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape
index 3d7097ac0..5d38874a5 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape
index d0636820d..d57fe1663 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape
index f6e83ce19..756cf865d 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape
index 3e0e59ef1..c89b7832a 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape
index 9032094b2..66f3b1bab 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape
index b1a156190..2053db212 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape
index 9168966d5..5abe7185e 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape
index ea4d47a9e..0d7c42318 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
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 84a2002fc..5add8f357 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape
index ac143720e..bdfcb107c 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape
index 83d94349d..bbe4d3dc8 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape
index 270628bef..beec8aa11 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
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 36c4f89b8..c78f62f00 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape
index 4f0f98dfc..a721ed0e2 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape
index a658df149..03f859e50 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape
index 57cdbdb7d..43b9495fd 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape
index d8ae4d62a..667e75f6c 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape
index 15cc52571..1e3d10428 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape
index f933cf5bb..4016df10c 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape
index a58db432a..1a7fd4e7e 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape
index f595cb6a9..124c3069d 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape
index 427fd7249..49060cdfc 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape
index 15c078bd1..5a360fc51 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape
index 830eaae10..947612572 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape
index 03cf0f4f9..2ef92bd0a 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape
index 6635c317c..db9a6228d 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape
index 45fc49a48..5a2f6f188 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape
index f2c48f8f6..8d54e7be5 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape
index 32520caeb..0cd35bbb9 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape
index b76f2aa9f..7ea6d2b8c 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape
index 43208f14d..31057db13 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape
index d2bea36d9..ee1b2787d 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape
index 87aa68615..081ae7684 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape
index ceb72cb5c..086de61b0 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape
index 0d506ff9d..0a9461fbe 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape
index ea8ee9bf0..4f8d788c1 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape
index 364565ff6..96f90015d 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape
index 371eef0de..9483a7df2 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape
index 31a845113..3f59d4caa 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape
index 19a8b68e4..1513e25bc 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape
index 2964a28b0..411bd80a5 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape
index 39d6a0580..c768f0382 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape
index 0b7f7ded1..7b2b8e226 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape
index 904760e0e..280da134e 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape
index ea128a594..53734fbc4 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape
index 62c624f1d..b2faadbb6 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape
index ba006a8f9..431c5efd5 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape
index 66fc1734e..fcc21c3ae 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape
index 639f4b7ad..2b2025eab 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape
index 5847b0632..7a3c7455b 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape
index daed926ee..409c6e129 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape
index 683e4ee14..6b33ec5f6 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape
index ed64d2ebf..3c0cc737d 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape
index 109a0651a..19003b8eb 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape
index c071d1cac..e317f3e1d 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape
index 25a05e727..fe6bc807b 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape
index f0fd67e22..0f484addf 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape
index b2f38fc71..04e644eb2 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape
index c19026694..021db07ea 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 -*- -->
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape
index 4e18f2f5d..c697400dd 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape
index 2c2ce44fc..6cb1fba79 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape
index 0a8512f5d..95028b58f 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape
index 3223741fc..fd4936e74 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"?>
 
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape
index 4d3f913f9..81ff9f038 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>   
+</tqshape>   
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape
index 49cce15d3..85340990e 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
 
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape
index 1df9b7fcd..508b64bf0 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape
index 946603b1a..bef149461 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"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
+<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-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>
-</shape>
+</tqshape>
 
 
diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml
index 704e66b0c..707882e9c 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 shape"/>
+		<Description data="Basic flowcharting card tqshape"/>
 		<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 2fa28f242..a052fc1c1 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 shape for flowcharting"/>
+		<Description data="Data tqshape 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 e069d4acf..2e83ee8e3 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 shape"/>
+		<Description data="Basic flowcharting decision tqshape"/>
 		<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 21661b743..df9d3a5f1 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 shape"/>
+		<Description data="Basic flowcharting direct data tqshape"/>
 		<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 f07580d2d..9634593e7 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 shape"/>
+		<Description data="Basic flowcharting display tqshape"/>
 		<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 3a7a50ae5..d40511895 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 shape"/>
+		<Description data="Internal storage tqshape"/>
 		<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 199072a60..b409c57a3 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 shape"/>
+		<Description data="Basic flowcharting loop limit tqshape"/>
 		<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 d6104506a..176914861 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 shape"/>
+		<Description data="Basic flowcharting manual input tqshape"/>
 		<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 bc4524003..2536f8223 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 shape"/>
+		<Description data="Basic flowcharting manual operation tqshape"/>
 		<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 452e048a5..e1f80367f 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 shape"/>
+		<Description data="Predefined process tqshape"/>
 		<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 f79d2a51d..b935d273e 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 shape"/>
+		<Description data="Basic flowcharting preparation tqshape"/>
 		<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 94d129ac5..60a00732f 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 shape"/>
+		<Description data="Basic flowcharting process tqshape"/>
 		<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 fc01b5429..aa11f9702 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 shape"/>
+        <Description data="Basic flowcharting card tqshape"/>
         <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 },
                     ]
 
 
-shapes = {
+tqshapes = {
           "rect" :{
                    "type"  : "Rectangle",
                    "fillstyle" : "solid",
@@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2,  "y":y-2 },
                             { "x":(x+x2)/2, "y":y }
                           ]
 
-shapes["rect2"]["x"] = x+w-35
-shapes["rect2"]["y"] = y+h-35
-shapes["rect2"]["w"] = 20
-shapes["rect2"]["h"] = 20
+tqshapes["rect2"]["x"] = x+w-35
+tqshapes["rect2"]["y"] = y+h-35
+tqshapes["rect2"]["w"] = 20
+tqshapes["rect2"]["h"] = 20
 
-if ( shapes["text"]["text"] == "1" ):
+if ( tqshapes["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 6a7279900..98ba20165 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 shape"/>
+		<Description data="Basic flowcharting stored data tqshape"/>
 		<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 769d1f5d3..a998b6ca6 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 shape"/>
+		<Description data="Terminator tqshape"/>
 		<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 c96361ce9..445fef799 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 shape"/>
+		<Description data="Data Store tqshape"/>
 		<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 b1d1a8359..622b0205c 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 shape"/>
+		<Description data="Database tqshape"/>
 		<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 57229b1a4..fa1824deb 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 shape"/>
+		<Description data="Process tqshape"/>
 		<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 c68f8a792..e3f53b8f5 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 shape"/>
+		<Description data="Source or Sink tqshape"/>
 		<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 34c0b640b..b3ecbefc4 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 shape"/>
+		<Description data="Floppy Disk tqshape"/>
 		<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 a03ce9cbe..aa34fe08f 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 shape"/>
+		<Description data="Key tqshape"/>
 		<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 6470beb0e..a9013398e 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 shape"/>
+		<Description data="Arrow tqshape"/>
 		<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 909e814cc..72a5cfd36 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 shape 1"/>
+		<Description data="Multiple Arrow tqshape 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 16599b33f..296f55fb1 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 shape 2"/>
+		<Description data="Multiple Arrow tqshape 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 b02432011..13fe19053 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 shape 3"/>
+		<Description data="Multiple Arrow tqshape 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 7cfdc3073..07bdf483c 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 shape"/>
+		<Description data="Sun Arrow tqshape"/>
 		<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 8ff9b0291..7d8390db0 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 shape"/>
+		<Description data="Factory tqshape"/>
 		<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 950759722..9e1193cfc 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 shape"/>
+		<Description data="House tqshape"/>
 		<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 88e06fdb6..af310f337 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 shape used in ER diagrams"/>
+    <Description data="Attribute tqshape 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 8c325c328..5c2e4f742 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 shape used in ER diagrams"/>
+    <Description data="Derived Attribute tqshape 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 6eaed85ac..2b22e32a1 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 shape used in ER diagrams"/>
+    <Description data="Entity tqshape 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 baef5b765..56329cf11 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 shape used in ER diagrams"/>
+    <Description data="Multivalued Attribute tqshape 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 bd6c93ea8..dbcad720e 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 shape used in ER diagrams"/>
+    <Description data="Relationship tqshape 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 b81da1e95..02547ca0a 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 shape used in ER diagrams"/>
+    <Description data="Weak Entity tqshape 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 ac102000c..1e30e26db 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 shape used in ER diagrams"/>
+    <Description data="Relationship tqshape 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 eb1650e7c..27c487ea7 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 shape"/>
+		<Description data="Bad tqshape"/>
 		<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 8cb5b46d2..88ff54e88 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 shape"/>
+		<Description data="Good tqshape"/>
 		<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 13c5b46cf..0656c2a7a 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 shape"/>
+		<Description data="Man tqshape"/>
 		<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 e1c4aabc0..9f903a1fe 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 shape"/>
+		<Description data="Woman tqshape"/>
 		<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 36e874641..6bd7f8493 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 shape"/>
+		<Description data="Woman tqshape"/>
 		<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 f7f6d6665..d8e01658d 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 shape"/>
+		<Description data="Truck tqshape"/>
 		<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 1b1b607d3..27f8c3b37 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -97,7 +97,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -114,7 +114,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -158,7 +158,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -175,7 +175,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -200,7 +200,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>51</width>
                                         <height>20</height>
@@ -243,7 +243,7 @@
                                 <property name="pixmap">
                                     <pixmap>image3</pixmap>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -280,7 +280,7 @@
                                 <property name="pixmap">
                                     <pixmap>image5</pixmap>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignBottom|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -317,7 +317,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 30cf7f1f6..8969ea827 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView()
 
   KivioScreenPainter kpainter;
   kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
-  kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid));
+  kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid));
 
   kpainter.painter()->fillRect(px0, py0, pw, ph, white);
 
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 8070cca5d..fadba0e3d 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -27,7 +27,7 @@
 #include "layerlisttooltip.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <ktoolbar.h>
 #include <klocale.h>
@@ -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").arg(id));
+  layer->setName(i18n("Layer %1").tqarg(id));
   page->addLayer(layer);
   page->setCurLayer(layer);
 
diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
index e17749005..55fe9888c 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
@@ -12,13 +12,13 @@
             <height>147</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -107,7 +107,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>281</height>
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index d6ef9318a..11c2cc286 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -24,7 +24,7 @@
 #include <tqiconview.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqsplitter.h>
 
 #include <kstandarddirs.h>
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
index d3a9a8d66..9237333e8 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbitmap.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 4bd6fd62d..239008944 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -45,7 +45,7 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 
 // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u)
@@ -111,23 +111,23 @@ void KivioOptionsDialog::initPage()
   m_unitCombo->insertStringList(KoUnit::listOfUnitName());
   m_unitCombo->setCurrentItem(unit);
   unitLbl->setBuddy(m_unitCombo);
-  TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), page);
+  TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
   m_layoutTxtLbl = new TQLabel(page);
   m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
-  m_layoutTxtLbl->setSizePolicy(TQSizePolicy(
+  m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setLayoutText(m_layout);
   KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page);
-  layoutBtn->setSizePolicy(TQSizePolicy(
+  layoutBtn->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Fixed, TQSizePolicy::Fixed));
   TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page);
   m_fontTxtLbl = new TQLabel(page);
   m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
-  m_fontTxtLbl->setSizePolicy(TQSizePolicy(
+  m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setFontText(m_font);
   KPushButton* fontBtn = new KPushButton(i18n("Change..."), page);
-  layoutBtn->setSizePolicy(TQSizePolicy(
+  layoutBtn->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Fixed, TQSizePolicy::Fixed));
   m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page);
   m_marginsChBox->setChecked(view->isShowPageMargins());
@@ -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").arg(
-    KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit))
-    .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg(
+  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(
     KoUnit::unitName(unit));
   m_layoutTxtLbl->setText(txt);
 }
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
index e682b7fda..3361ad238 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
@@ -20,7 +20,7 @@
 #include "kiviostencilformatdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbitmap.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 051bb90d1..94dd995d0 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -20,7 +20,7 @@
 #include "kiviotextformatdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
@@ -68,7 +68,7 @@ void KivioTextFormatDlg::initPositionTab()
   m_halignBGrp->setButton(1);
   m_preview = new TQLabel(i18n("Preview"), tab);
   m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken);
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
   TQGridLayout* gl = new TQGridLayout(tab);
   gl->setSpacing(KDialog::spacingHint());
   gl->setRowStretch(0, 10);
@@ -95,7 +95,7 @@ void KivioTextFormatDlg::updateVAlign(int i)
       break;
   }
 
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 void KivioTextFormatDlg::updateHAlign(int i)
@@ -112,7 +112,7 @@ void KivioTextFormatDlg::updateHAlign(int i)
       break;
   }
 
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 int KivioTextFormatDlg::valign()
@@ -150,7 +150,7 @@ void KivioTextFormatDlg::setVAlign(int i)
   }
 
   m_valign = static_cast<TQt::AlignmentFlags>(i);
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 void KivioTextFormatDlg::setHAlign(int i)
@@ -168,7 +168,7 @@ void KivioTextFormatDlg::setHAlign(int i)
   }
 
   m_halign = static_cast<TQt::AlignmentFlags>(i);
-  m_preview->setAlignment(m_valign | m_halign);
+  m_preview->tqsetAlignment(m_valign | m_halign);
 }
 
 void KivioTextFormatDlg::setFont(TQFont f)
diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp
index 4a2d1fb5c..ed32c284d 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.cpp
+++ b/kivio/kiviopart/ui/layerlisttooltip.cpp
@@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const TQPoint& pos)
     return;
   }
 
-  TQRect itemRect = m_listView->itemRect(item);
+  TQRect tqitemRect = m_listView->tqitemRect(item);
   TQString toolTip = "<b>" + item->layer()->name() + "</b><br>";
   toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>";
   toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No"));
-  tip(itemRect, toolTip);
+  tip(tqitemRect, toolTip);
 }
 
 }
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index bd2d4392a..7483e98d3 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -18,7 +18,7 @@
  */
 #include "objectlistpalette.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqptrlist.h>
 
@@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
 {
   m_blockUpdate = false;
 
-  TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2);
+  TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2);
 
   m_objectList = new KListView(this);
   m_objectList->setFullWidth(true);
@@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
   m_objectList->addColumn(i18n("Name"));
   m_objectList->addColumn(i18n("Type"));
 
-  layout->addWidget(m_objectList);
+  tqlayout->addWidget(m_objectList);
 
   connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection()));
 }
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 26b8feb8d..ca3ff402b 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()->repaint();
+    view()->canvasWidget()->tqrepaint();
     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()->repaint();
+    view()->canvasWidget()->tqrepaint();
   }
 }
 
@@ -278,7 +278,7 @@ bool ConnectorTool::startRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
 
-  canvas->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -322,7 +322,7 @@ void ConnectorTool::continueRubberBanding( TQMouseEvent *e )
 
   m_pStencil->customDrag(m_pDragData);
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 void ConnectorTool::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index 6117cf61d..b6c24c579 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->repaint();
+  canvas->tqrepaint();
 
   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 geometry
+  // Build the list of old tqgeometry
   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()->repaint();
+  view()->canvasWidget()->tqrepaint();
 
   // 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
- * geometry of all the selected stencils.  We use that to calculate delta
+ * tqgeometry 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->repaint();
+    canvas->tqrepaint();
     m_firstTime = false;
   }
 
@@ -628,7 +628,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos)
       canvas->drawStencilXOR(m_pCustomDraggingStencil);
     } else {
       m_pCustomDraggingStencil->setHidden(true);
-      canvas->repaint();
+      canvas->tqrepaint();
       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()->repaint();
+    view()->canvasWidget()->tqrepaint();
   }
 
   view()->updateToolBars();
@@ -674,7 +674,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides)
   
   if( !pData )
   {
-      kdDebug(43000) << "SelectTool::continueResizing() - Original geometry not found" << endl;
+      kdDebug(43000) << "SelectTool::continueResizing() - Original tqgeometry 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->repaint();
+      canvas->tqrepaint();
       m_firstTime = false;
     }
   
@@ -1050,7 +1050,7 @@ void SelectTool::endDragging(const TQPoint&)
 
   canvas->drawSelectedStencilsXOR();
   canvas->endUnclippedSpawnerPainter();
-  // Clear the list of old geometry
+  // Clear the list of old tqgeometry
   m_lstOldGeometry.clear();
 }
 
@@ -1077,7 +1077,7 @@ void SelectTool::endCustomDragging(const TQPoint&)
   canvas->endUnclippedSpawnerPainter();
 
   canvas->setShowConnectorTargets(false);
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 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 geometry
+  // Build the list of old tqgeometry
   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 8617eb98a..3745820c3 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_shape_data.h"
+#include "kivio_tqshape_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 shape, an open path.
-	//m_shape = new KivioShape();
-	//m_shape->shapeData() ->setShapeType( KivioShapeData::kstOpenPath );
+	// We only have one tqshape, an open path.
+	//m_tqshape = new KivioShape();
+	//m_tqshape->tqshapeData() ->setShapeType( KivioShapeData::kstOpenPath );
 	loadPath( name );
 }
 
@@ -196,7 +196,7 @@ KivioStencil *KivioSMLConnector::duplicate()
 void KivioSMLConnector::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData )
 {
 	KivioPainter * painter;
-	KivioShapeData *pShapeData = pShape->shapeData();
+	KivioShapeData *pShapeData = pShape->tqshapeData();
 	KivioPoint *pPoint, *pNewPoint;
 	TQPtrList <KivioPoint> *pPointList = pShapeData->pointList();
 
@@ -262,7 +262,7 @@ void KivioSMLConnector::paint( KivioIntraStencilData *pData )
 	}
 
 
-	// Build shape up from m_pConnectorPoints
+	// Build tqshape 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_shape->saveXML(doc);
+	//TQDomElement type = m_tqshape->saveXML(doc);
 	KivioConnectorPoint *p = m_PointList.first();
 	while ( p )
 	{
@@ -341,7 +341,7 @@ bool KivioSMLConnector::loadCustom( const TQDomElement &e )
 		}
 		else if ( name == "KivioShape" )
 		{
-			//m_shape->loadXML(node.toElement());
+			//m_tqshape->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 b631f84b6..a50ec7505 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_shape;
+    KivioShape *m_tqshape;
     TQPtrList<KivioConnectorPoint> m_PointList;
 
     TQString m_name;
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index 5cef094e8..4578f0a77 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->repaint();
+  canvas->tqrepaint();
   canvas->setCursor(*m_pConnectorCursor2);
   return true;
 }
@@ -223,7 +223,7 @@ void SMLConnector::continueRubberBanding( TQMouseEvent *e )
   m_pStencil->customDrag(m_pDragData);
 
   m_pStencil->updateGeometry();
-  canvas->repaint();
+  canvas->tqrepaint();
 }
 
 void SMLConnector::mouseRelease( TQMouseEvent *e )
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index 0e8aac771..cfa2f3173 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -185,7 +185,7 @@ You should have received a copy of the GNU General Public License along with thi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 062e329e8..49a42589b 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -108,7 +108,7 @@ void StencilTextEditor::setHorizontalAlign(int flag)
 
   m_mainWidget->m_hAlignButton->popup()->setItemChecked(flag, true);
   m_mainWidget->m_hAlignButton->setIconSet(*(m_mainWidget->m_hAlignButton->popup()->iconSet(flag)));
-  m_mainWidget->m_textArea->setAlignment(flag|verticalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(flag|verticalAlignment());
   m_hAlign = flag;
 }
 
@@ -120,7 +120,7 @@ void StencilTextEditor::setVerticalAlign(int flag)
 
   m_mainWidget->m_vAlignButton->popup()->setItemChecked(flag, true);
   m_mainWidget->m_vAlignButton->setIconSet(*(m_mainWidget->m_vAlignButton->popup()->iconSet(flag)));
-  m_mainWidget->m_textArea->setAlignment(flag|horizontalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(flag|horizontalAlignment());
   m_vAlign = flag;
 }
 
@@ -169,7 +169,7 @@ void StencilTextEditor::updateFormating()
 
 
   m_mainWidget->m_textArea->selectAll(true);
-  m_mainWidget->m_textArea->setAlignment(horizontalAlignment()|verticalAlignment());
+  m_mainWidget->m_textArea->tqsetAlignment(horizontalAlignment()|verticalAlignment());
   m_mainWidget->m_textArea->selectAll(false);
 
   m_mainWidget->m_textArea->setFocus();
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 5b1ee4fc6..7d449ae07 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()->repaint();
+  view()->canvasWidget()->tqrepaint();
   m_startPoint = e->pos();
 
   return true;
@@ -222,7 +222,7 @@ void TextTool::mouseRelease( TQMouseEvent *e )
 
   m_mode = stmNone;
 
-  view()->canvasWidget()->repaint();
+  view()->canvasWidget()->tqrepaint();
 }
 
 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 halignment = editor.horizontalAlignment();
-    int valignment = editor.verticalAlignment();
+    int htqalignment = editor.horizontalAlignment();
+    int vtqalignment = editor.verticalAlignment();
     bool changeFont = (stencil->textFont() != font);
     bool changeTextColor = (stencil->textColor() != textColor);
-    bool changeHAlignment = (stencil->hTextAlign() != halignment);
-    bool changeVAlignment = (stencil->vTextAlign() != valignment);
+    bool changeHAlignment = (stencil->hTextAlign() != htqalignment);
+    bool changeVAlignment = (stencil->vTextAlign() != vtqalignment);
 
 
     while( stencil )
@@ -317,18 +317,18 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
         changed = true;
       }
 
-      if(changeHAlignment && (stencil->hTextAlign() != halignment)) {
+      if(changeHAlignment && (stencil->hTextAlign() != htqalignment)) {
         KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
-            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment);
-        stencil->setHTextAlign(halignment);
+            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), htqalignment);
+        stencil->setHTextAlign(htqalignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
 
-      if(changeVAlignment && (stencil->vTextAlign() != valignment)) {
+      if(changeVAlignment && (stencil->vTextAlign() != vtqalignment)) {
         KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
-            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment);
-        stencil->setVTextAlign(valignment);
+            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), vtqalignment);
+        stencil->setVTextAlign(vtqalignment);
         macroCmd->addCommand(cmd);
         changed = true;
       }
@@ -400,24 +400,24 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos)
       changed = true;
     }
 
-    int halignment = editor.horizontalAlignment();
+    int htqalignment = editor.horizontalAlignment();
 
-    if(stencil->hTextAlign(name) != halignment) {
+    if(stencil->hTextAlign(name) != htqalignment) {
       KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
           i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil,
-          stencil->hTextAlign(name), halignment, name);
-      stencil->setHTextAlign(name, halignment);
+          stencil->hTextAlign(name), htqalignment, name);
+      stencil->setHTextAlign(name, htqalignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }
 
-    int valignment = editor.verticalAlignment();
+    int vtqalignment = editor.verticalAlignment();
 
-    if(stencil->vTextAlign(name) != valignment) {
+    if(stencil->vTextAlign(name) != vtqalignment) {
       KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
           i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil,
-      stencil->vTextAlign(name), valignment, name);
-      stencil->setVTextAlign(name, valignment);
+      stencil->vTextAlign(name), vtqalignment, name);
+      stencil->setVTextAlign(name, vtqalignment);
       macroCmd->addCommand(cmd);
       changed = true;
     }
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index 7f3371e48..93bbb6c42 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -126,13 +126,13 @@ void EntryItem::paint( TQPainter *p )
 
     TQBrush brush;
     if ( isCurrent() || isSelected() || mPaintActive )
-      brush = box->colorGroup().brush( TQColorGroup::Highlight );
+      brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
     else
-      brush = TQBrush(box->colorGroup().highlight().light( 115 ));
+      brush = TQBrush(box->tqcolorGroup().highlight().light( 115 ));
     p->fillRect( 1, 0, w - 2, h - 1, brush );
     TQPen pen = p->pen();
     TQPen oldPen = pen;
-    pen.setColor( box->colorGroup().mid() );
+    pen.setColor( box->tqcolorGroup().mid() );
     p->setPen( pen );
 
     p->drawPoint( 1, 0 );
@@ -149,9 +149,9 @@ void EntryItem::paint( TQPainter *p )
     p->drawPixmap( x, y, mPixmap );
   }
 
-  TQColor shadowColor = listBox()->colorGroup().background().dark(115);
+  TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
   if ( isCurrent() || isSelected() ) {
-    p->setPen( box->colorGroup().highlightedText() );
+    p->setPen( box->tqcolorGroup().highlightedText() );
   }
 
   if ( !text().isEmpty() && navigator()->showText() ) {
@@ -176,13 +176,13 @@ void EntryItem::paint( TQPainter *p )
     }
 
     if ( isCurrent() || isSelected() || mHasHover ) {
-      p->setPen( box->colorGroup().highlight().dark(115) );
+      p->setPen( box->tqcolorGroup().highlight().dark(115) );
       p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
                    y + 1, text() );
-      p->setPen( box->colorGroup().highlightedText() );
+      p->setPen( box->tqcolorGroup().highlightedText() );
     }
     else
-      p->setPen( box->colorGroup().text() );
+      p->setPen( box->tqcolorGroup().text() );
 
     p->drawText( x, y, text() );
   }
@@ -283,7 +283,7 @@ void Navigator::slotExecuted( TQListBoxItem *item )
    executedItem = item;
 }
 
-TQSize Navigator::sizeHint() const
+TQSize Navigator::tqsizeHint() const
 {
   return TQSize( mMinWidth, 100 );
 }
@@ -409,7 +409,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name )
   m_buttongroup->setExclusive(true);
   m_buttongroup->hide();
   mWidgetstack = new TQWidgetStack(this);
-  mWidgetstack->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+  mWidgetstack->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
   
   // setup the popup menu
   mShowIcons = KoShellSettings::sidePaneShowIcons();
diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h
index 34678919b..e0c4f7f03 100644
--- a/koshell/iconsidepane.h
+++ b/koshell/iconsidepane.h
@@ -26,7 +26,7 @@
 #include <klistbox.h>
 
 #include <tqbuttongroup.h> 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
 #include <tqwidgetstack.h>
@@ -100,12 +100,12 @@ class EntryItemToolTip : public TQToolTip
       if ( !mListBox ) return;
       TQListBoxItem* item = mListBox->itemAt( p );
       if ( !item ) return;
-      const TQRect itemRect = mListBox->itemRect( item );
-      if ( !itemRect.isValid() ) return;
+      const TQRect tqitemRect = mListBox->tqitemRect( item );
+      if ( !tqitemRect.isValid() ) return;
 
       const EntryItem *entryItem = static_cast<EntryItem*>( item );
       TQString tipStr = entryItem->text();
-      tip( itemRect, tipStr );
+      tip( tqitemRect, tipStr );
     }
   private:
     TQListBox* mListBox;
@@ -123,7 +123,7 @@ class Navigator : public KListBox
 
     int insertItem(const TQString &_text, const TQString &_pix);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     IconViewMode viewMode();
     bool showText();
     bool showIcons();
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index 27bec9d65..9639ae716 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -66,7 +66,7 @@ KoShellWindow::KoShellWindow()
 
   // Setup the sidebar
   m_pSidebar = new IconSidePane( m_pLayout );
-  m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  m_pSidebar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
                              TQSizePolicy::Preferred ) );
   m_pSidebar->setActionCollection( actionCollection() );
   m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, TQT_TQOBJECT(this), TQT_SLOT( slotSidebar_Part(int )));
@@ -75,7 +75,7 @@ KoShellWindow::KoShellWindow()
 
   // Setup the tabbar
   m_pFrame = new KTabWidget( m_pLayout );
-  m_pFrame->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  m_pFrame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                             TQSizePolicy::Preferred ) );
   m_pFrame->setTabPosition( KTabWidget::Bottom );
 
@@ -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.").arg(url.url()) );
+    KMessageBox::error(0L, i18n("The file %1 doesn't exist.").tqarg(url.url()) );
     recentAction()->removeURL(url); //remove the file from the recent-opened-file-list
     saveRecentFiles();
     return false;
@@ -175,7 +175,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* )
 
     KoFilterManager *manager = new KoFilterManager( url.path() );
     TQCString mimetype;                                               // an empty mimetype means, that the "nearest"
-    KoFilter::ConversionStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen
+    KoFilter::ConversiontqStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen
     delete manager;
 
     if ( status != KoFilter::OK || mimetype.isEmpty() ) {
@@ -503,7 +503,7 @@ void KoShellWindow::switchToPage( TQValueList<Page>::Iterator it )
   v->setFocus();
 
   partSpecificHelpAction->setEnabled(true);
-  partSpecificHelpAction->setText(i18n("%1 Handbook").arg((*m_activePage).m_pDoc->instance()->aboutData()->programName()));
+  partSpecificHelpAction->setText(i18n("%1 Handbook").tqarg((*m_activePage).m_pDoc->instance()->aboutData()->programName()));
 }
 
 void KoShellWindow::slotFileNew()
diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h
index 3dceb1c10..4e0cb7046 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").arg(start.toString(), end.toString())),
+    : TQListViewItem(parent, TQString("%1  -  %2").tqarg(start.toString(), end.toString())),
       m_start(start),
       m_end(end)
     {}
diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui
index 42b35ba9e..e76a6129c 100644
--- a/kplato/kptaccountspanelbase.ui
+++ b/kplato/kptaccountspanelbase.ui
@@ -13,7 +13,7 @@
             <height>234</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>220</height>
@@ -37,7 +37,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -87,7 +87,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc
index 5e2443db8..9825d9c23 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cc
@@ -32,9 +32,9 @@
 #include <tqdatetimeedit.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpushbutton.h>
 #include <tqvaluelist.h>
 #include <tqpopupmenu.h>
@@ -99,7 +99,7 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent)
       m_project(project),
       m_accounts(project.accounts()) {
     
-    m_date = TQDate::currentDate();
+    m_date = TQDate::tqcurrentDate();
     m_period = 0;
     m_periodTexts<<i18n("Day")<<i18n("Week")<<i18n("Month");
     m_cumulative = false;
@@ -110,10 +110,10 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent)
     m_label = new Label(this);
     m_label->setFrameShape(TQLabel::StyledPanel);
     m_label->setFrameShadow(TQLabel::Sunken);
-    m_label->setAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter));
+    m_label->tqsetAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter));
     lay2->addWidget(m_label);
     m_changeBtn = new TQPushButton(i18n("Configure..."), this);
-    m_changeBtn->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth()));
+    m_changeBtn->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth()));
     lay2->addWidget(m_changeBtn);
     lay1->addLayout(lay2);
 
@@ -139,7 +139,7 @@ void AccountsView::zoom(double zoom) {
 }
 
 void AccountsView::init() {
-    m_date = TQDate::currentDate();
+    m_date = TQDate::tqcurrentDate();
     m_period = 0;
     initAccList(m_accounts.accountList());
 }
@@ -216,8 +216,8 @@ void AccountsView::slotUpdate() {
     if (m_cumulative) {
         t += " <b>" + i18n("Cumulative") + "</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>");
+    t += i18n("Cut-off date:%1").tqarg("<b>" + locale->formatDate(m_date, true) + "</b>");
+    t += " " + i18n("Periodicity:%1").tqarg("<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").arg(w).arg(y);
+            TQString t = i18n("<week>-<year>", "%1-%2").tqarg(w).tqarg(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").arg( dt.year());
+            TQString m = cal->monthName(dt, true) + TQString(" %1").tqarg( dt.year());
             m_dlv->addSlaveColumn(m);
         
             dt = pend.addDays(1); // 1. next month
@@ -378,7 +378,7 @@ bool AccountsView::setContext(Context::Accountsview &context) {
     //m_dlv->setSizes(list); //NOTE: This doesn't always work!
     m_date = context.date;
     if (!m_date.isValid())
-        m_date = TQDate::currentDate();
+        m_date = TQDate::tqcurrentDate();
     m_period = context.period;
     m_cumulative = context.cumulative;
     setContextClosedItems(context);
diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc
index 56ba7380f..486c3dacd 100644
--- a/kplato/kptcalendar.cc
+++ b/kplato/kptcalendar.cc
@@ -225,11 +225,11 @@ Duration CalendarDay::effort(const TQTime &start, const TQTime &end) {
     for (; it.current(); ++it) {
         //kdDebug()<<k_funcinfo<<"Interval: "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl;
         if (end > it.current()->first && start < it.current()->second) {
-            DateTime dtStart(TQDate::currentDate(), start);
+            DateTime dtStart(TQDate::tqcurrentDate(), start);
             if (start < it.current()->first) {
                 dtStart.setTime(it.current()->first);
             }
-            DateTime dtEnd(TQDate::currentDate(), end);
+            DateTime dtEnd(TQDate::tqcurrentDate(), end);
             if (end > it.current()->second) {
                 dtEnd.setTime(it.current()->second);
             }
@@ -282,8 +282,8 @@ Duration CalendarDay::duration() const {
     Duration dur;
     TQPtrListIterator<TQPair<TQTime, TQTime> > it = m_workingIntervals;
     for (; it.current(); ++it) {
-        DateTime start(TQDate::currentDate(), it.current()->first);
-        DateTime end(TQDate::currentDate(), it.current()->second);
+        DateTime start(TQDate::tqcurrentDate(), it.current()->first);
+        DateTime end(TQDate::tqcurrentDate(), it.current()->second);
         dur += end - start;
     }
     return dur;
diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc
index 85dee06fb..ab2df8bd0 100644
--- a/kplato/kptcalendaredit.cc
+++ b/kplato/kptcalendaredit.cc
@@ -30,12 +30,12 @@
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlineedit.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <klocale.h>
 
diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc
index df46d3afe..aaa6fab06 100644
--- a/kplato/kptcalendareditbase.cc
+++ b/kplato/kptcalendareditbase.cc
@@ -31,7 +31,7 @@
 #include <tqheader.h>
 #include <tqlistview.h>
 #include <tqdatetimeedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -51,10 +51,10 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f
 
     groupBox2 = new TQGroupBox( this, "groupBox2" );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->layout()->setSpacing( 6 );
-    groupBox2->layout()->setMargin( 6 );
-    groupBox2Layout = new TQGridLayout( groupBox2->layout() );
-    groupBox2Layout->setAlignment( TQt::AlignTop );
+    groupBox2->tqlayout()->setSpacing( 6 );
+    groupBox2->tqlayout()->setMargin( 6 );
+    groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() );
+    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
 
     calendarPanel = new CalendarPanel( groupBox2, "calendarPanel" );
 
@@ -62,54 +62,54 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f
 
     day = new TQButtonGroup( groupBox2, "day" );
     day->setColumnLayout(0, Qt::Vertical );
-    day->layout()->setSpacing( 6 );
-    day->layout()->setMargin( 6 );
-    dayLayout = new TQVBoxLayout( day->layout() );
-    dayLayout->setAlignment( TQt::AlignTop );
+    day->tqlayout()->setSpacing( 6 );
+    day->tqlayout()->setMargin( 6 );
+    dayLayout = new TQVBoxLayout( day->tqlayout() );
+    dayLayout->tqsetAlignment( TQt::AlignTop );
 
-    layout8 = new TQHBoxLayout( 0, 0, 6, "layout8");
+    tqlayout8 = new TQHBoxLayout( 0, 0, 6, "tqlayout8");
 
     state = new TQComboBox( FALSE, day, "state" );
-    layout8->addWidget( state );
+    tqlayout8->addWidget( state );
 
     bApply = new TQPushButton( day, "bApply" );
-    layout8->addWidget( bApply );
-    dayLayout->addLayout( layout8 );
+    tqlayout8->addWidget( bApply );
+    dayLayout->addLayout( tqlayout8 );
 
     groupBox4 = new TQGroupBox( day, "groupBox4" );
     groupBox4->setColumnLayout(0, Qt::Vertical );
-    groupBox4->layout()->setSpacing( 6 );
-    groupBox4->layout()->setMargin( 6 );
-    groupBox4Layout = new TQVBoxLayout( groupBox4->layout() );
-    groupBox4Layout->setAlignment( TQt::AlignTop );
+    groupBox4->tqlayout()->setSpacing( 6 );
+    groupBox4->tqlayout()->setMargin( 6 );
+    groupBox4Layout = new TQVBoxLayout( groupBox4->tqlayout() );
+    groupBox4Layout->tqsetAlignment( TQt::AlignTop );
 
     intervalList = new TQListView( groupBox4, "intervalList" );
     intervalList->addColumn( tr2i18n( "Work Interval" ) );
     groupBox4Layout->addWidget( intervalList );
 
-    layout6 = new TQHBoxLayout( 0, 0, 6, "layout6");
+    tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6");
 
     startTime = new TQTimeEdit( groupBox4, "startTime" );
-    layout6->addWidget( startTime );
+    tqlayout6->addWidget( startTime );
 
     endTime = new TQTimeEdit( groupBox4, "endTime" );
-    layout6->addWidget( endTime );
-    groupBox4Layout->addLayout( layout6 );
+    tqlayout6->addWidget( endTime );
+    groupBox4Layout->addLayout( tqlayout6 );
 
-    layout5 = new TQHBoxLayout( 0, 0, 6, "layout5");
+    tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5");
 
     bClear = new TQPushButton( groupBox4, "bClear" );
-    layout5->addWidget( bClear );
+    tqlayout5->addWidget( bClear );
 
     bAddInterval = new TQPushButton( groupBox4, "bAddInterval" );
-    layout5->addWidget( bAddInterval );
-    groupBox4Layout->addLayout( layout5 );
+    tqlayout5->addWidget( bAddInterval );
+    groupBox4Layout->addLayout( tqlayout5 );
     dayLayout->addWidget( groupBox4 );
 
     groupBox2Layout->addWidget( day, 1, 1 );
     CalendarEditBaseLayout->addWidget( groupBox2 );
     languageChange();
-    resize( TQSize(540, 340).expandedTo(minimumSizeHint()) );
+    resize( TQSize(540, 340).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h
index b6a220642..df2f9c0c3 100644
--- a/kplato/kptcalendareditbase.h
+++ b/kplato/kptcalendareditbase.h
@@ -64,12 +64,12 @@ public:
 protected:
     TQHBoxLayout* CalendarEditBaseLayout;
     TQGridLayout* groupBox2Layout;
-    TQHBoxLayout* layout10;
+    TQHBoxLayout* tqlayout10;
     TQVBoxLayout* dayLayout;
-    TQHBoxLayout* layout8;
+    TQHBoxLayout* tqlayout8;
     TQVBoxLayout* groupBox4Layout;
-    TQHBoxLayout* layout6;
-    TQHBoxLayout* layout5;
+    TQHBoxLayout* tqlayout6;
+    TQHBoxLayout* tqlayout5;
 
 protected slots:
     virtual void languageChange();
diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc
index 67d36fd43..b5a2d59cb 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cc
@@ -27,12 +27,12 @@
 #include <tqcombobox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlineedit.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <klocale.h>
 
@@ -182,8 +182,8 @@ CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char
     if (f) {
         dia->calendarList->setSelected(f, true);
     }
-    //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<sizeHint().width()<<"x"<<sizeHint().height()<<endl;
-    resize(TQSize(725, 388).expandedTo(minimumSizeHint()));
+    //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<tqsizeHint().width()<<"x"<<tqsizeHint().height()<<endl;
+    resize(TQSize(725, 388).expandedTo(tqminimumSizeHint()));
 
     setMainWidget(dia);
     enableButtonOK(false);
diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc
index 7f144704e..764c7e983 100644
--- a/kplato/kptcalendarlistdialogbase.cc
+++ b/kplato/kptcalendarlistdialogbase.cc
@@ -28,7 +28,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui
index 29f4a4fdb..04f867579 100644
--- a/kplato/kptcalendarlistpanel.ui
+++ b/kplato/kptcalendarlistpanel.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -67,7 +67,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -75,7 +75,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index 59ab2f015..e63229448 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -65,7 +65,7 @@ CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFla
 CalendarPanel::CalendarPanel( TQWidget *parent, const char *name )
   : TQFrame(parent,name)
 {
-    init( TQDate::currentDate() );
+    init( TQDate::tqcurrentDate() );
 }
 
 void CalendarPanel::init( const TQDate &dt )
@@ -96,10 +96,10 @@ void CalendarPanel::init( const TQDate &dt )
   setFontSize(10);
   line->setValidator(val);
   line->installEventFilter( this );
-  yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow")));
-  yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow")));
-  monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
-  monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
+  yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow")));
+  yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow")));
+  monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow")));
+  monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow")));
   setDate(dt); // set button texts
   connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
   connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -164,7 +164,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*)
     // ----- calculate button row height:
     for(count=0; count<NoOfButtons; ++count) {
         if ( buttons[count] ) { // closeButton may be 0L
-            sizes[count]=buttons[count]->sizeHint();
+            sizes[count]=buttons[count]->tqsizeHint();
             buttonHeight=TQMAX(buttonHeight, sizes[count].height());
         }
         else
@@ -175,7 +175,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*)
     for(count=0; count<NoOfButtons; ++count) {
         if(buttons[count]==selectMonth) {
             TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
-            sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)));
+            sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)));
         }
     }
     // ----- center buttons
@@ -195,7 +195,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*)
         x+=w;
     }
     // ----- place the line edit for direct input:
-    sizes[0]=line->sizeHint();
+    sizes[0]=line->tqsizeHint();
     int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20);
     line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height());
     d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height());
@@ -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").arg(weekOfYear(date)));
+    d->selectWeek->setText(i18n("Week %1").tqarg(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").arg(weekOfYear(date)));
+	d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
 	selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false));
 	temp.setNum(date.year());
 	selectYear->setText(temp);
@@ -285,7 +285,7 @@ CalendarPanel::selectWeekClicked()
   PopupFrame* popup = new PopupFrame(this);
   DateInternalWeekSelector* picker = new DateInternalWeekSelector(fontsize, popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
   picker->setFocus();
@@ -322,7 +322,7 @@ CalendarPanel::selectMonthClicked()
   PopupFrame* popup = new PopupFrame(this);
   DateInternalMonthPicker* picker = new DateInternalMonthPicker(fontsize, popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   picker->setFocus();
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
@@ -352,7 +352,7 @@ CalendarPanel::selectYearClicked()
   PopupFrame* popup = new PopupFrame(this);
   DateInternalYearSelector* picker = new DateInternalYearSelector(fontsize, popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
   picker->setFocus();
@@ -409,9 +409,9 @@ CalendarPanel::lineEnterPressed()
 }
 
 TQSize
-CalendarPanel::sizeHint() const
+CalendarPanel::tqsizeHint() const
 {
-  TQSize tableSize=table->sizeHint();
+  TQSize tableSize=table->tqsizeHint();
   TQWidget *buttons[]={
     yearBackward,
     monthBackward,
@@ -427,13 +427,13 @@ CalendarPanel::sizeHint() const
   // ----- store the size hints:
     for(count=0; count<NoOfButtons; ++count) {
         if ( buttons[count] )
-            sizes[count]=buttons[count]->sizeHint();
+            sizes[count]=buttons[count]->tqsizeHint();
         else
             sizes[count] = TQSize(0,0);
 
         if(buttons[count]==selectMonth) {
 	        TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
-            cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin));
+            cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin));
     	} else {
 	        cx+=sizes[count].width();
 	    }
@@ -442,7 +442,7 @@ CalendarPanel::sizeHint() const
     // ----- calculate width hint:
     cx=TQMAX(cx, tableSize.width()); // line edit ignored
     // ----- calculate height hint:
-    cy+=tableSize.height()+line->sizeHint().height();
+    cy+=tableSize.height()+line->tqsizeHint().height();
     return TQSize(cx, cy);
 }
 
@@ -471,7 +471,7 @@ CalendarPanel::setFontSize(int s)
     }
   TQFontMetrics metrics(selectMonth->fontMetrics());
   for(int i=1; i <= 12; ++i)
-    { // maxMonthRect is used by sizeHint()
+    { // maxMonthRect is used by tqsizeHint()
       r=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false));
       maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width()));
       maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
@@ -490,7 +490,7 @@ CalendarPanel::setCloseButton( bool enable )
         TQToolTip::add(d->closeButton, i18n("Close"));
         d->closeButton->setPixmap( SmallIcon("remove") );
         connect( d->closeButton, TQT_SIGNAL( clicked() ),
-                 topLevelWidget(), TQT_SLOT( close() ) );
+                 tqtopLevelWidget(), TQT_SLOT( close() ) );
     }
     else {
         delete d->closeButton;
diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h
index 0c72d763f..9cf6c4f8f 100644
--- a/kplato/kptcalendarpanel.h
+++ b/kplato/kptcalendarpanel.h
@@ -54,7 +54,7 @@ public:
     /** The usual constructor.  The given date will be displayed
     * initially.
     **/
-    CalendarPanel(TQWidget *parent=0, TQDate=TQDate::currentDate(), const char *name=0, WFlags f=0);
+    CalendarPanel(TQWidget *parent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0);
     
     /**
     * Standard qt widget constructor. The initial date will be the
@@ -73,9 +73,9 @@ public:
     *  size hint, try adding 28 to each of the reported numbers of
     *  pixels.
     **/
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     
-    TQSize minimumSizeHint() const { return sizeHint(); }
+    TQSize tqminimumSizeHint() const { return tqsizeHint(); }
     /**
     * Sets the date.
     *
@@ -113,7 +113,7 @@ public:
     /**
     * By calling this method with @p enable = true, CalendarPanel will show
     * a little close-button in the upper button-row. Clicking the
-    * close-button will cause the CalendarPanel's topLevelWidget()'s close()
+    * close-button will cause the CalendarPanel's tqtopLevelWidget()'s close()
     * method being called. This is mostly useful for toplevel datepickers
     * without a window manager decoration.
     * @see #hasCloseButton
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index 837fb48ab..59690e3a8 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -70,15 +70,15 @@ int PertNodeItem::RTTI = 2000;
 void PertNodeItem::setVisible(bool yes)
 {
     //kdDebug()<<k_funcinfo<<m_node.name()<<endl;
-	TQCanvasPolygon::setVisible(yes);
+	TQCanvasPolygon::tqsetVisible(yes);
     TQCanvasItemList list = canvas()->allItems();
     TQCanvasItemList::Iterator it = list.begin();
     for (; it != list.end(); ++it)
     {
         if ( *it == m_name )
-            m_name->setVisible(yes);
+            m_name->tqsetVisible(yes);
         if ( *it == m_leader )
-	        m_leader->setVisible(yes);
+	        m_leader->tqsetVisible(yes);
     }
 }
 
@@ -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 children
+    // Now map my tqchildren
     TQPtrListIterator<PertNodeRelation> it(m_childRelations);
     for (; it.current(); ++it)
     {
@@ -274,7 +274,7 @@ PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, Pert
 {
     //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl;
     draw();
-    setVisible(true);
+    tqsetVisible(true);
 }
 
 PertRelationItem::~PertRelationItem()
@@ -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").arg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
+            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").tqarg(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").arg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
+            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").tqarg(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").arg(this->listViewText(0));
-            t += "\n" + i18n("To: %1").arg(child->listViewText(0));
+            TQString t = i18n("From: %1").tqarg(this->listViewText(0));
+            t += "\n" + i18n("To: %1").tqarg(child->listViewText(0));
             if (it.current()->lag() > Duration::zeroDuration) {
-                t += "\n" + i18n("Lag:  %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime));
+                t += "\n" + i18n("Lag:  %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime));
             }
             link->setTooltipText(t);
             view->addTaskLink(link);
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc
index 992bfb5ca..662c0dd0d 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 invalidate schedules this node is part of
+                // Only tqinvalidate schedules this node is part of
                 addSchScheduled(it.current());
             }
         }
diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc
index 9c74302b8..45cbf64a6 100644
--- a/kplato/kptconfigbehaviorpanel.cc
+++ b/kplato/kptconfigbehaviorpanel.cc
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h> 
 #include <tqbuttongroup.h> 
 #include <tqcheckbox.h> 
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 2186d4006..729d64438 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -41,7 +41,7 @@ namespace KPlato
 // little helper stolen from kmail/kword
 static inline TQPixmap loadIcon( const char * name ) {
   return KGlobal::instance()->iconLoader()
-    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
 
diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui
index 178d1f084..31e075427 100644
--- a/kplato/kptconfigtaskpanelbase.ui
+++ b/kplato/kptconfigtaskpanelbase.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -231,7 +231,7 @@ The estimation can be either effort based or duration based. If it is effort bas
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout41</cstring>
+                        <cstring>tqlayout41</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index c4d8022dc..afa065912 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -32,7 +32,7 @@
 #include <tqpainter.h>
 #include <tqdialog.h>
 #include <assert.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvaluelist.h>
 #include <kglobalsettings.h>
 
@@ -88,7 +88,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f)
     setFontSize(10);
     if(!date_.isValid()) {
         kdError() <<k_funcinfo<<"Given date is invalid, using current date." << endl;
-        date_=TQDate::currentDate();
+        date_=TQDate::tqcurrentDate();
     }
     setFocusPolicy( TQ_StrongFocus );
     setNumCols(7+m_dateStartCol); // 7 days a week + maybe 1 for weeknumbers
@@ -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").arg(m_weeks[row].first), -1, &rect);
+    painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").tqarg(m_weeks[row].first), -1, &rect);
     painter->setPen(colorLine);
     painter->moveTo(w-1, 0);
     painter->lineTo(w-1, h-1);
@@ -232,7 +232,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) {
         painter->lineTo(w-1, h-1);
     }
     // then paint square if current date
-    if (d  == TQDate::currentDate()) {
+    if (d  == TQDate::tqcurrentDate()) {
         painter->setPen(colorLine);
         painter->drawRect(1, 1, w-2, h-2);
     }
@@ -317,7 +317,7 @@ void DateTable::keyPressEvent( TQKeyEvent *e ) {
         return;
     }
     if ( e->key() == TQt::Key_N ) {
-        setDate(TQDate::currentDate());
+        setDate(TQDate::tqcurrentDate());
         return;
     }
     if ( e->key() == TQt::Key_Control ) {
@@ -353,7 +353,7 @@ void DateTable::setFontSize(int size) {
       maxCell.setHeight(TQMAX(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
-  rect=metrics.boundingRect(TQString::fromLatin1("88"));
+  rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
   maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width()));
   maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height()));
 }
@@ -527,7 +527,7 @@ bool DateTable::selectDate(const TQDate& date_) {
     return true;
 }
 
-bool DateTable::setDate(const TQDate& date_, bool repaint) {
+bool DateTable::setDate(const TQDate& date_, bool tqrepaint) {
     //kdDebug()<<k_funcinfo<<"date="<<date_.toString()<<endl;
     bool changed=false;
     TQDate temp;
@@ -562,7 +562,7 @@ bool DateTable::setDate(const TQDate& date_, bool repaint) {
         m_selectedDates.insert(date);
     }*/
     numDaysPrevMonth=temp.daysInMonth();
-    if(changed && repaint) {
+    if(changed && tqrepaint) {
         repaintContents(false);
     }
     if (m_enabled)
@@ -582,12 +582,12 @@ void DateTable::focusOutEvent( TQFocusEvent *e ) {
     TQGridView::focusOutEvent( e );
 }
 
-TQSize DateTable::sizeHint() const {
+TQSize DateTable::tqsizeHint() const {
     if(maxCell.height()>0 && maxCell.width()>0) {
       return TQSize(maxCell.width()*numCols()+2*frameWidth(),
              (maxCell.height()+2)*numRows()+2*frameWidth());
     } else {
-      //kdDebug() << "DateTable::sizeHint: obscure failure - " << endl;
+      //kdDebug() << "DateTable::tqsizeHint: obscure failure - " << endl;
       return TQSize(-1, -1);
     }
 }
@@ -794,7 +794,7 @@ DateInternalMonthPicker::DateInternalMonthPicker
 }
 
 TQSize
-DateInternalMonthPicker::sizeHint() const
+DateInternalMonthPicker::tqsizeHint() const
 {
   return TQSize((max.width()+6)*numCols()+2*frameWidth(),
          (max.height()+6)*numRows()+2*frameWidth());
@@ -894,7 +894,7 @@ DateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
               updateCell( row, col /*, false */ ); // mark the new active cell
             }
         }
-      if ( tmpRow > -1 ) // repaint the former active cell
+      if ( tmpRow > -1 ) // tqrepaint the former active cell
           updateCell( tmpRow, tmpCol /*, true */ );
     }
 }
@@ -1053,7 +1053,7 @@ int
 PopupFrame::exec(TQPoint pos)
 {
   popup(pos);
-  repaint();
+  tqrepaint();
   tqApp->enter_loop();
   hide();
   return result;
diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h
index b75f98db8..815a86e9c 100644
--- a/kplato/kptdatetable.h
+++ b/kplato/kptdatetable.h
@@ -104,11 +104,11 @@ public:
   /**
    * The size hint.
    */
-  TQSize sizeHint() const;
+  TQSize tqsizeHint() const;
   /**
    * The minimum size hint.
    */
-  TQSize minimumSizeHint() const { return sizeHint(); }
+  TQSize tqminimumSizeHint() const { return tqsizeHint(); }
   /**
    * Return the result. 0 means no selection (reject()), 1..12 are the
    * months.
@@ -260,7 +260,7 @@ public:
     /**
      * The constructor.
      */
-    DateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(),
+    DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(),
                  const char* name="DateTable", WFlags f=0);
 
     /**
@@ -268,9 +268,9 @@ public:
      * To save some time, the size of the largest used cell content is
      * calculated in each paintCell() call, since all calculations have
      * to be done there anyway. The size is stored in maxCell. The
-     * sizeHint() simply returns a multiple of maxCell.
+     * tqsizeHint() simply returns a multiple of maxCell.
      */
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     /**
      * Set the font size of the date table.
      */
@@ -278,7 +278,7 @@ public:
     /**
      * Select and display this date.
      */
-    bool setDate(const TQDate&, bool repaint=true);
+    bool setDate(const TQDate&, bool tqrepaint=true);
     const TQDate& getDate() const;
     bool selectDate(const TQDate& date_);
 
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc
index f855509ce..2780d166e 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cc
@@ -23,10 +23,10 @@
 #include "kptview.h"
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqptrvector.h>
 #include <tqsplitter.h>
 #include <tqstring.h>
@@ -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").arg(value, m_fieldwidth, m_fmt, m_prec));
+        //setText(col, TQString("%1").tqarg(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").arg(tot, m_fieldwidth, m_fmt, m_prec));
+    //setText(1, TQString("%1").tqarg(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").arg(m_value, m_fieldwidth, m_fmt, m_prec));
+    //setText(1, TQString("%1").tqarg(m_value, m_fieldwidth, m_fmt, m_prec));
     setText(1, KGlobal::locale()->formatNumber(m_value, m_prec));
 }
 
@@ -388,9 +388,9 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description)
     
 }
 
-TQSize DoubleListViewBase::sizeHint() const {
-    //kdDebug()<<k_funcinfo<<minimumSizeHint()<<endl;
-    return minimumSizeHint();  //HACK: koshell splitter problem
+TQSize DoubleListViewBase::tqsizeHint() const {
+    //kdDebug()<<k_funcinfo<<tqminimumSizeHint()<<endl;
+    return tqminimumSizeHint();  //HACK: koshell splitter problem
 }
 
 void DoubleListViewBase::clearSlaveList() {
diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h
index 6b6104753..aaaaf3059 100644
--- a/kplato/kptdoublelistviewbase.h
+++ b/kplato/kptdoublelistviewbase.h
@@ -83,7 +83,7 @@ public:
     void setFormat(int fieldwidth=0, char fmt='f', int prec=0);
     void setMasterFormat(int fieldwidth=0, char fmt='f', int prec=0);
     void setSlaveFormat(int fieldwidth=0, char fmt='f', int prec=0);
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     
     class MasterListItem;
     class SlaveListItem : public KListViewItem {
@@ -125,7 +125,7 @@ public:
         MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false);
         ~MasterListItem();
         
-        /// Creates slaveitems for myself and my children
+        /// Creates slaveitems for myself and my tqchildren
         void createSlaveItems(TQListView *lv, TQListViewItem *after=0);
         void slaveItemDeleted();
         void setSlaveOpen(bool on);
diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc
index 0a2296b00..5e9d6b44e 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").arg(hours).arg(minutes);
+            result = TQString("%1h%2m").tqarg(hours).tqarg(minutes);
             break;
         case Format_Day:
             days = m_ms / (1000 * 60 * 60 * 24.0);
-            result = TQString("%1d").arg(TQString::number(days, 'f', 4));
+            result = TQString("%1d").tqarg(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").arg(hours).arg(minutes);
+            result = i18n("<hours>h:<minutes>m", "%1h:%2m").tqarg(hours).tqarg(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").arg(days).arg(hours).arg(minutes);
+                result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").tqarg(days).tqarg(hours).tqarg(minutes);
             }
             break;
         case Format_i18nHourFraction:
diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui
index 74018692a..a923dab49 100644
--- a/kplato/kptdurationwidget.ui
+++ b/kplato/kptdurationwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -48,13 +48,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32676</width>
                     <height>20</height>
@@ -106,13 +106,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>70</width>
                             <height>32767</height>
@@ -125,7 +125,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -163,7 +163,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>50</width>
                             <height>32767</height>
@@ -175,7 +175,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -202,7 +202,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>50</width>
                             <height>32767</height>
@@ -214,7 +214,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -252,7 +252,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>50</width>
                             <height>32767</height>
@@ -264,7 +264,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
@@ -302,13 +302,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>32</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>50</width>
                             <height>32767</height>
@@ -320,7 +320,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignRight</set>
                     </property>
                 </widget>
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc
index fa5bca1ef..925598f9a 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -45,7 +45,7 @@
 
 #include <tqsplitter.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqheader.h>
 #include <tqpopupmenu.h>
@@ -73,8 +73,8 @@ public:
     MyKDGanttView(TQWidget *parent, const char *name)
     : KDGanttView(parent, name) {
     }
-    virtual TQSize sizeHint() const {
-        return minimumSizeHint(); //HACK: koshell splitter minimumSize problem
+    virtual TQSize tqsizeHint() const {
+        return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem
     }
 };
 
@@ -322,7 +322,7 @@ void GanttView::resetDrawn(KDGanttViewItem *_item)
     for (; item; item = nextItem) {
         nextItem = item->nextSibling();
         setDrawn(item, false);
-        resetDrawn(item->firstChild()); // then my children
+        resetDrawn(item->firstChild()); // then my tqchildren
     }
 }
 
@@ -336,7 +336,7 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item)
                 m_currentItem = 0;
             deleteItem(item);
         } else {
-            removeNotDrawn(item->firstChild()); // then my children
+            removeNotDrawn(item->firstChild()); // then my tqchildren
         }
     }
 }
@@ -502,10 +502,10 @@ void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task)
     } else {
         item->setText(TQString());
     }    
-    TQString w = i18n("Name: %1").arg(task->name());
+    TQString w = i18n("Name: %1").tqarg(task->name());
     if (!task->notScheduled()) {
-        w += "\n" + i18n("Start: %1").arg(locale->formatDateTime(task->startTime()));
-        w += "\n" + i18n("End: %1").arg(locale->formatDateTime(task->endTime()));
+        w += "\n" + i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime()));
+        w += "\n" + i18n("End: %1").tqarg(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").arg(task->name());
+    TQString w = i18n("Name: %1").tqarg(task->name());
     if (!task->notScheduled()) {
-        w += "\n"; w += i18n("Start: %1").arg(locale->formatDateTime(task->startTime()));
-        w += "\n"; w += i18n("End: %1").arg(locale->formatDateTime(task->endTime()));
+        w += "\n"; w += i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime()));
+        w += "\n"; w += i18n("End: %1").tqarg(locale->formatDateTime(task->endTime()));
         if (m_showProgress) {
-            w += "\n"; w += i18n("Completion: %1%").arg(task->progress().percentFinished);
+            w += "\n"; w += i18n("Completion: %1%").tqarg(task->progress().percentFinished);
         }
         if (task->positiveFloat() > Duration::zeroDuration) {
-            w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
+            w += "\n" + i18n("Float: %1").tqarg(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").arg(rl.join(","));
+            sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").tqarg(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").arg(task->name());
+    TQString w = i18n("Name: %1").tqarg(task->name());
     if (!task->notScheduled()) {
-        w += "\n" + i18n("Time: %1").arg(locale->formatDateTime(task->startTime()));
+        w += "\n" + i18n("Time: %1").tqarg(locale->formatDateTime(task->startTime()));
         
         if (task->positiveFloat() > Duration::zeroDuration) {
-            w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
+            w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime));
         }
         if (task->inCriticalPath()) {
             w += "\n" + i18n("Critical path");
@@ -1048,7 +1048,7 @@ void GanttView::print(KPrinter &prt) {
     p.drawRect(0,0,metrics.width(),metrics.height());
     TQString text;
     int hei = 0;
-    text = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+    text = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
     TQRect r = p.boundingRect(metrics.width()-1,0,0,0, TQt::AlignRight, text );
     p.drawText( r, TQt::AlignRight, text );
     hei = r.height();
diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui
index 4967bd4ad..76b00dc42 100644
--- a/kplato/kptintervaleditbase.ui
+++ b/kplato/kptintervaleditbase.ui
@@ -50,7 +50,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -70,7 +70,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc
index ee8ed8fc4..a9f40ae0c 100644
--- a/kplato/kptmainprojectdialog.cc
+++ b/kplato/kptmainprojectdialog.cc
@@ -39,7 +39,7 @@ MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *n
     
     setMainWidget(panel);
     enableButtonOK(false);
-    resize( TQSize(500, 410).expandedTo(minimumSizeHint()));
+    resize( TQSize(500, 410).expandedTo(tqminimumSizeHint()));
     connect(panel, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool)));
 }
 
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc
index 29f2195e6..222ca0a9c 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)").arg(sch->typeToString(true));
+        s = i18n("Scheduling (%1)").tqarg(sch->typeToString(true));
     }
     schedulingGroup->setTitle(s);
     if (project.constraint() == Node::MustStartOn) {
diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui
index 5a0ccb9ac..f6622781e 100644
--- a/kplato/kptmainprojectpanelbase.ui
+++ b/kplato/kptmainprojectpanelbase.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -46,7 +46,7 @@
                     <property name="text">
                         <string>&amp;Leader:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>270</width>
                             <height>20</height>
@@ -99,7 +99,7 @@
                     <property name="name">
                         <cstring>wbs</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc
index 67b884437..b5c1af0a6 100644
--- a/kplato/kptmilestoneprogresspanel.cc
+++ b/kplato/kptmilestoneprogresspanel.cc
@@ -85,7 +85,7 @@ void MilestoneProgressPanelImpl::slotChanged() {
 void MilestoneProgressPanelImpl::slotFinishedChanged(bool state) {
     if (state) {
         if (!finishTime->dateTime().isValid()) {
-            finishTime->setDateTime(TQDateTime::currentDateTime());
+            finishTime->setDateTime(TQDateTime::tqcurrentDateTime());
         }
     }   
     enableWidgets();
diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui
index 9856eca5a..97a06f4d9 100644
--- a/kplato/kptmilestoneprogresspanelbase.ui
+++ b/kplato/kptmilestoneprogresspanelbase.ui
@@ -43,7 +43,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index c95a1c9b2..1da218e68 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -96,7 +96,7 @@ void Node::init() {
     m_visitedForward = false;
     m_visitedBackward = false;
     
-    m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::currentDate();
+    m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::tqcurrentDate();
     m_dateOnlyDuration.addDays(1);
     
     m_runningAccount = 0;
@@ -942,7 +942,7 @@ int Effort::pessimisticRatio() const {
 
 // Debugging
 #ifndef NDEBUG
-void Node::printDebug(bool children, TQCString indent) {
+void Node::printDebug(bool tqchildren, 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 children, TQCString indent) {
     }
     kdDebug()<<indent<<"  No of successors: "<<m_dependChildNodes.count()<<endl;
     TQPtrListIterator<Relation> cit(m_dependChildNodes);
-    //kdDebug()<<indent<<"  Dependant children="<<cit.count()<<endl;
+    //kdDebug()<<indent<<"  Dependant tqchildren="<<cit.count()<<endl;
     if (cit.count() > 0) {
         for ( ; cit.current(); ++cit ) {
             cit.current()->printDebug(indent);
@@ -981,7 +981,7 @@ void Node::printDebug(bool children, TQCString indent) {
 
     //kdDebug()<<indent<<endl;
     indent += "  ";
-    if (children) {
+    if (tqchildren) {
         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 10c5613f6..95d7c24b7 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 childrens relations.
+    /// Save my and my tqchildrens 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 children
+    /// Set current schedule to schedule with identity id, for me and my tqchildren
     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 children, TQCString indent);
+    virtual void printDebug(bool tqchildren, TQCString indent);
 #endif
 
 };
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index 7ff060841..e442c048f 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").arg(value));
+        setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").tqarg(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.").arg(m_syntaxVersion),
+                    "Opening it in this version of KPlato will lose some information.").tqarg(m_syntaxVersion),
             i18n("File-Format Mismatch"), i18n("Continue") );
         if (ret == KMessageBox::Cancel)
         {
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index 09a3e744e..b1f49afb7 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -25,7 +25,7 @@
 
 #include <tqbuffer.h>
 #include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqprogressdialog.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
@@ -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 children
+            it.current()->move(this, m_rows.count()-1, 0); // item also moves it's tqchildren
         }
     }
     // now items without relations
@@ -140,7 +140,7 @@ void PertCanvas::createChildItems(PertNodeItem *parentItem)
             m_relations.append(it.current());
     }
 
-    // Now my children
+    // Now my tqchildren
 	TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator());
     for ( ; nit.current(); ++nit ) {
         createChildItems(createNodeItem(nit.current()));
diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc
index f573e3104..02830d37f 100644
--- a/kplato/kptpertview.cc
+++ b/kplato/kptpertview.cc
@@ -30,7 +30,7 @@
 
 #include <tqsplitter.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqheader.h>
 #include <tqpopupmenu.h>
@@ -40,19 +40,19 @@
 namespace KPlato
 {
 
-PertView::PertView( View *view, TQWidget *parent, TQLayout *layout )
+PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout )
     : TQWidget( parent, "Pert view" ),
     m_mainview( view ),
     m_node( 0 )
 {
-    init(layout);
+    init(tqlayout);
 }
 
 PertView::~PertView()
 {
 }
 
-void PertView::init(TQLayout */*layout*/)
+void PertView::init(TQLayout */*tqlayout*/)
 {
     //kdDebug()<<k_funcinfo<<endl;
     TQGridLayout *gl = new TQGridLayout(this, 1, 1, -1, -1, "Pert TQGridLayout");
diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h
index 4937a4212..b98b2cae9 100644
--- a/kplato/kptpertview.h
+++ b/kplato/kptpertview.h
@@ -44,7 +44,7 @@ class PertView : public TQWidget
     
 public:
  
-    PertView( View *view, TQWidget *parent, TQLayout *layout );
+    PertView( View *view, TQWidget *parent, TQLayout *tqlayout );
 
     ~PertView();
     
@@ -70,7 +70,7 @@ signals:
     void modifyRelation(Relation *rel);
 
 private:
-    void init(TQLayout *layout);
+    void init(TQLayout *tqlayout);
     View *m_mainview;
     PertCanvas *m_canvasview;
     Node *m_node;
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc
index 4b91916d4..9379de4ab 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cc
@@ -31,7 +31,7 @@
 #include <tqdom.h>
 #include <tqstring.h>
 #include <tqdatetime.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcanvas.h>
 #include <tqptrlist.h>
 
@@ -56,7 +56,7 @@ Project::Project(Node *parent)
 void Project::init() {
     if (m_parent == 0) {
         // set sensible defaults for a project wo parent
-        m_constraintStartTime = TQDateTime(TQDate::currentDate(), TQTime());
+        m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime());
         m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1));
     }
     m_calendars.setAutoDelete(true);
@@ -308,7 +308,7 @@ bool Project::load(TQDomElement &element) {
     if (!s.isEmpty())
         m_constraintEndTime = DateTime::fromString(s);
     
-    // Load the project children
+    // Load the project tqchildren
     // 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 children
+    // Save all tqchildren
     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 children
+	// we have to tell the parent that we want to delete one of its tqchildren
 	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 children
+    // we have to find the parent of task to manipulate its list of tqchildren
     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 children
+    // we have to find the parent of task to manipulate its list of tqchildren
     // 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 children
+    // we have to find the parent of task to manipulate its list of tqchildren
     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 children
+    // we have to find the parent of task to manipulate its list of tqchildren
     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").arg(i))) {
+    while (findNode(TQString("%1").tqarg(i))) {
         ++i;
     }
-    return TQString("%1").arg(i);
+    return TQString("%1").tqarg(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()<<" children)"<<endl;
+    //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<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()<<" children)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<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()<<" children)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<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 children, TQCString indent) {
+void Project::printDebug(bool tqchildren, TQCString indent) {
 
     kdDebug()<<indent<<"+ Project node: "<<name()<<endl;
     indent += "!";
@@ -1087,7 +1087,7 @@ void Project::printDebug(bool children, TQCString indent) {
     for ( ; it.current(); ++it)
         it.current()->printDebug(indent);
 
-    Node::printDebug(children, indent);
+    Node::printDebug(tqchildren, indent);
 }
 void Project::printCalendarDebug(TQCString indent) {
     kdDebug()<<indent<<"-------- Calendars debug printout --------"<<endl;
diff --git a/kplato/kptproject.h b/kplato/kptproject.h
index d0dd1eb94..14f03384f 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 children
+    /// Set current schedule to schedule with identity id, for me and my tqchildren
     virtual void setCurrentSchedule(long id);
     /// Create new schedule with unique id.
     MainSchedule *createSchedule(TQString name, Schedule::Type type);
-    /// Set parent schedule for my children
+    /// Set parent schedule for my tqchildren
     virtual void setParentSchedule(Schedule *sch);
     
 protected:
@@ -267,7 +267,7 @@ private:
 #ifndef NDEBUG
 #include <tqcstring.h>
 public:
-    void printDebug(bool children, TQCString indent);
+    void printDebug(bool tqchildren, TQCString indent);
     void printCalendarDebug(TQCString indent="");
 #ifdef DEBUGPERT
     static void pert_test();
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc
index 4b9b81399..a45bddf29 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cc
@@ -20,12 +20,12 @@
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlineedit.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <kdatepicker.h>
 #include <klocale.h>
@@ -91,24 +91,24 @@ void ProjectDialog::slotSchedulingChanged(int activated) {
     switch(activated) {
         // TODO please provide nice explenations on this.
         case 0: // ASAP
-            label = label.arg(i18n("As Soon as Possible"));
-            label = label.arg(i18n("Place all events at the earliest possible moment permitted in the schedule"));
+            label = label.tqarg(i18n("As Soon as Possible"));
+            label = label.tqarg(i18n("Place all events at the earliest possible moment permitted in the schedule"));
             break;
         case 1: // ALAP
-            label = label.arg(i18n("As Late as Possible"));
-            label = label.arg(i18n("Place all events at the last possible moment permitted in the schedule"));
+            label = label.tqarg(i18n("As Late as Possible"));
+            label = label.tqarg(i18n("Place all events at the last possible moment permitted in the schedule"));
             break;
         case 2: // Start not earlier then
-            label = label.arg(i18n("Start not Earlier then"));
-            label = label.arg(i18n(""));
+            label = label.tqarg(i18n("Start not Earlier then"));
+            label = label.tqarg(i18n(""));
             break;
         case 3: // Finish not later then
-            label = label.arg(i18n("Finish not Later then"));
-            label = label.arg(i18n(""));
+            label = label.tqarg(i18n("Finish not Later then"));
+            label = label.tqarg(i18n(""));
             break;
         case 4: // Must start on
-            label = label.arg(i18n("Must Start on"));
-            label = label.arg(i18n(""));
+            label = label.tqarg(i18n("Must Start on"));
+            label = label.tqarg(i18n(""));
             break;
         default: // error ...
             dia->lSchedulingExplain->setText("");
diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui
index 8eb79e697..2dab71fe9 100644
--- a/kplato/kptprojectdialogbase.ui
+++ b/kplato/kptprojectdialogbase.ui
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout5</cstring>
+                            <cstring>tqlayout5</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -153,7 +153,7 @@
                                 <property name="name">
                                     <cstring>schedulerDate</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>200</height>
@@ -201,7 +201,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>121</width>
                                         <height>20</height>
diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc
index f10a50228..c79adb6f4 100644
--- a/kplato/kptrelationdialog.cc
+++ b/kplato/kptrelationdialog.cc
@@ -25,7 +25,7 @@
 #include "kptdurationwidget.h"
 #include "relationpanel.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc
index a79f34e9a..655d19071 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cc
@@ -45,7 +45,7 @@
 #include <tqfileinfo.h>
 #include <tqheader.h>
 #include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <tqstringlist.h>
 
@@ -83,7 +83,7 @@ public:
         if (!tag.contains('.')) {
             // global tags
             if (tag == "currentdate") {
-                return l->formatDate(TQDate::currentDate(), true);
+                return l->formatDate(TQDate::tqcurrentDate(), true);
             }
             return TQString();
         }
@@ -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%").arg(m_resource->units()) : TQString());
+                return (m_resource ? TQString("%1%").tqarg(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 children = tpl.childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = tpl.childNodes();
+    int childCount = tqchildren.length();
 
     for(int j = 0; j < childCount; j++){
-        child = children.item(j);
+        child = tqchildren.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 children = node.childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = node.childNodes();
+    int childCount = tqchildren.length();
     for (int j = 0; j < childCount; j++) {
-        child = children.item(j);
+        child = tqchildren.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").arg(url.prettyURL()));
+			KMessageBox::sorry(this,i18n("Malformed template filename: %1").tqarg(url.prettyURL()));
 	}
 	else
 	{
 		if (KIO::NetAccess::download(url,localtpl,this))
 			isTemp = true;
 		else
-			KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL()));
+			KMessageBox::sorry(this,i18n("Unable to download template file: %1").tqarg(url.prettyURL()));
 	}
 
 	if (!localtpl.isNull())
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc
index bca9a2089..d65f86e72 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").arg(group->units())),
+    : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())),
       m_group(group),
       m_units(0)
 {
diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc
index 2c218fe9a..448074aed 100644
--- a/kplato/kptresource.cc
+++ b/kplato/kptresource.cc
@@ -203,7 +203,7 @@ Resource::Resource(Project *project) : m_project(project), m_schedules(), m_work
     m_type = Type_Work;
     m_units = 100; // %
 
-    m_availableFrom = DateTime(TQDate::currentDate());
+    m_availableFrom = DateTime(TQDate::tqcurrentDate());
     m_availableUntil = TQDateTime(m_availableFrom.addYears(2));
 
     cost.normalRate = 100;
diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc
index 5531156f0..4b6d7a446 100644
--- a/kplato/kptresourceappointmentsview.cc
+++ b/kplato/kptresourceappointmentsview.cc
@@ -200,7 +200,7 @@ void ResourceAppointmentsView::print(KPrinter &/*printer*/) {
 //     m_dlv->setSizes(list);
 //     m_date = context.date;
 //     if (!m_date.isValid())
-//         m_date = TQDate::currentDate();
+//         m_date = TQDate::tqcurrentDate();
 //     m_period = context.period;
 //     m_cumulative = context.cumulative;
 //     
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc
index 58ea413ed..d596ff444 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cc
@@ -203,7 +203,7 @@ protected:
                 c = fc;
                 // draw to last interesting column
     
-                const TQColorGroup &cg = ( palette().inactive() );
+                const TQColorGroup &cg = ( tqpalette().inactive() );
     
                 while ( c < lc && !drawables.isEmpty() ) {
                     int i = header()->mapToLogical( c );
@@ -240,7 +240,7 @@ protected:
             if ( tx < 0 )
                 tx = header()->cellPos( cell );
     
-            // do any children of current need to be painted?
+            // do any tqchildren of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
               if ( ih != ith && 
                  rootIsDecorated() &&
@@ -268,7 +268,7 @@ protected:
                     p->translate( rleft, crtop );
                     //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl;
 
-                     current->i->paintBranches( p, colorGroup(), treeStepSize(),
+                     current->i->paintBranches( p, tqcolorGroup(), treeStepSize(),
                                              rtop - crtop, r.height() );
                     p->restore();
                 }
@@ -362,8 +362,8 @@ public:
     TQDate date;
 };
 
-TQSize ResourceView::sizeHint() const {
-    return minimumSizeHint(); // HACK: koshell splitter minimumSize problem
+TQSize ResourceView::tqsizeHint() const {
+    return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem
 }
 
 ResourceView::ResourceView(View *view, TQWidget *parent)
diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h
index 7154af8f5..b3049ed37 100644
--- a/kplato/kptresourceview.h
+++ b/kplato/kptresourceview.h
@@ -71,7 +71,7 @@ class ResourceItemPrivate;
     virtual bool setContext(Context::Resourceview &context);
     virtual void getContext(Context::Resourceview &context) const;
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     
 public slots:
     void setShowAppointments(bool on) { m_showAppointments = on; }
diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc
index c244a57e5..fb5a9c0ea 100644
--- a/kplato/kptstandardworktimedialog.cc
+++ b/kplato/kptstandardworktimedialog.cc
@@ -31,7 +31,7 @@
 #include <tqspinbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cc
index 97cc47e0c..73ba4f951 100644
--- a/kplato/kptsummarytaskgeneralpanel.cc
+++ b/kplato/kptsummarytaskgeneralpanel.cc
@@ -35,7 +35,7 @@
 #include <kabc/addresseedialog.h>
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h> 
 #include <tqdatetimeedit.h> 
diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui
index afef245ea..57dd2654e 100644
--- a/kplato/kptsummarytaskgeneralpanelbase.ui
+++ b/kplato/kptsummarytaskgeneralpanelbase.ui
@@ -13,7 +13,7 @@
             <height>250</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>0</height>
@@ -31,7 +31,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -39,7 +39,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -95,7 +95,7 @@ This is not limited to persons available in a resource group but can be anyone.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -103,7 +103,7 @@ This is not limited to persons available in a resource group but can be anyone.
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -127,7 +127,7 @@ This is not limited to persons available in a resource group but can be anyone.
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -171,7 +171,7 @@ This is not limited to persons available in a resource group but can be anyone.
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc
index 43ccb1bbc..964b8e4ea 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cc
@@ -29,7 +29,7 @@
 #include "kptschedule.h"
 
 #include <tqdom.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <kdebug.h>
 
 namespace KPlato
@@ -198,7 +198,7 @@ bool Task::load(TQDomElement &element, Project &project) {
     
     m_wbs = element.attribute("wbs", "");
     
-    // Load the project children
+    // Load the project tqchildren
     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 children and dependent nodes
+        // propagate my relations to my tqchildren 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 children
+        // propagate to my tqchildren
         //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 children
+        // propagate to my tqchildren
         //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 children "<<m_name<<" to "<<node->name()<<endl;
+            //kdDebug()<<"Add parent proxy from my tqchildren "<<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 children "<<m_name<<" to "<<node->name()<<endl;
+            //kdDebug()<<"Add child proxy from my tqchildren "<<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 children, TQCString indent) {
+void Task::printDebug(bool tqchildren, 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 children, TQCString indent) {
     if (m_requests)
         m_requests->printDebug(indent);
     
-    Node::printDebug(children, indent);
+    Node::printDebug(tqchildren, indent);
 
 }
 
diff --git a/kplato/kpttask.h b/kplato/kpttask.h
index 55abd23fd..2d3776dbf 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 children
+    /// Set current schedule to schedule with identity id, for me nd my tqchildren
     virtual void setCurrentSchedule(long id);
     
     virtual bool effortMetError() const;
@@ -296,7 +296,7 @@ private:
     
 #ifndef NDEBUG
 public:
-    void printDebug(bool children, TQCString indent);
+    void printDebug(bool tqchildren, TQCString indent);
 #endif
 
 };
diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc
index 387e75e52..5e96030e4 100644
--- a/kplato/kpttaskappointmentsview.cc
+++ b/kplato/kpttaskappointmentsview.cc
@@ -151,7 +151,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) {
 //     m_dlv->setSizes(list);
 //     m_date = context.date;
 //     if (!m_date.isValid())
-//         m_date = TQDate::currentDate();
+//         m_date = TQDate::tqcurrentDate();
 //     m_period = context.period;
 //     m_cumulative = context.cumulative;
 //     
diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h
index b06fb4be7..7e090fb7a 100644
--- a/kplato/kpttaskappointmentsview.ui.h
+++ b/kplato/kpttaskappointmentsview.ui.h
@@ -90,7 +90,7 @@ void TaskAppointmentsView::init()
     m_appList->setColumnAlignment(6, AlignRight);
     
     m_task = 0;
-    m_date->setDate(TQDate::currentDate());
+    m_date->setDate(TQDate::tqcurrentDate());
      
 }
 
@@ -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").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));
+    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));
 
 }
 
diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui
index 9907a26ac..38250f2bc 100644
--- a/kplato/kpttaskcostpanelbase.ui
+++ b/kplato/kpttaskcostpanelbase.ui
@@ -65,7 +65,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -129,7 +129,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -193,7 +193,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc
index 5d5c779ab..3fd5472b1 100644
--- a/kplato/kpttaskdefaultpanel.cc
+++ b/kplato/kpttaskdefaultpanel.cc
@@ -38,7 +38,7 @@
 #include <kabc/addresseedialog.h>
 #include <kdatewidget.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h> 
 #include <tqdatetimeedit.h> 
@@ -81,7 +81,7 @@ void TaskDefaultPanel::setStartValues(Task &task, StandardWorktime *workTime) {
     if (task.constraintStartTime().isValid()) {
         setStartDateTime(task.constraintStartTime());
     } else {
-        TQDate date = TQDate::currentDate();
+        TQDate date = TQDate::tqcurrentDate();
         setStartDateTime(TQDateTime(date, TQTime())); 
     }
     if (task.constraintEndTime().isValid()) {
diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc
index c40554de3..6dd1dad2d 100644
--- a/kplato/kpttaskgeneralpanel.cc
+++ b/kplato/kpttaskgeneralpanel.cc
@@ -39,7 +39,7 @@
 #include <kabc/addresseedialog.h>
 #include <kdatewidget.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h> 
 #include <tqdatetimeedit.h> 
@@ -93,7 +93,7 @@ void TaskGeneralPanel::setStartValues(Task &task, StandardWorktime *workTime) {
     if (task.constraintStartTime().isValid()) {
         setStartDateTime(task.constraintStartTime());
     } else {
-        TQDate date = TQDate::currentDate();
+        TQDate date = TQDate::tqcurrentDate();
         setStartDateTime(TQDateTime(date, TQTime())); 
     }
     if (task.constraintEndTime().isValid()) {
diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui
index 5d950f6b1..1d153a02b 100644
--- a/kplato/kpttaskgeneralpanelbase.ui
+++ b/kplato/kpttaskgeneralpanelbase.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -33,7 +33,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -89,7 +89,7 @@ This is not limited to persons available in a resource group but can be anyone.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -97,7 +97,7 @@ This is not limited to persons available in a resource group but can be anyone.
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -121,7 +121,7 @@ This is not limited to persons available in a resource group but can be anyone.
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -159,7 +159,7 @@ This is not limited to persons available in a resource group but can be anyone.
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -316,7 +316,7 @@ The estimation can be either effort based or duration based. If it is effort bas
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout41</cstring>
+                        <cstring>tqlayout41</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui
index f3f52ab9e..90f413ffa 100644
--- a/kplato/kpttasknotespanelbase.ui
+++ b/kplato/kpttasknotespanelbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc
index bed7a3c21..e8cfb570f 100644
--- a/kplato/kpttaskprogresspanel.cc
+++ b/kplato/kpttaskprogresspanel.cc
@@ -147,7 +147,7 @@ void TaskProgressPanelImpl::slotChanged() {
 
 void TaskProgressPanelImpl::slotStartedChanged(bool state) {
     if (state) {
-        startTime->setDateTime(TQDateTime::currentDateTime());
+        startTime->setDateTime(TQDateTime::tqcurrentDateTime());
         percentFinished->setValue(0);
     }
     enableWidgets();
@@ -158,7 +158,7 @@ void TaskProgressPanelImpl::slotFinishedChanged(bool state) {
     if (state) {
         percentFinished->setValue(100);
         if (!finishTime->dateTime().isValid()) {
-            finishTime->setDateTime(TQDateTime::currentDateTime());
+            finishTime->setDateTime(TQDateTime::tqcurrentDateTime());
         }
     }   
     enableWidgets();
diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui
index b4c5b24f8..00d23ddac 100644
--- a/kplato/kpttaskprogresspanelbase.ui
+++ b/kplato/kpttaskprogresspanelbase.ui
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>61</width>
                             <height>41</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
@@ -204,7 +204,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>70</height>
@@ -226,7 +226,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -247,7 +247,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -258,7 +258,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -279,7 +279,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -290,7 +290,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -303,7 +303,7 @@
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>320</width>
                                     <height>0</height>
@@ -320,7 +320,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>59</width>
                                     <height>20</height>
@@ -365,7 +365,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui
index 934448942..dfa3b818b 100644
--- a/kplato/kpttaskresourcespanelbase.ui
+++ b/kplato/kpttaskresourcespanelbase.ui
@@ -49,7 +49,7 @@
             <property name="name">
                 <cstring>groupList</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
@@ -58,7 +58,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kplato/kptview.cc b/kplato/kptview.cc
index 5e99a9da5..e986ea99e 100644
--- a/kplato/kptview.cc
+++ b/kplato/kptview.cc
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqiconset.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsplitter.h>
 #include <tqcanvas.h>
 #include <tqscrollview.h>
@@ -102,9 +102,9 @@ namespace KPlato
 View::View(Part* part, TQWidget* parent, const char* /*name*/)
     : KoView(part, parent, "Main View"),
     m_ganttview(0),
-    m_ganttlayout(0),
+    m_gantttqlayout(0),
     m_pertview(0),
-    m_pertlayout(0),
+    m_perttqlayout(0),
 //    m_reportview(0),
     m_baselineMode(false),
     m_currentEstimateType(Effort::Use_Expected)
@@ -122,15 +122,15 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/)
     dcopObject();
 
     m_tab = new TQWidgetStack(this);
-    TQVBoxLayout *layout = new TQVBoxLayout(this);
-    layout->add(m_tab);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    tqlayout->add(m_tab);
 
     m_ganttview = new GanttView(m_tab, part->isReadWrite());
     m_tab->addWidget(m_ganttview);
     m_updateGanttview = false;
     m_ganttview->draw(getPart()->getProject());
 
-    m_pertview = new PertView( this, m_tab, layout );
+    m_pertview = new PertView( this, m_tab, tqlayout );
     m_tab->addWidget(m_pertview);
 
     m_resourceview = new ResourceView( this, m_tab );
diff --git a/kplato/kptview.h b/kplato/kptview.h
index b2c853469..38d93501b 100644
--- a/kplato/kptview.h
+++ b/kplato/kptview.h
@@ -176,9 +176,9 @@ protected:
 
 private:
     GanttView *m_ganttview;
-    TQHBoxLayout *m_ganttlayout;
+    TQHBoxLayout *m_gantttqlayout;
     PertView *m_pertview;
-    TQHBoxLayout *m_pertlayout;
+    TQHBoxLayout *m_perttqlayout;
     TQWidgetStack *m_tab;
     ResourceView *m_resourceview;
     AccountsView *m_accountsview;
diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc
index e25f9fe60..fd6b48aab 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").arg(index);
+        return TQString("%1").tqarg(index);
     }
     if (def.code == "Roman, lower case") {
-        return TQString("%1").arg(toRoman(index));
+        return TQString("%1").tqarg(toRoman(index));
     }
     if (def.code == "Roman, upper case") {
-        return TQString("%1").arg(toRoman(index, true));
+        return TQString("%1").tqarg(toRoman(index, true));
     }
     if (def.code == "Letter, lower case") {
         if (index > 26) {
             index = 0;
         }
-        return TQString("%1").arg(Letters[index]);
+        return TQString("%1").tqarg(Letters[index]);
     }
     if (def.code == "Letter, upper case") {
         if (index > 26) {
             index = 0;
         }
-        return TQString("%1").arg(Letters[index].upper());
+        return TQString("%1").tqarg(Letters[index].upper());
     }
     return TQString();
 }
@@ -140,7 +140,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"};
 TQString WBSDefinition::toRoman( int n, bool upper )
 {
     if ( n >= 0 ) {
-        TQString s = TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] +
+        TQString s = TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] +
                                          RNHundreds[ ( n / 100 ) % 10 ] +
                                          RNTens[ ( n / 10 ) % 10 ] +
                                          RNUnits[ ( n ) % 10 ] );
diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc
index 083c92167..8dcfe8914 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").arg(it.key()));
+        levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(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 ").arg(i);
+            s += TQString("Row[%1]=selected ").tqarg(i);
             rowSelected = true;
         }
     }
@@ -141,7 +141,7 @@ void WBSDefinitionPanel::slotAddBtnClicked() {
     }
     i++;
     levelsTable->insertRows(i);
-    levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(level->value()));
+    levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(level->value()));
     TQComboTableItem *item = new TQComboTableItem(levelsTable, m_def.codeList(), true);
     levelsTable->setItem(i, 0, item);
     levelsTable->clearSelection();
diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui
index 5f76c4f4d..4656ce4eb 100644
--- a/kplato/kptwbsdefinitionpanelbase.ui
+++ b/kplato/kptwbsdefinitionpanelbase.ui
@@ -39,7 +39,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -121,7 +121,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -145,7 +145,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>140</width>
                                     <height>20</height>
@@ -154,7 +154,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kplato/kptxmlloaderobject.h b/kplato/kptxmlloaderobject.h
index 272c3599c..814af40b2 100644
--- a/kplato/kptxmlloaderobject.h
+++ b/kplato/kptxmlloaderobject.h
@@ -46,18 +46,18 @@ public:
     
     void startLoad() {
         m_timer.start();
-        m_starttime = TQDateTime::currentDateTime();
+        m_starttime = TQDateTime::tqcurrentDateTime();
         m_errors = m_warnings = 0;
         m_log.clear();
-        addMsg(TQString("Loading started at %1").arg(m_starttime.toString()));
+        addMsg(TQString("Loading started at %1").tqarg(m_starttime.toString()));
     }
     void stopLoad() { 
         m_elapsed = m_timer.elapsed();
-        addMsg(TQString("Loading finished at %1, took %2").arg(TQDateTime::currentDateTime().toString()).arg(formatElapsed()));
+        addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::tqcurrentDateTime().toString()).tqarg(formatElapsed()));
     }
     TQDateTime lastLoaded() const { return m_starttime; }
     int elapsed() const { return m_elapsed; }
-    TQString formatElapsed() { return TQString("%1 seconds").arg((double)m_elapsed/1000); }
+    TQString formatElapsed() { return TQString("%1 seconds").tqarg((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").arg(s, 13).arg(msg);
+        m_log<<TQString("%1: %2").tqarg(s, 13).tqarg(msg);
     }
     void addMsg(TQString msg) { m_log<<msg; }
     void increment(int sev) {
diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui
index 2f7b904e0..409a52f97 100644
--- a/kplato/relationpanel.ui
+++ b/kplato/relationpanel.ui
@@ -24,7 +24,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -47,7 +47,7 @@
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -121,7 +121,7 @@
                             <property name="text">
                                 <string>From:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignTop</set>
                             </property>
                         </widget>
@@ -140,7 +140,7 @@
                             <property name="text">
                                 <string>To:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignTop</set>
                             </property>
                         </widget>
@@ -151,7 +151,7 @@
                             <property name="text">
                                 <string>Task 1</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignTop</set>
                             </property>
                         </widget>
@@ -162,7 +162,7 @@
                             <property name="text">
                                 <string>Task 2</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignTop</set>
                             </property>
                         </widget>
@@ -207,7 +207,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -220,7 +220,7 @@
                             <property name="text">
                                 <string>Lag:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignBottom</set>
                             </property>
                         </widget>
@@ -236,7 +236,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui
index f7b75137e..8107e9ac4 100644
--- a/kplato/resourcedialogbase.ui
+++ b/kplato/resourcedialogbase.ui
@@ -61,7 +61,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -79,7 +79,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>100</width>
                                     <height>32767</height>
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -146,7 +146,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -198,7 +198,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -261,7 +261,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -359,7 +359,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui
index cc47ad3f9..8428e29ca 100644
--- a/kplato/resourcespanelbase.ui
+++ b/kplato/resourcespanelbase.ui
@@ -13,7 +13,7 @@
             <height>227</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>500</width>
             <height>200</height>
@@ -28,7 +28,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -52,7 +52,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -99,7 +99,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout51</cstring>
+                        <cstring>tqlayout51</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -127,7 +127,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -173,7 +173,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>220</height>
diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui
index eafdca616..61f4fddb7 100644
--- a/kplato/standardworktimedialogbase.ui
+++ b/kplato/standardworktimedialogbase.ui
@@ -28,7 +28,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -200,7 +200,7 @@ when there is no calendar defined for a resource.</string>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>160</width>
                             <height>210</height>
diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp
index 90a1eebab..88245f6db 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" ).arg( size.width() )
-                                                                    .arg( size.height() ) );
+    sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() )
+                                                                    .tqarg( 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" ).arg( points.at(pos).x() )
-                            .arg( points.at(pos).y() );
+    d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() )
+                            .tqarg( points.at(pos).y() );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( points.at( pos ).x() )
-                                .arg( points.at( pos ).y() );
+        d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() )
+                                .tqarg( points.at( pos ).y() );
         ++pos;
     }
 
@@ -237,8 +237,8 @@ void KPrAutoformObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHand
             {
                 if ( angle == 0 || angle==360 )
                 {
-                    //int ox = _painter->viewport().x() + static_cast<int>( _painter->worldMatrix().dx() );
-                    //int oy = _painter->viewport().y() + static_cast<int>( _painter->worldMatrix().dy() );
+                    //int ox = _painter->viewport().x() + static_cast<int>( _painter->tqworldMatrix().dx() );
+                    //int oy = _painter->viewport().y() + static_cast<int>( _painter->tqworldMatrix().dy() );
 
                     TQPointArray pntArray3 = pntArray2.copy();
                     _painter->save();
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index 0be957f0c..b616f802d 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 #include <tqcombobox.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
@@ -89,10 +89,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
 
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
-    TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
 
 
-    TQHBoxLayout *hbox = new TQHBoxLayout( layout );
+    TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout );
     hbox->setSpacing( KDialog::spacingHint() );
     TQVBoxLayout *vbox = new TQVBoxLayout( hbox );
     vbox->setSpacing( KDialog::spacingHint() );
@@ -175,7 +175,7 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
     picTab->setMargin( 5 );
 
     TQLabel *l = new TQLabel( i18n( "View mode:" ), picTab );
-    l->setFixedHeight( l->sizeHint().height() );
+    l->setFixedHeight( l->tqsizeHint().height() );
 
     picView = new TQComboBox( false, picTab );
     picView->insertItem( i18n( "Scaled" ) );
@@ -186,10 +186,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
              this, TQT_SLOT( updateConfiguration() ) );
 
     picChooseLabel = new TQLabel( i18n("&Location:"), picTab );
-    picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() );
+    picChooseLabel->setFixedHeight( picChooseLabel->tqsizeHint().height() );
 
     picChoose = new KURLRequester( picTab, "picChoose" );
-    picChoose->setFixedHeight( picChoose->sizeHint().height() );
+    picChoose->setFixedHeight( picChoose->tqsizeHint().height() );
     picChoose->setMode( KFile::ExistingOnly );
     connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ),
              TQT_SLOT( aboutToSelectPic() ) );
@@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration()
     {
         kdDebug(33001) << "set backgound to master" << endl;
         preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() );
-        preview->repaint( true );
+        preview->tqrepaint( 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->repaint( true );
+            preview->tqrepaint( true );
         }
 
         picChanged  = false;
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index e8dcdc394..661020459 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -282,7 +282,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context )
                     strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
                 }
                 TQString filename(href);
-                const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+                const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
                 backPicture.setKey(key);
 
                 KoStore* store = context.store();
@@ -589,7 +589,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
 
 void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ )
 {
-    _painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) );
+    _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) );
     _painter->setBrush( TQt::NoBrush );
 
      TQRect rect = m_page->getZoomPageRect();
diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp
index a2e71ea01..0b12115ed 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" ).arg( int( rect.width() * 100 ) )
-                                                                   .arg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
+                                                                   .tqarg( int( rect.height() * 100 ) ) );
 
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
-                            .arg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
+                            .tqarg( int( points.at(pos).y() * 100 ) );
 
     while ( pos + 4 <= pointCount )
     {
-        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 ) );
+        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 ) );
         pos += 4;
     }
 
     if ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) )
-                                .arg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) )
+                                .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
     }
 
     sc.xmlWriter.addAttribute( "svg:d", d );
diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp
index 71ea95fd3..06954f7c3 100644
--- a/kpresenter/KPrBrush.cpp
+++ b/kpresenter/KPrBrush.cpp
@@ -73,8 +73,8 @@ TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const
 
     if ( getGUnbalanced() )
     {
-        unbalancedx = TQString( "%1%" ).arg( getGXFactor() / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).arg( getGYFactor() / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kpresenter/KPrBrush.h b/kpresenter/KPrBrush.h
index b7b55b162..e59f838a7 100644
--- a/kpresenter/KPrBrush.h
+++ b/kpresenter/KPrBrush.h
@@ -21,7 +21,7 @@
 #ifndef KPRBRUSH_H
 #define KPRBRUSH_H
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <KoBrush.h>
 
 #include "global.h"
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 4dbd9f3fa..6e550fe0b 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -24,7 +24,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 #include <tqwidgetstack.h>
@@ -37,34 +37,34 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP
     : TQWidget( parent, name )
     , m_brush( brush )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
     m_typeCombo = new KComboBox( this );
-    layout->addWidget( m_typeCombo, 0, 1 );
+    tqlayout->addWidget( m_typeCombo, 0, 1 );
     m_typeCombo->insertItem( i18n( "Single Color" ) );
     m_typeCombo->insertItem( i18n( "Gradient" ) );
     m_typeCombo->insertItem( i18n( "Transparent" ) );
     TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) );
 
     TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this );
-    layout->addWidget( typeLabel, 0, 0 );
+    tqlayout->addWidget( typeLabel, 0, 0 );
     typeLabel->setBuddy( m_typeCombo );
 
     m_stack = new TQWidgetStack( this );
-    layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 );
     connect( m_typeCombo, TQT_SIGNAL( activated( int ) ),
              this, TQT_SLOT( slotTypeChanged( int ) ) );
 
     m_brushUI = new BrushPropertyUI( m_stack );
 
-    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( "%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( "Horizontal Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) );
diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h
index be0de9082..ed9ca2725 100644
--- a/kpresenter/KPrBrushProperty.h
+++ b/kpresenter/KPrBrushProperty.h
@@ -19,7 +19,7 @@
 #ifndef BRUSHSTYLEWIDGET_H
 #define BRUSHSTYLEWIDGET_H
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqwidget.h>
 
 #include "KPrCommand.h"
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 66bc841a8..c43faed36 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -24,7 +24,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqwmatrix.h>
@@ -36,7 +36,7 @@
 #include <tqrect.h>
 #include <tqsize.h>
 #include <tqpoint.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kapplication.h>
 #include <kmimemagic.h>
@@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
         {
             //kdDebug(33001) << "KPrCanvas::paintEvent" << endl;
             TQPainter bufPainter;
-            bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
+            bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
             bufPainter.translate( -diffx(), -diffy() );
             bufPainter.setBrushOrigin( -diffx(), -diffy() );
 
@@ -481,7 +481,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage
 
         // In edit mode we also want to draw the gray area out of the pages
         if ( !grayRegion.isEmpty() )
-            eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+            eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
     }
     else
     {
@@ -706,9 +706,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
             }
             else if( e->button() == Qt::MidButton )
             {
-                TQApplication::clipboard()->setSelectionMode( true );
+                TQApplication::tqclipboard()->setSelectionMode( true );
                 m_currentTextObjectView->paste();
-                TQApplication::clipboard()->setSelectionMode( false );
+                TQApplication::tqclipboard()->setSelectionMode( false );
             }
             return;
         }
@@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
                 }
 
                 if ( mouseSelectedObject )
-                    _repaint( false );
+                    _tqrepaint( false );
                 emit objectSelectedChanged();
             }
         } break;
@@ -1379,7 +1379,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
     emit objectSelectedChanged();
 
     if ( toolEditMode != TEM_MOUSE && editMode )
-        repaint( false );
+        tqrepaint( false );
 
     m_view->disableAutoScroll();
     mousePressed = false;
@@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
                         angle -= 360;
 
                     m_rotateObject->rotate( angle );
-                    _repaint( m_rotateObject );
+                    _tqrepaint( 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()->repaint( oldBoundingRect );
-                        m_view->kPresenterDoc()->repaint( m_resizeObject );
+                        m_view->kPresenterDoc()->tqrepaint( oldBoundingRect );
+                        m_view->kPresenterDoc()->tqrepaint( 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 );
-    _repaint( kpobject );
+    _tqrepaint( kpobject );
     emit objectSelectedChanged();
 
     mouseSelectedObject = true;
@@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject )
 void KPrCanvas::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    _repaint( kpobject );
+    _tqrepaint( kpobject );
 
     if ( !m_activePage->isOneObjectSelected() )
     {
@@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj()
     }
 
     mouseSelectedObject = true;
-    _repaint( false );
+    _tqrepaint( false );
     emit objectSelectedChanged();
 }
 
@@ -2723,9 +2723,9 @@ void KPrCanvas::setTextDepthPlus()
         m_view->kPresenterDoc()->addCommand( macroCmd );
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine],
-                                 layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine],
+                                 tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 }
 
@@ -2753,9 +2753,9 @@ void KPrCanvas::setTextDepthMinus()
         m_view->kPresenterDoc()->addCommand( macroCmd );
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine],
-                                 layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine],
+                                 tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 }
 
@@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation()
     m_step.m_pageNumber = 0;
     editMode = true;
     m_drawMode = false;
-    repaint( false );
+    tqrepaint( 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;
-        repaint( false );
+        tqrepaint( 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() );
-            repaint( false );
+            tqrepaint( 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;
 
-    repaint( false );
+    tqrepaint( false );
     kapp->processEvents();
 
     editMode = false;
@@ -3633,7 +3633,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
 
     fillBlack = true;
     editMode = true;
-    repaint( false );
+    tqrepaint( false );
 }
 
 
@@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline()
 
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        repaint( false );
+        tqrepaint( 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 )
-        repaint( false );
+        tqrepaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _repaint( false );
+    _tqrepaint( false );
 }
 
 void KPrCanvas::selectPrev()
@@ -3927,7 +3927,7 @@ void KPrCanvas::selectPrev()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _repaint( false );
+    _tqrepaint( false );
 }
 
 void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e )
@@ -4145,7 +4145,7 @@ void KPrCanvas::copyOasisObjs()
 
     delete store;
     kd->setEncodedData( arr );
-    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void KPrCanvas::copyObjs()
@@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs()
 
     delete store;
     kd->setEncodedData( arr );
-    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void KPrCanvas::deleteObjs()
@@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const
     return m_view->kPresenterDoc()->getPageNums();
 }
 
-void KPrCanvas::_repaint( bool /*erase*/ )
+void KPrCanvas::_tqrepaint( bool /*erase*/ )
 {
-    m_view->kPresenterDoc()->repaint( false );
+    m_view->kPresenterDoc()->tqrepaint( false );
 }
 
-void KPrCanvas::_repaint( const TQRect &r )
+void KPrCanvas::_tqrepaint( const TQRect &r )
 {
-    m_view->kPresenterDoc()->repaint( r );
+    m_view->kPresenterDoc()->tqrepaint( r );
 }
 
-void KPrCanvas::_repaint( KPrObject *o )
+void KPrCanvas::_tqrepaint( KPrObject *o )
 {
-    m_view->kPresenterDoc()->repaint( o );
+    m_view->kPresenterDoc()->tqrepaint( o );
 }
 
 void KPrCanvas::slotExitPres()
@@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer )
         m_view->continueAutoPresTimer();
 }
 
-void KPrCanvas::exitEditMode( bool repaint )
+void KPrCanvas::exitEditMode( bool tqrepaint )
 {
     if ( m_editObject )
     {
@@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool repaint )
             {
                 m_currentTextObjectView->clearSelection();
                 //hide cursor when we desactivate textObjectView
-                if ( repaint )
+                if ( tqrepaint )
                 {
                     m_currentTextObjectView->drawCursor( false );
                     m_currentTextObjectView->terminate();
@@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool repaint )
                 delete m_currentTextObjectView;
                 m_currentTextObjectView = 0;
 
-                if ( repaint )
-                    _repaint( static_cast<KPrObject*>( kpTextObj ) );
+                if ( tqrepaint )
+                    _tqrepaint( static_cast<KPrObject*>( kpTextObj ) );
             }
             // Title of slide may have changed
             m_view->kPresenterDoc()->updateSideBarItem( m_activePage );
@@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool repaint )
         else if (m_editObject->getType() == OT_PART )
         {
             static_cast<KPrPartObject *>(m_editObject)->deactivate();
-            _repaint( m_editObject );
+            _tqrepaint( m_editObject );
             m_editObject = 0;
             return;
         }
@@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
 
             m_moveSnapDiff = KoPoint( 0, 0 );
 
-            KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
-            m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff );
+            KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
+            m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff );
 
             move += m_moveSnapDiff;
         }
@@ -4632,7 +4632,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
         move.setY( pageRect.bottom() - rect.bottom() );
     }
 
-    // we only want a repaint if we have guide lines
+    // we only want a tqrepaint if we have guide lines
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
@@ -4672,7 +4672,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged )
     move -= m_moveSnapDiff;
 
     m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off
-    KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
 
     if ( snapToGrid )
     {
@@ -4680,12 +4680,12 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged )
                                                                                              - movedRect.topLeft().x() );
         m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY()
                                                                                              - movedRect.topLeft().y() );
-        snapStatus = KoGuides::SNAP_BOTH;
+        snaptqStatus = KoGuides::SNAP_BOTH;
     }
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff );
+        m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff );
     }
 
     move += m_moveSnapDiff;
@@ -4745,7 +4745,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
     TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) );
 
     KoRect objRect = kpobject->getRealRect();
-    KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE );
+    KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE );
 
     bool left = false;
     bool right = false;
@@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
     if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU )
     {
         top = true;
-        snapStatus |= KoGuides::SNAP_HORIZ;
+        snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD )
     {
         bottom = true;
-        snapStatus |= KoGuides::SNAP_HORIZ;
+        snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD )
     {
         left = true;
-        snapStatus |= KoGuides::SNAP_VERT;
+        snaptqStatus |= KoGuides::SNAP_VERT;
     }
     if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD )
     {
         right = true;
-        snapStatus |= KoGuides::SNAP_VERT;
+        snaptqStatus |= KoGuides::SNAP_VERT;
     }
     
     double newLeft = objRect.left();
@@ -4931,17 +4931,17 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
             {
                 sp.setY( rect.bottom() );
             }
-            m_gl.repaintSnapping( sp, snapStatus );
+            m_gl.repaintSnapping( sp, snaptqStatus );
         }
 
-        _repaint( oldBoundingRect );
-        _repaint( kpobject );
+        _tqrepaint( oldBoundingRect );
+        _tqrepaint( kpobject );
         emit objectSizeChanged();
     }
 }
 
 
-void KPrCanvas::finishResizeObject( const TQString &name, bool layout )
+void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout )
 {
     if ( m_resizeObject )
     {
@@ -4958,12 +4958,12 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool layout )
             m_view->kPresenterDoc()->addCommand( resizeCmd );
         }
 
-        if ( layout )
-            m_view->kPresenterDoc()->layout( m_resizeObject );
+        if ( tqlayout )
+            m_view->kPresenterDoc()->tqlayout( m_resizeObject );
 
         m_ratio = 0.0;
         m_isResizing = false;
-        _repaint( m_resizeObject );
+        _tqrepaint( 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);
-            _repaint( it.current() );
+            _tqrepaint( it.current() );
         }
     }
     if( macro )
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->repaint(this);
+        m_view->kPresenterDoc()->tqrepaint(this);
     }
 }
 
@@ -5354,7 +5354,7 @@ void KPrCanvas::textObjectToContents()
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->repaint(this);
+        m_view->kPresenterDoc()->tqrepaint(this);
     }
 
 }
@@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj )
     if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj )
     {
         m_currentTextObjectView->kpTextObject()->setEditingTextObj( false );
-        _repaint( m_currentTextObjectView->kpTextObject() );
+        _tqrepaint( m_currentTextObjectView->kpTextObject() );
         //don't remove selection otherwise break dnd.
         m_currentTextObjectView->terminate(false);
         delete m_currentTextObjectView;
@@ -5535,12 +5535,12 @@ void KPrCanvas::closeObject(bool /*close*/)
     m_view->kPresenterDoc()->addCommand( cmd );
 }
 
-void KPrCanvas::layout()
+void KPrCanvas::tqlayout()
 {
     TQPtrListIterator<KPrObject> it(getObjectList());
     for ( ; it.current(); ++it ) {
         if ( it.current()->getType() == OT_TEXT )
-            static_cast<KPrTextObject *>( it.current() )->layout();
+            static_cast<KPrTextObject *>( it.current() )->tqlayout();
     }
 }
 
@@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping )
     bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping;
 
     KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off
-    KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
 
     if ( snapToGrid )
     {
         snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() );
         snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() );
-        snapStatus = KoGuides::SNAP_BOTH;
+        snaptqStatus = KoGuides::SNAP_BOTH;
     }
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff );
+        m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff );
     }
 
     sp += snapDiff;
diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h
index 2d8c7f481..e2b373e1b 100644
--- a/kpresenter/KPrCanvas.h
+++ b/kpresenter/KPrCanvas.h
@@ -360,7 +360,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 );
 
     TQPixmap getPicturePixmap() const;
     void closeObject(bool _close);
-    void layout();
+    void tqlayout();
     void alignVertical(VerticalAlignmentType _type );
     void savePicture();
 
@@ -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 repaint = false when the KPrCanvas is destroyed to avaid a possible crash
-    void exitEditMode( bool repaint = true );
+    // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash
+    void exitEditMode( bool tqrepaint = true );
 
     void clipCut();
     void clipCopy();
@@ -543,9 +543,9 @@ protected:
     TQRect getPageRect( bool decBorders = true ) const;
     unsigned int pageNums() const;
 
-    void _repaint( bool erase=true );
-    void _repaint( const TQRect &r );
-    void _repaint( KPrObject *o );
+    void _tqrepaint( bool erase=true );
+    void _tqrepaint( const TQRect &r );
+    void _tqrepaint( KPrObject *o );
 
     /**
      * Draw page defined in step to painter.
@@ -633,7 +633,7 @@ private:
     /// resize the m_resizeObject
     void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter );
     /// create KPrResizeCmd
-    void finishResizeObject( const TQString &name, bool layout = true );
+    void finishResizeObject( const TQString &name, bool tqlayout = true );
 
     /**
      * @brief Display object above the other objects in editiong mode
@@ -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 repaint by yourself.
+     *        You have to call tqrepaint by yourself.
      *
      * @return the position of the snapped point
      */
diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp
index 208335f59..be4091831 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-shape" )
+    else if ( tag == "custom-tqshape" )
     {
-        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" );
+        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" );
 
         if ( !enhancedGeometry.isNull() )
         {
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index 5f88381d4..5236aaf6a 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->repaint( false );
+    doc->tqrepaint( 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->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute()
     doc->setGridValue( gridX, gridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( txtBackCol );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrSetOptionsCmd::unexecute()
@@ -155,7 +155,7 @@ void KPrSetOptionsCmd::unexecute()
     doc->setGridValue( oldGridX, oldGridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( otxtBackCol );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings,
@@ -189,7 +189,7 @@ void KPrSetBackCmd::execute()
         }
 
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     if ( m_takeGlobal ) {
         TQPtrListIterator<KPrPage> it( m_doc->getPageList() );
@@ -217,7 +217,7 @@ void KPrSetBackCmd::unexecute()
             m_doc->restoreBackground(it.current());
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( 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->repaint( false );
+    m_doc->tqrepaint( 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->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd()
 void KPrChgPixCmd::execute()
 {
     m_page->replaceObject( oldObject, newObject );
-    doc->repaint( newObject );
+    doc->tqrepaint( newObject );
 
     doc->updateSideBarItem( m_page );
 }
@@ -319,7 +319,7 @@ void KPrChgPixCmd::execute()
 void KPrChgPixCmd::unexecute()
 {
     m_page->replaceObject( newObject, oldObject );
-    doc->repaint( oldObject );
+    doc->tqrepaint( 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->repaint( oldRect );
+        m_doc->tqrepaint( oldRect );
     }
     if(textObj)
         m_doc->updateRuler();
@@ -393,7 +393,7 @@ void KPrDeleteCmd::unexecute()
     for ( ; it.current(); ++it )
     {
         it.current()->addToObjList();
-        m_doc->repaint( it.current() );
+        m_doc->tqrepaint( it.current() );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -522,7 +522,7 @@ void KPrGroupObjCmd::unexecute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -561,7 +561,7 @@ void UnGroupObjCmd::execute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -587,7 +587,7 @@ void UnGroupObjCmd::unexecute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( 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->repaint( m_object );
+        m_doc->tqrepaint( m_object );
     }
     else
     {
@@ -653,7 +653,7 @@ void KPrInsertCmd::execute()
             ( *it )->addToObjList();
             if ( ( *it )->getType() == OT_TEXT )
                 updateRuler = true;
-            m_doc->repaint( *it );
+            m_doc->tqrepaint( *it );
         }
         if ( updateRuler )
             m_doc->updateRuler();
@@ -678,7 +678,7 @@ void KPrInsertCmd::unexecute()
                 m_doc->updateRuler();
             }
         }
-        m_doc->repaint( oldRect );
+        m_doc->tqrepaint( oldRect );
     }
     else
     {
@@ -703,7 +703,7 @@ void KPrInsertCmd::unexecute()
         if ( updateRuler )
             m_doc->updateRuler();
 
-        m_doc->repaint( false );
+        m_doc->tqrepaint( false );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd()
 void KPrLowerRaiseCmd::execute()
 {
     m_page->setObjectList( newList );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -744,7 +744,7 @@ void KPrLowerRaiseCmd::execute()
 void KPrLowerRaiseCmd::unexecute()
 {
     m_page->setObjectList( oldList );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -783,8 +783,8 @@ void KPrMoveByCmd::execute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -803,8 +803,8 @@ void KPrMoveByCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -888,8 +888,8 @@ void KPrAlignCmd::execute()
                 doc->updateRuler();
         }
 
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -907,8 +907,8 @@ void KPrAlignCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( 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->repaint( obj );
+                //doc->tqrepaint( 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->repaint( obj );
+                //doc->tqrepaint( obj );
             }
         } break;
         case OT_PIE:
@@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
     if ( obj )
     {
         obj->setPen( tmpPen->pen );
-        doc->repaint( obj );
+        doc->tqrepaint( 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->repaint( object );
+    doc->tqrepaint( object );
 }
 
 void KPrBrushCmd::unexecute()
@@ -1345,7 +1345,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP
     : KNamedCommand( _name )
 {
     m_doc=_doc;
-    layout = _layout;
+    tqlayout = _layout;
     oldLayout = _oldLayout;
     oldUnit = _oldUnit;
     unit = _unit;
@@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP
 void KPrPgLayoutCmd::execute()
 {
     m_doc->setUnit( unit );
-    m_doc->setPageLayout( layout );
+    m_doc->setPageLayout( tqlayout );
     m_doc->updateHeaderFooterPosition();
     m_doc->updateRuler();
     m_doc->updateRulerPageLayout();
@@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute()
                 obj->setPieLength( m_newValues.pieLength );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1473,7 +1473,7 @@ void KPrPieValueCmd::unexecute()
             obj->setPieLength( m_oldValues.at( i )->pieLength );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute()
                 obj->setSharpnessValue(m_newSettings.sharpnessValue );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1570,7 +1570,7 @@ void KPrPolygonSettingCmd::unexecute()
             obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue);
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute()
                 obj->setPictureBright( m_newSettings.bright );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1688,7 +1688,7 @@ void KPrPictureSettingCmd::unexecute()
             obj->setPictureBright( pictureSettings->bright );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute()
             obj->setRnds( xtmp, ytmp );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( 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->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1842,12 +1842,12 @@ void KPrResizeCmd::execute()
     {
         if(object->isSelected())
             doc->updateRuler();
-        doc->layout( object );
+        doc->tqlayout( object );
     }
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
-    doc->repaint( oldRect );
-    doc->repaint( object );
+    doc->tqrepaint( oldRect );
+    doc->tqrepaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -1863,13 +1863,13 @@ void KPrResizeCmd::unexecute()
     {
         if(object->isSelected())
             doc->updateRuler();
-        doc->layout( object );
+        doc->tqlayout( object );
     }
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
 
-    doc->repaint( oldRect );
-    doc->repaint( object );
+    doc->tqrepaint( oldRect );
+    doc->tqrepaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2368,7 +2368,7 @@ void KPrFlipObjectCommand::flipObjects()
     for ( ; it.current() ; ++it )
     {
         it.current()->flip( horizontal );
-        m_doc->repaint( it.current() );
+        m_doc->tqrepaint( 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->repaint( it.current() );
+                m_doc->tqrepaint( 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->repaint( obj );
+                m_doc->tqrepaint( 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->repaint( *closeIt );
+        m_doc->tqrepaint( *closeIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute()
         ( *openIt )->addToObjList();
         ( *closeIt )->setSelected( false );
         ( *openIt )->setSelected( selected );
-        m_doc->repaint( *openIt );
+        m_doc->tqrepaint( *openIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2668,9 +2668,9 @@ void KPrChangeMarginCommand::execute()
         it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin,
                                       m_newMargins.rightMargin, m_newMargins.bottomMargin);
         it.current()->resizeTextDocument();
-        it.current()->layout();
+        it.current()->tqlayout();
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2684,9 +2684,9 @@ void KPrChangeMarginCommand::unexecute()
         object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin,
                                 marginsStruct->rightMargin, marginsStruct->bottomMargin);
         object->resizeTextDocument();
-        object->layout();
+        object->tqlayout();
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2708,8 +2708,8 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQSt
 void KPrChangeVerticalAlignmentCommand::execute()
 {
     m_obj->setVerticalAligment( m_newAlign );
-    m_obj->kPresenterDocument()->layout(m_obj);
-    m_obj->kPresenterDocument()->repaint(m_obj);
+    m_obj->kPresenterDocument()->tqlayout(m_obj);
+    m_obj->kPresenterDocument()->tqrepaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2717,8 +2717,8 @@ void KPrChangeVerticalAlignmentCommand::execute()
 void KPrChangeVerticalAlignmentCommand::unexecute()
 {
     m_obj->setVerticalAligment( m_oldAlign );
-    m_obj->kPresenterDocument()->layout(m_obj);
-    m_obj->kPresenterDocument()->repaint(m_obj);
+    m_obj->kPresenterDocument()->tqlayout(m_obj);
+    m_obj->kPresenterDocument()->tqrepaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute()
             obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3);
         }
     }
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2794,7 +2794,7 @@ void KPrImageEffectCmd::unexecute()
                              oldSettings.at( i )->param3);
         }
     }
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h
index 48e977ced..4a4cc0ecb 100644
--- a/kpresenter/KPrCommand.h
+++ b/kpresenter/KPrCommand.h
@@ -31,7 +31,7 @@
 #include <KoPictureCollection.h>
 #include <tqvaluelist.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <KoPageLayoutDia.h>
 #include <KoParagLayout.h>
 #include <KoTextCommand.h>
@@ -543,7 +543,7 @@ public:
 
 protected:
     KPrDocument *m_doc;
-    KoPageLayout layout, oldLayout;
+    KoPageLayout tqlayout, oldLayout;
     KoUnit::Unit unit, oldUnit;
 };
 
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index aea1d31cd..42a701e9f 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -40,7 +40,7 @@
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -365,13 +365,13 @@ void KPrConfigureColorBackground::apply()
     if( oldGridColor != _col ) {
         config->setGroup( "KPresenter Color" );
         config->writeEntry( "GridColor", _col );
-        doc->repaint( false );
+        doc->tqrepaint( false );
         doc->setGridColor( _col );
         oldGridColor=_col;
         repaintNeeded = true;
     }
     if (repaintNeeded)
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 void KPrConfigureColorBackground::slotDefault()
@@ -419,9 +419,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch
     config = KPrFactory::global()->config();
 
     TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" );
-    tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-    tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 );
+    tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 );
 
     m_oldNbRedo=30;
     m_printNotes=true;
@@ -469,9 +469,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch
     box->addWidget(tmpTQGroupBox);
 
     tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" );
-    tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-    tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
-    grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 );
+    tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+    grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 );
 
     KoRect rect = doc->masterPage()->getPageRect();
     TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox);
@@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply()
 
     doc->setGridValue( resolutionX->value(),
                        resolutionY->value(), true);
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     config->sync();
 
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 46c485cba..7c0fa1c9c 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -18,13 +18,13 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -214,7 +214,7 @@ void KPrCustomSlideShowDia::slotCopy()
         {
             if ( !uniqueName( i, str ) )
             {
-                str = str.arg( i );
+                str = str.tqarg( 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.arg( val );
+    TQString str = name.tqarg( 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 17a8f0c64..7a880406b 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -43,7 +43,7 @@
 #include "KPrSVGPathParser.h"
 
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 #include <tqdom.h>
@@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
     saveOnlyPage = -1;
     m_maxRecentFiles = 10;
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
              this, TQT_SLOT( clipboardDataChanged() ) );
 
     m_commandHistory = new KoCommandHistory( actionCollection(),  true ) ;
@@ -444,9 +444,9 @@ bool KPrDocument::saveChildren( KoStore* _store )
 {
     int i = 0;
 
-    TQPtrListIterator<KoDocumentChild> it( children() );
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     for( ; it.current(); ++it ) {
-        // Don't save children that are only in the undo/redo history
+        // Don't save tqchildren 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 )
@@ -490,7 +490,7 @@ TQDomDocument KPrDocument::saveXML()
         emit sigProgress( 0 );
     }
 
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME );
     recalcVariables( VT_STATISTIC );
@@ -669,9 +669,9 @@ TQDomDocument KPrDocument::saveXML()
     }
 
     // Write "OBJECT" tag for every child
-    TQPtrListIterator<KoDocumentChild> chl( children() );
+    TQPtrListIterator<KoDocumentChild> chl( tqchildren() );
     for( ; chl.current(); ++chl ) {
-        // Don't save children that are only in the undo/redo history
+        // Don't save tqchildren 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;
 
-            // geometry is no zoom value !
-            TQRect _rect = curr->geometry();
+            // tqgeometry is no zoom value !
+            TQRect _rect = curr->tqgeometry();
             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" ).arg( ++i ).arg( format.lower() );
+        TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( 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" ).arg( ++i ).arg( format.lower() );
+        TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( 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( children() );
+        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
         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( children() );
+        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
         for( int i = 0; it.current(); ++it, ++i ) {
             if ( i < m_childCountBeforeInsert )
                 continue;
@@ -1006,7 +1006,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
     KoXmlWriter* contentWriter = createOasisXmlWriter( &contentDev, "office:document-content" );
 
 
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME );
     recalcVariables( VT_STATISTIC );
@@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl
         Q_ASSERT( styles.count() == 1 );
         it = styles.begin();
         for ( ; it != styles.end() ; ++it ) {
-            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
+            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
             stylesWriter->endElement();
         }
 
@@ -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." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
         return false;
     }
 
@@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" masterPageName:"<<masterPageName<<endl;
         if ( ! master )
         {
-            masterPageName = "Standard"; // use default layout as fallback (default in kpresenter)
+            masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter)
             master = oasisStyles.masterPages()[ masterPageName];
             if ( !master ) //last test...
                 master = oasisStyles.masterPages()["Default"];
@@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" end load oasis master style \n";
 
         Q_ASSERT( master );
-        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0;
+        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0;
         const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" );
         kdDebug()<<"Standard background "<<backgroundStyle<<endl;
         // parse all pages
@@ -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->geometry();
+                        r = ch->tqgeometry();
                         if ( groupObject )
                             groupObject->addObjects( kppartobject );
                         else
@@ -1993,11 +1993,11 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                         break;
                 }
             }
-            else if ( name == "custom-shape" && isDrawNS )
+            else if ( name == "custom-tqshape" && isDrawNS )
             {
                 fillStyleStack( o, context, "graphic" );
 
-                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" );
+                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" );
 
                 if ( !enhancedGeometry.isNull() )
                 {
@@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                                         newpage->appendObject( kpClosedObject );
                                 } break;
                             default:
-                                kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
+                                kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
                                 break;
                         }
                     }
                     else
                     {
-                        kdDebug(33001) << "draw:custom-shape not supported" << endl;
+                        kdDebug(33001) << "draw:custom-tqshape not supported" << endl;
                     }
                 }
             }
@@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                     if ( !note.isEmpty() )
                         note += "\n";
 
-                    //todo load layout for note.
+                    //todo load tqlayout for note.
                     TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" );
 
                     if ( !textBox.isNull() )
@@ -2136,10 +2136,10 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or
         {
             const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation;
             if ( isPresentationNS &&
-                 ( tagName == "show-shape" || tagName == "hide-shape" ) )
+                 ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) )
             {
-                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) );
-                TQString name = e.attributeNS( KoXmlNS::draw, "shape-id", TQString() );
+                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) );
+                TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-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-shape" )
+                if ( tagName == "show-tqshape" )
                 {
                     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" )
-                             .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) );
+                             .tqarg( errorLine ).tqarg( errorColumn ).tqarg( 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->geometry();
+                r = ch->tqgeometry();
                 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").arg(document.attribute("mime")) );
+        setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(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->geometry();
+                r = ch->tqgeometry();
                 insertChild( ch );
                 kppartobject = new KPrPartObject( ch );
                 //emit sig_insertObject( ch, kppartobject );
@@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
                 else if(borders.hasAttribute("mmBottom"))    //compatibility
                     __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() );
             }
-            // PAPER found and parsed -> apply page layout
+            // PAPER found and parsed -> apply page tqlayout
             // e.g. the text objects need it
             if ( _clean )
                 setPageLayout( __pgLayout );
@@ -3275,26 +3275,26 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout )
     //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ )
     //    m_pageList.at( i )->updateBackgroundSize();
 
-    repaint( false );
-    layout();
+    tqrepaint( false );
+    tqlayout();
     // don't setModified(true) here, since this is called on startup
 }
 
-//when we change pagelayout we must re-position header/footer
+//when we change pagetqlayout we must re-position header/footer
 void KPrDocument::updateHeaderFooterPosition( )
 {
     KoRect pageRect=m_masterPage->getPageRect();
     TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() );
     _header->setOrig(pageRect.topLeft ());
     _header->setSize(pageRect.width(),_header->getSize().height());
-    repaint( oldBoundingRect );
-    repaint(_header);
+    tqrepaint( oldBoundingRect );
+    tqrepaint(_header);
 
     oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() );
     _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height());
     _footer->setSize(pageRect.width(),_footer->getSize().height());
-    repaint(oldBoundingRect);
-    repaint(_footer);
+    tqrepaint(oldBoundingRect);
+    tqrepaint(_footer);
 }
 
 bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
@@ -3386,7 +3386,7 @@ void KPrDocument::setEmpty()
 {
     KoDocument::setEmpty();
     // Whether loaded from template or from empty doc: this is a new one -> set creation date
-    m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE ); // , VST_CREATION_DATE ...
     // If we then load a document, it will override that date.
 }
@@ -3401,16 +3401,16 @@ void KPrDocument::setGridValue( double _x, double _y, bool _replace )
         replaceObjs();
 }
 
-void KPrDocument::repaint( bool erase )
+void KPrDocument::tqrepaint( bool erase )
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->repaint( erase );
+        canvas->tqrepaint( erase );
     }
 }
 
-void KPrDocument::repaint( const TQRect& rect )
+void KPrDocument::tqrepaint( const TQRect& rect )
 {
     TQRect r;
     TQPtrListIterator<KoView> it( views() );
@@ -3423,25 +3423,25 @@ void KPrDocument::repaint( const TQRect& rect )
     }
 }
 
-void KPrDocument::layout(KPrObject *kpobject)
+void KPrDocument::tqlayout(KPrObject *kpobject)
 {
     KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject );
     if (obj)
-        obj->layout();
+        obj->tqlayout();
 }
 
-void KPrDocument::layout()
+void KPrDocument::tqlayout()
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->layout();
+        canvas->tqlayout();
     }
 }
 
-void KPrDocument::repaint( KPrObject *kpobject )
+void KPrDocument::tqrepaint( KPrObject *kpobject )
 {
-    repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
+    tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
 }
 
 TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num )
@@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum )
         }
     }
 
-    repaint( false );
+    tqrepaint( 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 = children().count();
+    m_childCountBeforeInsert = tqchildren().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;
 
-    repaint( false );
+    tqrepaint( 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();
-    repaint(b);
+    tqrepaint(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();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::setHeader( bool b )
@@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b )
     }
     m_masterPage->setHeader( b, false );
     updateHeaderFooterButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::setFooter( bool b )
@@ -3786,7 +3786,7 @@ void KPrDocument::setFooter( bool b )
     }
     m_masterPage->setFooter( b, false );
     updateHeaderFooterButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::updateHeaderFooterButton()
@@ -3917,7 +3917,7 @@ void KPrDocument::movePage( int from, int to )
 void KPrDocument::copyPage( int from )
 {
     _clean = false;
-    m_childCountBeforeInsert = children().count();
+    m_childCountBeforeInsert = tqchildren().count();
 
     _duplicatePage=true; // ### now also set via savePage() parameter below
 
@@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum )
     KURL url; url.setPath( tempFile.name() );
     KURL::List lst;
     lst.append( url );
-    TQApplication::clipboard()->setData( new KURLDrag( lst ) );
+    TQApplication::tqclipboard()->setData( new KURLDrag( lst ) );
     m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged
 }
 
@@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged()
     }
     // TODO enable paste as well, when a txtobject is activated
     // and there is plain text in the clipboard. Then enable this code.
-    //TQMimeSource *data = TQApplication::clipboard()->data();
+    //TQMimeSource *data = TQApplication::tqclipboard()->data();
     //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" );
     // emit enablePaste( canPaste );
 }
@@ -4145,7 +4145,7 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj )
 {
     //todo
     //use this function for the moment
-    repaint( kptextobj );
+    tqrepaint( kptextobj );
 }
 
 
@@ -4156,7 +4156,7 @@ void KPrDocument::recalcVariables( int type )
     if ( modifiedVariables.isEmpty() )
         return;
 
-    // TODO use the return value from recalcVariables to only repaint what has changed.
+    // TODO use the return value from recalcVariables to only tqrepaint what has changed.
     TQPtrListIterator<KPrPage> it( m_pageList );
     for ( ; it.current(); ++it )
         it.current()->slotRepaintVariable();
@@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ )
         for (; it.current(); ++it )
         {
             static_cast<KPrView *>( it.current() )->getCanvas()->update();
-            static_cast<KPrView *>( it.current() )->getCanvas()->layout();
+            static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout();
         }
     }
 }
@@ -4665,7 +4665,7 @@ void KPrDocument::insertFile(const TQString & file )
 {
     m_insertFilePage = m_pageList.count();
 
-    m_childCountBeforeInsert = children().count();
+    m_childCountBeforeInsert = tqchildren().count();
     objStartY = 0;
     bool clean = _clean;
     _clean = false;
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index 3584e372d..c51060a48 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -166,7 +166,7 @@ class KPrDocument : public KoDocument
     virtual void addView( KoView *_view );
     virtual void removeView( KoView *_view );
 
-    // page layout
+    // page tqlayout
     void setPageLayout( const KoPageLayout &);
 
     virtual TQPixmap generatePreview( const TQSize &size );
@@ -236,11 +236,11 @@ class KPrDocument : public KoDocument
     void deletePage( int _page );
     void copyPageToClipboard( int pgnum );
 
-    // repaint all views
-    void repaint( bool );
+    // tqrepaint all views
+    void tqrepaint( bool );
 
-    void repaint( const TQRect& );
-    void repaint( KPrObject* );
+    void tqrepaint( const TQRect& );
+    void tqrepaint( KPrObject* );
 
     // stuff for screen-presentations
     /**
@@ -461,8 +461,8 @@ class KPrDocument : public KoDocument
     KoCommandHistory * commandHistory()const { return m_commandHistory; }
     void updateObjectStatusBarItem();
     void updateObjectSelected();
-    void layout(KPrObject *kpobject);
-    void layout();
+    void tqlayout(KPrObject *kpobject);
+    void tqlayout();
     void changeBgSpellCheckingState( bool b );
 
     bool cursorInProtectedArea()const;
@@ -552,7 +552,7 @@ protected:
     void testAndCloseAllTextObjectProtectedContent();
     // ************ functions ************
     /**
-     * Overloaded function from @ref Document_impl. Saves all children.
+     * Overloaded function from @ref Document_impl. Saves all tqchildren.
      */
     virtual bool saveChildren( KoStore* _store );
 
@@ -707,8 +707,8 @@ private:
     KPrLoadingInfo *m_loadingInfo;
     TQValueList<int> *m_customListTest;
 
-    /// here the amount of existing children before inserting a page/file
-    /// is saved, so that we load the correct children
+    /// here the amount of existing tqchildren before inserting a page/file
+    /// is saved, so that we load the correct tqchildren
     int m_childCountBeforeInsert;
 };
 
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index aa4d154a6..04235d73e 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b )
 {
     doc->setShowGuideLines( b );
     doc->updateGuideLineButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::addGuideLine( bool horizontal, double pos )
 {
     doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 unsigned int KPrDocumentIface::nbHorizontalHelpLine() const
@@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid )
 {
     doc->setShowGrid( _grid);
     doc->updateGridButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridX() const
@@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x)
 {
     doc->setGridX( _x );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridY() const
@@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y)
 {
     doc->setGridY( _y );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 bool KPrDocumentIface::configAutoSuperScript() const
@@ -555,9 +555,9 @@ TQStringList KPrDocumentIface::presentationList()
     return doc->presentationList();
 }
 
-void KPrDocumentIface::repaint()
+void KPrDocumentIface::tqrepaint()
 {
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::setConfigToolTipCompletion( bool b )
diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h
index 83429fb06..3dd061df6 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 repaint();
+    void tqrepaint();
 
 private:
     KPrDocument *doc;
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 6b4957f6b..0b0c7646f 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 3834e0dcd..a394e0a81 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqvaluelist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
@@ -62,13 +62,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
     TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page );
-    grp1->layout()->setSpacing(KDialog::spacingHint());
-    grp1->layout()->setMargin(KDialog::marginHint());
+    grp1->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp1->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp1);
-    TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4);
+    TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4);
 
     lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 );
-    lAppear->setAlignment( AlignVCenter );
+    lAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppear, 0, 0);
 
     eAppearStep = new TQSpinBox( 0, 100, 1, grp1 );
@@ -79,7 +79,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //( void )new TQWidget( grp1 );
 
     lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 );
-    lEffect->setAlignment( AlignVCenter );
+    lEffect->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect, 1, 0);
 
     cEffect = new TQComboBox( false, grp1, "cEffect" );
@@ -102,7 +102,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) );
 
     lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 );
-    lAppearSpeed->setAlignment( AlignVCenter );
+    lAppearSpeed->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppearSpeed, 2, 0);
 
     cAppearSpeed = new TQComboBox( false, grp1, "cEffect" );
@@ -114,7 +114,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     appearEffectChanged( cEffect->currentItem() );
 
     lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 );
-    lEffect2->setAlignment( AlignVCenter );
+    lEffect2->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect2, 3, 0);
 
     cEffect2 = new TQComboBox( false, grp1, "cEffect2" );
@@ -144,7 +144,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     }
 
     TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 );
-    lTimerOfAppear->setAlignment( AlignVCenter );
+    lTimerOfAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lTimerOfAppear, 4, 0 );
 
     timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 );
@@ -164,7 +164,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) );
 
     lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 );
-    lSoundEffect1->setAlignment( AlignVCenter );
+    lSoundEffect1->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lSoundEffect1, 6, 0 );
 
     requester1 = new KURLRequester( grp1 );
@@ -197,13 +197,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout->addWidget(disappear);
 
     TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page);
-    grp2->layout()->setSpacing(KDialog::spacingHint());
-    grp2->layout()->setMargin(KDialog::marginHint());
+    grp2->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp2->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp2);
-    TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4);
+    TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4);
 
     lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 );
-    lDisappear->setAlignment( AlignVCenter );
+    lDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappear, 0, 0);
 
     eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 );
@@ -211,7 +211,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     lowerRow->addWidget(eDisappearStep, 0, 1);
 
     lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 );
-    lDEffect->setAlignment( AlignVCenter );
+    lDEffect->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDEffect, 1, 0);
 
     cDisappear = new TQComboBox( false, grp2, "cDisappear" );
@@ -234,7 +234,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) );
 
     lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 );
-    lDisappearSpeed->setAlignment( AlignVCenter );
+    lDisappearSpeed->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappearSpeed, 2, 0);
 
     cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" );
@@ -247,7 +247,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //appearEffectChanged( cEffect->currentItem() );
 
     TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 );
-    lTimerOfDisappear->setAlignment( AlignVCenter );
+    lTimerOfDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lTimerOfDisappear, 3, 0 );
 
     timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 );
@@ -268,7 +268,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) );
 
     lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 );
-    lSoundEffect2->setAlignment( AlignVCenter );
+    lSoundEffect2->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lSoundEffect2, 5, 0 );
 
     requester2 = new KURLRequester( grp2 );
@@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp
index 709a86d13..3836a8adb 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 repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
+    bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
     KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc);
     KPrTextObject* textobj = textdoc->textObject();
-    textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog );
+    textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog );
 }
 
 #include "KPrFindReplace.moc"
diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp
index 273d60419..077b9eedf 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" ).arg( int( rect.width() * 100 ) )
-                                                                   .arg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
+                                                                   .tqarg( int( rect.height() * 100 ) ) );
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
-                            .arg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
+                            .tqarg( int( points.at(pos).y() * 100 ) );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) )
-                                .arg( int( points.at( pos ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) )
+                                .tqarg( int( points.at( pos ).y() * 100 ) );
         ++pos;
     }
 
diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp
index 25ff29630..19843a1b7 100644
--- a/kpresenter/KPrFreehandObjectIface.cpp
+++ b/kpresenter/KPrFreehandObjectIface.cpp
@@ -56,12 +56,12 @@ TQString KPrFreehandObjectIface::lineEnd() const
 
 void KPrFreehandObjectIface::horizontalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip(true );
 }
 
 void KPrFreehandObjectIface::verticalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index e82defcc7..89cf00ab1 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #include <knuminput.h>
@@ -37,11 +37,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene
 , m_generalValue( generalValue )
 , m_unit( unit )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     if ( m_generalValue.m_name.isNull() )
     {
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index db09be842..d5d0ed246 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqlistbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <klocale.h>
@@ -60,7 +60,7 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc,
             t.truncate(30);
             t+="...";
         }
-        spinbox->insertItem( TQString( "%1 - %2" ).arg( *it ).arg( t ), -1 );
+        spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 );
         if ( *it == start )
             spinbox->setCurrentItem( spinbox->count()-1 );
     }
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 078a39189..6a0162c1d 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->repaint(false);
+    base->m_previewLabel->tqrepaint(false);
 }
 
 void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3)
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 45a6f7cc6..c2db00b42 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include "KPrDocument.h"
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 8d696369a..f9a87fd58 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -38,7 +38,7 @@
 #include <tqfileinfo.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -91,7 +91,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     kapp->processEvents();
 
     for (int dirNum = 101; dirNum < 999; dirNum++) {
-        slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
+        slidePath = TQString("/DCIM/%1MSPJP").tqarg(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").arg(slidePath).ascii(), 67 );
+    strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 );
     buff[67] = 0x00;
     sppStream.writeRawBytes( buff, 68 );
     sppStream << (TQ_UINT32)0x00000001; // fixed value
@@ -298,13 +298,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
 
 
     TQLabel *helptext = new TQLabel( this );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
     helptext->setText( i18n( "Please enter the directory where the memory stick "
                              "presentation should be saved. Please also enter a "
                              "title for the slideshow presentation. " ) );
 
     TQLabel *lable2 = new TQLabel( i18n("Path:"), this );
-    lable2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     path=new KURLRequester( this );
     path->setMode( KFile::Directory);
     path->lineEdit()->setText(msPres.getPath());
@@ -320,7 +320,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
 
 
     TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" );
-    lable1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     // TODO - check if there is already a presentation with this title, and
     // add a number after it until there isn't.
     title = new KLineEdit( msPres.getTitle(), this );
@@ -351,13 +351,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
                            "leave these set to the default.") );
     TQHBox *textColourLayout = new TQHBox( colourGroup );
     TQLabel *lable3 = new TQLabel( i18n("Text color:"), textColourLayout );
-    lable3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     textColour = new KColorButton( msPres.getTextColour(), textColourLayout );
     lable3->setBuddy( textColour );
 
     TQHBox *backgroundColourLayout = new TQHBox( colourGroup );
     TQLabel *lable4 = new TQLabel( i18n("Background color:"), backgroundColourLayout );
-    lable4->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     backColour = new KColorButton( msPres.getBackColour(), backgroundColourLayout );
     lable4->setBuddy( backColour );
     colourGroup->setHidden( true );
@@ -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.arg( pathname ),
+        if( KMessageBox::questionYesNo( this, msg.tqarg( 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?" ).arg( sppFile ),
+                                         "Do you want to proceed?" ).tqarg( sppFile ),
                                    i18n( "Overwrite Presentation" ) )
              == KMessageBox::No) {
             path->setFocus();
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 52d474ba4..48074143d 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -38,13 +38,13 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn
 , m_changed( false )
 , m_noSignal( false )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
     m_ui = new MarginUI( this );
-    layout->addWidget( m_ui );
+    tqlayout->addWidget( m_ui );
 
     TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     m_ui->margins->setTitle( i18n( "Margins" ) );
 
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index 63832f35d..ea050f415 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <knuminput.h>
 #include <tqbuttongroup.h>
@@ -74,7 +74,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa
     TQVBox *page = makeVBoxMainWidget();
     TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page );
     group->setRadioButtonExclusive( TRUE );
-    group->layout();
+    group->tqlayout();
     m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group );
     m_rbVert = new TQRadioButton( i18n("Vertical"), group );
 
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index ef795d2d9..10048537f 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -19,7 +19,7 @@
 */
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqsimplerichtext.h>
@@ -145,7 +145,7 @@ void KPrNoteBar::printNotes( TQPainter *_painter, KPrinter *_printer, TQValueLis
 
     TQRect viewRect( body );
     do {
-        richText.draw( _painter, body.left(), body.top(), viewRect, colorGroup() );
+        richText.draw( _painter, body.left(), body.top(), viewRect, tqcolorGroup() );
         viewRect.moveBy( 0, body.height() );
         _painter->translate( 0, -body.height() );
         _painter->setFont( font );
@@ -174,7 +174,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const
         if ( !firstText )
             allText += TQString("\n\n");
 
-        allText += i18n( "Slide Note %1:\n" ).arg( pageCount );
+        allText += i18n( "Slide Note %1:\n" ).tqarg( 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 8bc6089d5..5a03896a5 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)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() );
+        TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( 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-shape" );
-        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:show-tqshape" );
+        animation.addAttribute( "draw:tqshape-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-shape" );
-        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:hide-tqshape" );
+        animation.addAttribute( "draw:tqshape-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" ).arg( tmpX ).arg( tmpY );
+            listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
         else
-            listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
+            listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( 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" ).arg( maxX ).arg( maxY ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
     return true;
 }
 
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 8850e2d04..7b39be509 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -22,7 +22,7 @@
 #ifndef kpobject_h
 #define kpobject_h
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcursor.h>
 
 #include "global.h"
diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp
index a6938d82d..1afef9776 100644
--- a/kpresenter/KPrPBPreview.cpp
+++ b/kpresenter/KPrPBPreview.cpp
@@ -55,7 +55,7 @@ void KPrPBPreview::resizeEvent( TQResizeEvent *e )
     {
 #if 1
         gradient->setSize( contentsRect().size() );
-        repaint();
+        tqrepaint();
 #endif
     }
 }
@@ -67,7 +67,7 @@ void KPrPBPreview::drawContents( TQPainter *painter )
 
     if ( paintType == Pen ) {
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(),
-                           colorGroup().base() );
+                           tqcolorGroup().base() );
         KoSize diff1( 0, 0 ), diff2( 0, 0 );
         int _w = int( pen.pointWidth() );
 
@@ -94,7 +94,7 @@ void KPrPBPreview::drawContents( TQPainter *painter )
 
     } else if ( paintType == Brush ) {
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(),
-                           colorGroup().base() );
+                           tqcolorGroup().base() );
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), brush );
     } else if ( paintType == Gradient )
         painter->drawPixmap( 0, 0, gradient->pixmap());
@@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _
     gradient->setUnbalanced( _unbalanced );
     gradient->setXFactor( _xfactor );
     gradient->setYFactor( _yfactor );
-    repaint( false );
+    tqrepaint( false );
 }
 
 
diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h
index a3f1b2837..c3ba061ec 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; 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 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 setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t,
                       bool _unbalanced, int _xfactor, int _yfactor );
-    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 ); }
+    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 ); }
 
 protected:
     void drawContents( TQPainter *p );
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 656b48e2a..d8e65bac1 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" ).arg( posPage ) : m_manualTitle );
+    return  ( m_manualTitle.isEmpty() ?  TQString( "page%1" ).tqarg( posPage ) : m_manualTitle );
 }
 
 bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context,
@@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage
 
         xmlWriter.startElement( "style:master-page" );
         xmlWriter.addAttribute( "style:name", "Standard" );
-        xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName );
+        xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName );
 
         TQString styleName = saveOasisPageStyle( store, context.mainStyles() );
         if ( !styleName.isEmpty() )
@@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const
         return true;
 
     //todo : add size for draw:text-box otherwise we can't import into oo
-    //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes">
+    //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes">
     xmlWriter.startElement( "presentation:notes" );
     xmlWriter.startElement( "draw:frame" );
     //todo save style
@@ -881,7 +881,7 @@ void KPrPage::unifyObjectName( KPrObject *object ) {
         if ( rx.search( objectName ) != -1 ) {
             objectName.remove( rx );
         }
-        objectName += TQString(" (%1)").arg( count );
+        objectName += TQString(" (%1)").tqarg( count );
         object->setObjectName( objectName );
     }
 }
@@ -930,7 +930,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects )
         if ( usedPageNames.contains( objectName ) )
         {
             usedPageNames[objectName]++;
-            objectName += TQString(" (%1)").arg( usedPageNames[objectName] );
+            objectName += TQString(" (%1)").tqarg( 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->repaint(_tempObj);
+            m_doc->tqrepaint(_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 repaint object
+    //TODO fix tqrepaint object
     if (  !text.isEmpty() )
     {
         KPrTextView *view =  kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L );
         view->insertText( text );
         view->terminate();
         delete view;
-        m_doc->repaint( kptextobject );
+        m_doc->tqrepaint( 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->repaint( false );
+    m_doc->tqrepaint( false );
 
     return kppartobject;
 }
@@ -1534,7 +1534,7 @@ void KPrPage::slotRepaintVariable()
     for ( ; it.current() ; ++it )
     {
         if ( it.current()->getType() == OT_TEXT )
-            m_doc->repaint( it.current() );
+            m_doc->tqrepaint( it.current() );
     }
 }
 
@@ -1545,7 +1545,7 @@ void KPrPage::recalcPageNum()
     {
         if ( it.current()->getType() == OT_TEXT ) {
             ( (KPrTextObject*)it.current() )->recalcPageNum( this );
-            m_doc->repaint( it.current() ); // TODO only if something changed
+            m_doc->tqrepaint( 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->repaint( false );
+        m_doc->tqrepaint( false );
     }
 }
 
@@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const
     {
         // MASTERPAGE
         if ( m_masterPage )
-            title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 );
+            title = i18n( "Slide %1" ).tqarg( 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->repaint( kpobject );
+    m_doc->tqrepaint( 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->repaint( br ); // Previous position
-            m_doc->repaint( it.current() ); // New position
+            m_doc->tqrepaint( br ); // Previous position
+            m_doc->tqrepaint( 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->repaint( oldBoundingRect );
-            m_doc->repaint( it.current() );
+            m_doc->tqrepaint( oldBoundingRect );
+            m_doc->tqrepaint( it.current() );
         }
     }
 
@@ -2208,7 +2208,7 @@ void KPrPage::repaintObj()
     for ( ; it.current() ; ++it )
     {
         if(it.current()->isSelected())
-            m_doc->repaint(it.current() );
+            m_doc->tqrepaint(it.current() );
     }
 }
 
@@ -2388,7 +2388,7 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj)
         {
             static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true);
             if(refreshTextObj)
-                m_doc->repaint( oIt.current() );
+                m_doc->tqrepaint( oIt.current() );
         }
     }
 }
@@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop )
             if ( obj )
             {
                 obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop ));
-                obj->layout();
-                m_doc->repaint( obj );
+                obj->tqlayout();
+                m_doc->tqrepaint( obj );
             }
         }
     }
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index b358fd550..a7c3093b6 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 repaint= false;
+    bool tqrepaint= 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 )
         {
-            repaint = true;
+            tqrepaint = 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 ( repaint )
+    if ( tqrepaint )
     {
         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 42054ded4..9f903608c 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" ).arg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).tqarg( 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->geometry() );
+    KoRect g = zh->unzoomRect( _koChild->tqgeometry() );
     KPrObject::setOrig( g.x(), g.y() );
     KPrObject::setSize( g.width(), g.height() );
 }
diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp
index 553cf3c11..d67900844 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -23,7 +23,7 @@
 #include "penstyle.h"
 #include "KPrPBPreview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 
@@ -37,11 +37,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const
 : TQWidget( parent, name )
 , m_pen( pen )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PenStyleUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PenStyleUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ),
              this, TQT_SLOT( slotPenChanged() ) );
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index a8219a7fb..a7df156f3 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -32,7 +32,7 @@
 #include <tqvgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpen.h>
 #include <tqpushbutton.h>
@@ -135,9 +135,9 @@ void KPrPgConfDia::setupPageGeneral()
 				    "using the mouse.</p>"
 				    "<p>You can configure the color of the drawing pen and the "
 				    "width of the pen.</p>" ) );
-    penGroup->layout()->setSpacing(KDialog::marginHint());
-    penGroup->layout()->setMargin(KDialog::spacingHint());
-    //TQGridLayout *grid = new TQGridLayout(penGroup->layout(), 3, 2 );
+    penGroup->tqlayout()->setSpacing(KDialog::marginHint());
+    penGroup->tqlayout()->setMargin(KDialog::spacingHint());
+    //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 );
 
     TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup );
     //grid->addWidget( label, 0, 0 );
@@ -209,7 +209,7 @@ void KPrPgConfDia::setupPageSlides()
 
     TQWidget* spacer = new TQWidget( buttonGroup );
 
-    spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
     slidesLayout->addMultiCellWidget( buttonGroup, 4, 4, 0, 1 );
 
     if ( !m_doc->presentationName().isEmpty() )
diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp
index ba0c8b33c..a2eafde86 100644
--- a/kpresenter/KPrPicturePreview.cpp
+++ b/kpresenter/KPrPicturePreview.cpp
@@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture()
     if ( mirrorType != PM_NORMAL )
     {
         mirrorType = PM_NORMAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture()
     if ( mirrorType != PM_HORIZONTAL )
     {
         mirrorType = PM_HORIZONTAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture()
     if ( mirrorType != PM_VERTICAL )
     {
         mirrorType = PM_VERTICAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture()
     if ( mirrorType != PM_HORIZONTALANDVERTICAL )
     {
         mirrorType = PM_HORIZONTALANDVERTICAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0()
     if ( depth !=0 )
     {
         depth = 0;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1()
     if ( depth != 1 )
     {
         depth = 1;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8()
     if ( depth != 8)
     {
         depth = 8;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16()
     if ( depth != 16 )
     {
         depth = 16;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32()
     if ( depth !=32 )
     {
         depth = 32;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on )
     if ( swapRGB != _on )
     {
         swapRGB = _on;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on )
     if ( grayscal != _on )
     {
         grayscal = _on;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value )
     if ( bright != _value )
     {
         bright = _value;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth)
     if ( _depth != depth )
     {
         depth = _depth;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -292,7 +292,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
     if ( mirrorType != _t )
     {
         mirrorType = _t;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -300,7 +300,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
 void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap)
 {
     origPixmap = _pixmap;
-    repaint( false );
+    tqrepaint( false );
 }
 
 
diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp
index 336f63c6f..5e0e6db86 100644
--- a/kpresenter/KPrPictureProperty.cpp
+++ b/kpresenter/KPrPictureProperty.cpp
@@ -26,15 +26,15 @@
 #include <knuminput.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap,
                                   KPrPictureSettingCmd::PictureSettings pictureSettings )
 : TQWidget( parent, name )
 , m_pictureSettings( pictureSettings )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PicturePropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) );
 
     connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) );
     connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) );
diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h
index c483f95ad..1f3ca45fe 100644
--- a/kpresenter/KPrPiePreview.h
+++ b/kpresenter/KPrPiePreview.h
@@ -25,7 +25,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "global.h"
 
@@ -39,13 +39,13 @@ public:
     ~KPrPiePreview() {}
 
     void setAngle( int _angle )
-        { angle = _angle; repaint( true ); }
+        { angle = _angle; tqrepaint( true ); }
     void setLength( int _len )
-        { len = _len; repaint( true ); }
+        { len = _len; tqrepaint( true ); }
     void setType( PieType _type )
-        { type = _type; repaint( true ); }
+        { type = _type; tqrepaint( true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 3dda30795..694a9653f 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "KPrPieProperty.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -35,8 +35,8 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC
 : TQWidget( parent, name )
 , m_pieValues( pieValues )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PiePropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PiePropertyUI( this ) );
 
     m_ui->typeCombo->insertItem( i18n( "Pie" ) );
     m_ui->typeCombo->insertItem( i18n( "Arc" ) );
diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp
index 9e4320e38..0a4c89210 100644
--- a/kpresenter/KPrPixmapObject.cpp
+++ b/kpresenter/KPrPixmapObject.cpp
@@ -365,7 +365,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href/*.mid(1)*/);
-        const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+        const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
         image.setKey(key);
 
         KoStore* store = context.store();
diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp
index 86fc46411..a1fb05644 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-shape";
+    return "draw:custom-tqshape";
 }
 
 void KPrPointObject::loadOasisMarker( KoOasisContext & context )
diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp
index 8283a4c56..cd419aec9 100644
--- a/kpresenter/KPrPolyLineObjectIface.cpp
+++ b/kpresenter/KPrPolyLineObjectIface.cpp
@@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj )
 
 void KPrPolyLineObjectIface::horizontalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip(true );
 }
 
 void KPrPolyLineObjectIface::verticalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp
index 2f621df94..451b1a484 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%").arg( sharpnessValue ) );
+        sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) );
     }
 
     return true;
diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp
index 545472a3e..e41e9c6fe 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;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotConvexPolygon()
 {
     isConcave = false;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotConcavePolygon()
 {
     isConcave = true;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotCornersValue( int value )
 {
     nCorners = value;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotSharpnessValue( int value )
 {
     sharpness = value;
-    repaint();
+    tqrepaint();
 }
 
 
diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h
index 8fdcb26a5..4d6cc248e 100644
--- a/kpresenter/KPrPolygonPreview.h
+++ b/kpresenter/KPrPolygonPreview.h
@@ -26,7 +26,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class TQPainter;
 
@@ -40,7 +40,7 @@ public:
     ~KPrPolygonPreview() {}
 
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 public slots:
     void slotConvexConcave( bool convexConcave );
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index 69405b99a..fe303a0bc 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "KPrPolygonProperty.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -33,8 +33,8 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP
 : TQWidget( parent, name )
 , m_polygonSettings( polygonSettings )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PolygonPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) );
 
     m_ui->typeCombo->insertItem( i18n( "Polygon" ) );
     m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) );
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index 8306dec31..88163c62d 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klistview.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -48,7 +48,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
     slides->setSelected( slides->firstChild(), true );
 
     label = new TQLabel( i18n( "Presentation duration: " ) + _durationString, page );
-    label->setAlignment( AlignVCenter );
+    label->tqsetAlignment( AlignVCenter );
     topLayout->addWidget( label );
 
     setMinimumSize( 600, 400 );
@@ -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" ).arg( i + 1 ) );
+            item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
             item->setText( 1, *m_durationListString.at( i ) );
             item->setText( 2, doc->pageList().at( i )->pageTitle() );
         }
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index 7fc553cf1..3dce55a3d 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -21,7 +21,7 @@
 */
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -36,7 +36,7 @@
   : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KPresenter Options" ) );
-  TQGridLayout *layout = new TQGridLayout( this, 2, 1, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 );
   txtRows = new KIntNumInput(this );
   txtRows->setMinValue(1);
   txtRows->setMaxValue(5);
@@ -50,21 +50,21 @@
 
   TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this );
   TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") );
-  layout->addMultiCellWidget( caption, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 );
   TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 );
   l2->addWidget( new TQLabel(i18n("Rows: "), this) );
   l2->addWidget( new TQLabel(i18n("Columns: "), this) );
-  layout->addLayout( l2, 1, 0 );
+  tqlayout->addLayout( l2, 1, 0 );
 
   TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 );
   l3->addWidget( txtRows );
   l3->addWidget( txtColumns );
-  layout->addLayout( l3, 1, 1 );
+  tqlayout->addLayout( l3, 1, 1 );
 
   drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this );
   drawBorder->setChecked( true );
   drawBorder->setEnabled( false );
-  layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
 }
 
 void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h
index 7e09a9138..bf539132e 100644
--- a/kpresenter/KPrRectPreview.h
+++ b/kpresenter/KPrRectPreview.h
@@ -25,7 +25,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class KPrRectPreview : public TQFrame
 {
@@ -37,9 +37,9 @@ public:
     ~KPrRectPreview() {}
 
     void setRnds( int _rx, int _ry )
-        { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); }
+        { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp
index e3251e582..2174755b7 100644
--- a/kpresenter/KPrRectProperty.cpp
+++ b/kpresenter/KPrRectProperty.cpp
@@ -27,15 +27,15 @@
 
 #include <tqspinbox.h>
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue )
 : TQWidget( parent, name )
 , m_rectValue( rectValue )
 {
     formerVerticalValue = 0;
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new RectPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new RectPropertyUI( this ) );
     KoImageResource kir;
     m_ui->combineButton->setPixmap(kir.chain());
 
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index a5977b4ea..4f2d59cae 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -19,7 +19,7 @@
 #include <tqtoolbutton.h>
 #include <tqslider.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqobject.h>
 #include <tqevent.h>
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index 61aced100..e46e80fdb 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -1,7 +1,7 @@
 // -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 #include <tqspinbox.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 
 #include <kcolorbutton.h>
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index be2e4079b..b39ab5b06 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)" ).arg( title );
+        title = i18n( "(%1)" ).tqarg( title );
     setText( 0, title );
 }
 
@@ -762,7 +762,7 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v )
     setSorting( -1 );
     header()->hide();
     addColumn( i18n( "Slide" ) );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
     connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
@@ -935,7 +935,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
         m_doc->deSelectAllObj();
         m_view->getCanvas()->selectObj( object );
         m_view->showObjectRect( object );
-        m_doc->repaint( false );
+        m_doc->tqrepaint( false );
     }
 }
 
diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h
index 8f23225f3..b6450f110 100644
--- a/kpresenter/KPrSideBar.h
+++ b/kpresenter/KPrSideBar.h
@@ -109,7 +109,7 @@ public:
     KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v );
     ~KPrOutline();
     void setCurrentPage( int pg );
-    TQSize sizeHint() const { return TQSize( 145, KListView::sizeHint().height() ); }
+    TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); }
     void updateItem( int pagenr, bool sticky = false);
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
@@ -154,7 +154,7 @@ public:
         m_thb->setCurrentPage(pg);
     };
     void setOn( int , bool ) { };
-    //TQSize sizeHint() const { return TQSize( 120, TQTabWidget::sizeHint().height() ); };
+    //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); };
     void updateItem( KPrPage *page );
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 9afecb258..f0b3a05b6 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->repaint();
+        m_dialog->previewPixmap->tqrepaint();
     }
 
     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" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 0194e1fe1..6cec5fc22 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -58,7 +58,7 @@
 #include <tqapplication.h>
 #include <tqfontdatabase.h>
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <KoParagCounter.h>
 #include <kaction.h>
@@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const
     if ( bright != 0.0 )
         styleobjectauto.addPropertyPt("fo:padding-right", bright );
 
-    //add vertical alignment
+    //add vertical tqalignment
     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 alignment
+    // vertical tqalignment
     if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) )
     {
-        TQString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
-        if ( alignment == "top" )
+        TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
+        if ( tqalignment == "top" )
             m_textVertAlign= KP_TOP;
-        else if ( alignment == "middle" )
+        else if ( tqalignment == "middle" )
             m_textVertAlign= KP_CENTER;
-        else if ( alignment == "bottom" )
+        else if ( tqalignment == "bottom" )
             m_textVertAlign= KP_BOTTOM;
     }
     kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign==  KP_CENTER ) ? "center": "bottom" )<<endl;
@@ -473,7 +473,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle
 {
     //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl;
     recalcVerticalAlignment();
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     _painter->save();
     _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical));
     if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer))
@@ -871,7 +871,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
     if ( !n.isNull() )
     {
         TQFontDatabase fdb;
-        TQStringList families = fdb.families();
+        TQStringList families = fdb.tqfamilies();
         if ( families.findIndex( n.attribute( attrFamily ) ) != -1 )
             fn.setFamily( n.attribute( attrFamily ) );
         else
@@ -972,7 +972,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
 
 KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle)
 {
-    KoParagLayout layout;
+    KoParagLayout tqlayout;
 
     // Only when loading paragraphs, not when loading styles
     if ( findStyle )
@@ -998,7 +998,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             style = doc->styleCollection()->findStyle( "Standard" );
         }
         Q_ASSERT(style);
-        layout.style = style;
+        tqlayout.style = style;
     }
 
     TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement();
@@ -1007,17 +1007,17 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
         double val=0.0;
         if(element.hasAttribute("first"))
             val=element.attribute("first").toDouble();
-        layout.margins[TQStyleSheetItem::MarginFirstLine] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val;
         val=0.0;
         if(element.hasAttribute( "left"))
             // The GUI prevents a negative indent, so let's fixup broken docs too
             val=TQMAX(0, element.attribute( "left").toDouble());
-        layout.margins[TQStyleSheetItem::MarginLeft] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginLeft] = val;
         val=0.0;
         if(element.hasAttribute("right"))
             // The GUI prevents a negative indent, so let's fixup broken docs too
             val=TQMAX(0, element.attribute("right").toDouble());
-        layout.margins[TQStyleSheetItem::MarginRight] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginRight] = val;
     }
     element = parentElem.namedItem( "LINESPACING" ).toElement();
     if ( !element.isNull() )
@@ -1028,18 +1028,18 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             TQString value = element.attribute( "value" );
             if ( value == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( value == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.setLineSpacingValue(0);
             }
             else
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.setLineSpacingValue(value.toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.setLineSpacingValue(value.toDouble());
             }
         }
         else
@@ -1047,28 +1047,28 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             TQString type = element.attribute( "type" );
             if ( type == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( type == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( type == "custom" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
             else if ( type == "atleast" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
             else if ( type == "multiple" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
         }
     }
@@ -1079,43 +1079,43 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
         double val =0.0;
         if(element.hasAttribute("before"))
             val=TQMAX(0, element.attribute("before").toDouble());
-        layout.margins[TQStyleSheetItem::MarginTop] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginTop] = val;
         val = 0.0;
         if(element.hasAttribute("after"))
             val=TQMAX(0, element.attribute("after").toDouble());
-        layout.margins[TQStyleSheetItem::MarginBottom] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginBottom] = val;
     }
 
 
     element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.leftBorder = KoBorder::loadBorder( element );
+        tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
-        layout.leftBorder.setPenWidth( 0);
+        tqlayout.leftBorder.setPenWidth( 0);
 
     element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.rightBorder = KoBorder::loadBorder( element );
+        tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
-        layout.rightBorder.setPenWidth( 0);
+        tqlayout.rightBorder.setPenWidth( 0);
 
     element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.topBorder = KoBorder::loadBorder( element );
+        tqlayout.topBorder = KoBorder::loadBorder( element );
     else
-        layout.topBorder.setPenWidth(0);
+        tqlayout.topBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.bottomBorder = KoBorder::loadBorder( element );
+        tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
-        layout.bottomBorder.setPenWidth(0);
+        tqlayout.bottomBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
-        layout.counter = new KoParagCounter;
-        layout.counter->load( element );
+        tqlayout.counter = new KoParagCounter;
+        tqlayout.counter->load( element );
     }
 
     KoTabulatorList tabList;
@@ -1140,110 +1140,110 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             tabList.append( tab );
         }
     }
-    layout.setTabList( tabList );
+    tqlayout.setTabList( tabList );
 
 
-    return layout;
+    return tqlayout;
 }
 
-void KPrTextObject::saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem )
+void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem )
 {
     TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
     parentElem.appendChild( element );
-    if ( layout.style )
-        element.setAttribute( "value", layout.style->name() );
+    if ( tqlayout.style )
+        element.setAttribute( "value", tqlayout.style->name() );
     else
         kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl;
 
 
-    if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginRight] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
-            element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] );
-        if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 )
-            element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] );
-        if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 )
-            element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
+            element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
+            element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
+            element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] );
     }
 
 
-    if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 )
-            element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] );
-        if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
-            element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
+            element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+            element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] );
     }
 
-    if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE )
+    if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
         parentElem.appendChild( element );
-        if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )
+        if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )
             element.setAttribute( "type", "oneandhalf" );
-        else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE )
             element.setAttribute( "type", "double" );
-        else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM )
         {
             element.setAttribute( "type", "custom" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
         {
             element.setAttribute( "type", "atleast" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
         {
             element.setAttribute( "type", "multiple" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
         else
             kdDebug(33001) << " error in lineSpacing Type" << endl;
     }
 
-    if ( layout.leftBorder.penWidth() > 0 )
+    if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
         parentElem.appendChild( element );
-        layout.leftBorder.save( element );
+        tqlayout.leftBorder.save( element );
     }
-    if ( layout.rightBorder.penWidth() > 0 )
+    if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
         parentElem.appendChild( element );
-        layout.rightBorder.save( element );
+        tqlayout.rightBorder.save( element );
     }
-    if ( layout.topBorder.penWidth() > 0 )
+    if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
         parentElem.appendChild( element );
-        layout.topBorder.save( element );
+        tqlayout.topBorder.save( element );
     }
-    if ( layout.bottomBorder.penWidth() > 0 )
+    if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
         parentElem.appendChild( element );
-        layout.bottomBorder.save( element );
+        tqlayout.bottomBorder.save( element );
     }
 
-    if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE )
+    if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
         parentElem.appendChild( element );
-        if (layout.counter )
-            layout.counter->save( element );
+        if (tqlayout.counter )
+            tqlayout.counter->save( element );
     }
 
-    KoTabulatorList tabList = layout.tabList();
+    KoTabulatorList tabList = tqlayout.tabList();
     KoTabulatorList::ConstIterator it = tabList.begin();
     for ( ; it != tabList.end() ; it++ )
     {
@@ -1287,25 +1287,25 @@ void KPrTextObject::recalcPageNum( KPrPage *page )
             }
 
             var->resize();
-            var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting !
+            var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting !
             var->paragraph()->setChanged( true );
         }
     }
 }
 
-void KPrTextObject::layout()
+void KPrTextObject::tqlayout()
 {
-    invalidate();
+    tqinvalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KPrTextObject::invalidate()
+void KPrTextObject::tqinvalidate()
 {
-    //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl;
+    //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
     textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() );
-    textDocument()->invalidate(); // lazy layout, real update follows upon next repaint
+    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
 }
 
 // For the "paragraph after paragraph" effect
@@ -1380,7 +1380,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV
     //p->fillRect( clip, TQt::blue );
 
     TQPixmap *pix = 0;
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() );
 
     uint drawingFlags = KoTextDocument::DrawSelections;
@@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp )
 
 void KPrTextObject::removeHighlight ()
 {
-    m_textobj->removeHighlight( true /*repaint*/ );
+    m_textobj->removeHighlight( true /*tqrepaint*/ );
 }
 
-void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog )
+void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog )
 {
-    m_textobj->highlightPortion( parag, index, length, repaint );
-    if ( repaint )
+    m_textobj->highlightPortion( parag, index, length, tqrepaint );
+    if ( tqrepaint )
     {
         KPrDocument* doc = canvas->getView()->kPresenterDoc();
 
@@ -1582,7 +1582,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
     if ( ( bottom > availHeight ) ||   // this parag is already below the avail height
          ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it
     {
-        int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels
+        int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels
         if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight )
         {
             difference += lastFormatted->rect().height();
@@ -1616,7 +1616,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
                 // Do recalculate the new available height though
                 slotAvailableHeightNeeded();
                 m_doc->updateRuler();
-                m_doc->repaint( true );
+                m_doc->tqrepaint( true );
                 *abort = false;
             }
         }
@@ -1822,7 +1822,7 @@ void KPrTextView::copy()
     //kdDebug(33001)<<"void KPrTextView::copy() "<<endl;
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) {
         TQDragObject *drag = newDrag( 0 );
-        TQApplication::clipboard()->setData( drag );
+        TQApplication::tqclipboard()->setData( drag );
     }
 }
 
@@ -1830,11 +1830,11 @@ void KPrTextView::paste()
 {
     //kdDebug(33001) << "KPrTextView::paste()" << endl;
 
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     TQCString returnedMimeType = KoTextObject::providesOasis( data );
     if ( !returnedMimeType.isEmpty() )
     {
-        TQByteArray arr = data->encodedData( returnedMimeType );
+        TQByteArray arr = data->tqencodedData( returnedMimeType );
         if ( arr.size() )
         {
 #if 0
@@ -1850,13 +1850,13 @@ void KPrTextView::paste()
     }
     else
     {
-        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype).
-        TQString text = TQApplication::clipboard()->text();
+        TQString text = TQApplication::tqclipboard()->text();
         if ( !text.isEmpty() )
             textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ );
     }
-    kpTextObject()->layout();
+    kpTextObject()->tqlayout();
 }
 
 void KPrTextView::updateUI( bool updateFormat, bool force  )
@@ -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.alignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.alignment = parag->resolveAlignment();
-        m_canvas->getView()->alignChanged(  m_paragLayout.alignment );
+    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.tqalignment = parag->resolveAlignment();
+        m_canvas->getView()->alignChanged(  m_paragLayout.tqalignment );
     }
 
     // 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()->repaint( kpTextObject() );
+        kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() );
     }
 }
 
@@ -2379,7 +2379,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent )
     
     KPrDocument * doc = kpTextObject()->kPresenterDocument();
     
-    doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::currentDateTime() );
+    doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::tqcurrentDateTime() );
     doc->recalcVariables( VT_DATE );
     doc->recalcVariables( VT_TIME );
     doc->recalcVariables( VT_STATISTIC );
@@ -2472,7 +2472,7 @@ void KPrTextView::dropEvent( TQDropEvent * e )
             KCommand *cmd = textView()->prepareDropMove( dropCursor );
             if(cmd)
             {
-                kpTextObject()->layout();
+                kpTextObject()->tqlayout();
                 macroCmd->addCommand(cmd);
                 addMacroCmd = true;
             }
@@ -2490,7 +2490,7 @@ void KPrTextView::dropEvent( TQDropEvent * e )
         TQCString returnedTypeMime = KoTextObject::providesOasis( e );
         if ( !returnedTypeMime.isEmpty() )
         {
-            TQByteArray arr = e->encodedData( returnedTypeMime );
+            TQByteArray arr = e->tqencodedData( returnedTypeMime );
             if ( arr.size() )
             {
                 KCommand *cmd = kpTextObject()->pasteOasis( cursor(), arr, false );
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index 6b62d6b80..3bacdb69f 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 repaint, KDialogBase* dialog = 0 );
+    void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 );
 
     KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected );
 
@@ -137,7 +137,7 @@ public:
     bool isProtectContent() const { return textObject()->protectContent();}
     void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 );
 
-    void layout();
+    void tqlayout();
 
     /** Reimplemented from KoTextFlow */
     int availableHeight() const;
@@ -194,8 +194,8 @@ protected:
     virtual void loadKTextObject( const TQDomElement &e );
     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& layout, TQDomElement & parentElem );
-    void invalidate();
+    void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem );
+    void tqinvalidate();
     void recalcVerticalAlignment();
     virtual KoPen defaultPen() const;
 protected slots:
diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index 01478ef2d..0dfc1d79b 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const
 void KPrTextObjectIface::setPtMarginLeft(double val)
 {
     m_textobject->setBLeft(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginRight(double val)
 {
     m_textobject->setBRight(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginTop(double val)
 {
     m_textobject->setBTop(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginBottom(double val)
 {
     m_textobject->setBBottom(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 double KPrTextObjectIface::ptMarginLeft()const
diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h
index bedb47538..f25d6987d 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; 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 ); }
+    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 ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index fd794daa5..6708065b7 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -23,7 +23,7 @@
 #include "KPrTextProperty.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -37,15 +37,15 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg
 , m_unit( unit )
 , m_protectContent( protectContent )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 );
 
-    layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 );
-    layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 );
+    tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 );
+    tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 );
 
     connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ),
              this, TQT_SLOT( slotProtectContentChanged( bool ) ) );
 
-    resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) );
+    resize( TQSize( 301, 217 ).expandedTo( tqminimumSizeHint() ) );
 
     m_margins->setValues( marginsStruct.leftMargin, marginsStruct.rightMargin,
                           marginsStruct.topMargin, marginsStruct.bottomMargin );
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 33a0e9ed1..a7fc0899e 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -34,7 +34,7 @@
 #include <tqheader.h>
 #include <tqwmatrix.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqimage.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -105,7 +105,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed )
 
         delete m_pageEffect;
         m_pageEffect = 0;
-        TQLabel::repaint();
+        TQLabel::tqrepaint();
     }
 
     m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed );
@@ -160,8 +160,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
 
     // right-side of the dialog, for showing effect preview
 
-    TQVBoxLayout *rightlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() );
-    rightlayout->setAutoAdd( true );
+    TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() );
+    righttqlayout->setAutoAdd( true );
 
     effectPreview = new KPrEffectPreview( rightpart, doc, view );
 
@@ -178,8 +178,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     pageEffect = pg->getPageEffect();
     speed = pg->getPageEffectSpeed();
 
-    TQVBoxLayout *leftlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() );
-    leftlayout->setAutoAdd( true );
+    TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() );
+    lefttqlayout->setAutoAdd( true );
 
     new TQLabel( i18n("Effect:"), leftpart );
 
@@ -260,7 +260,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     automaticPreview->setChecked( true );
 
     TQWidget* previewspacer = new TQWidget( previewgrp );
-    previewspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    previewspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
                                                TQSizePolicy::Expanding ) );
 
     previewButton = new TQPushButton( previewgrp );
@@ -314,7 +314,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) );
 
     TQWidget* rspacer = new TQWidget( rightpart );
-    rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    rspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     TQWidget* lspacer = new TQWidget( leftpart );
     lspacer->setMinimumSize( 10, spacingHint() );
@@ -386,7 +386,7 @@ static TQString getSoundFileFilter()
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp
index 2cbf5dc62..fa21141ac 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" ).arg( hours ).arg( ms ).arg( sec );
+    TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
     return timeIso;
 }
 
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 9958ac138..a86caa802 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -26,12 +26,12 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <assert.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqdir.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqradiobutton.h>
 #include <tqdragobject.h>
 #include <tqfile.h>
@@ -410,23 +410,23 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name )
     if ( sb ) // No statusbar in e.g. konqueror
     {
         m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbPageLabel, 0 );
 
         m_sbModifiedLabel = new KStatusBarLabel( "   ", 0, sb );
-        m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbModifiedLabel, 0 );
 
         m_sbObjectLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbObjectLabel, 1 );
 
         m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb );
-        m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbZoomLabel, 0 );
 
         m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_pKPresenterDoc->unit() ) + ' ', 0, sb );
-        m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbUnitLabel, 0 );
     }
 
@@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt )
     prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() );
     prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() );
     prt.setPageSelection(KPrinter::ApplicationSide);
-    KoPageLayout layout = m_pKPresenterDoc->pageLayout();
-    prt.setOption( "kde-margin-top", TQString::number(layout.ptTop) );
-    prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) );
-    prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) );
-    prt.setOption( "kde-margin-right", TQString::number(layout.ptRight) );
-    KoFormat pageFormat = layout.format;
+    KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout();
+    prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) );
+    prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) );
+    prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) );
+    prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) );
+    KoFormat pageFormat = tqlayout.format;
     prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) );
 
     if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN )
@@ -579,9 +579,9 @@ void KPrView::print( KPrinter &prt )
         m_pKPresenterDoc->recalcVariables( VT_ALL );
     }
 
-    m_canvas->repaint();
+    m_canvas->tqrepaint();
     kdDebug(33001) << "KPrView::print zoom&res reset" << endl;
-    m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
+    m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime());
     m_pKPresenterDoc->recalcVariables( VT_DATE );
 }
 
@@ -620,7 +620,7 @@ void KPrView::editPaste()
     if ( !m_canvas->currentTextObjectView() ) {
         m_canvas->setToolEditMode( TEM_MOUSE );
         deSelectAllObjects();
-        TQMimeSource *data = TQApplication::clipboard()->data();
+        TQMimeSource *data = TQApplication::tqclipboard()->data();
         if ( data->provides( "text/uri-list" ) )
         {
             m_pKPresenterDoc->pastePage( data, currPg );
@@ -632,7 +632,7 @@ void KPrView::editPaste()
         {
             // TODO: it would be nice to have no offset when pasting onto a different page...
             m_canvas->activePage()->pasteObjs(
-                data->encodedData(KoStoreDrag::mimeType("application/x-kpresenter")),
+                data->tqencodedData(KoStoreDrag::mimeType("application/x-kpresenter")),
                 1, 0.0, 0.0, 0.0, 20.0, 20.0);
 
             m_canvas->setMouseSelectedObject(true);
@@ -644,7 +644,7 @@ void KPrView::editPaste()
             //TODO : fix me !!
             // TODO: it would be nice to have no offset when pasting onto a different page...
             //m_canvas->activePage()->pasteObjs(
-            //data->encodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")),
+            //data->tqencodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")),
             //1, 0.0, 0.0, 0.0, 20.0, 20.0);
 
             m_canvas->setMouseSelectedObject(true);
@@ -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.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
+                                   "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( 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.").arg( strerror( tempFile.status() ) ),
+                            "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
@@ -1274,7 +1274,7 @@ void KPrView::extraShadow()
 
         if ( !shadowDia ) {
             shadowDia = new KPrShadowDialogImpl( this );
-            shadowDia->resize( shadowDia->minimumSize() );
+            shadowDia->resize( shadowDia->tqminimumSize() );
             connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) );
         }
 
@@ -1509,7 +1509,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
             KProcess proc;
             proc << xdgScreenSaver;
             proc << "suspend";
-            proc << TQString::number( topLevelWidget()->winId() );
+            proc << TQString::number( tqtopLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
             proc.start( KProcess::DontCare );
         } else {
@@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
         if ( !kPresenterDoc()->spManualSwitch() )
         {
              m_autoPresStop = false;
-             m_pKPresenterDoc->repaint( false );
+             m_pKPresenterDoc->tqrepaint( false );
 
              if ( ! m_autoPresTimerConnected ) {
                  connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) );
@@ -1633,7 +1633,7 @@ void KPrView::screenStop()
             KProcess proc;
             proc << xdgScreenSaver;
             proc << "resume";
-            proc << TQString::number( topLevelWidget()->winId() );
+            proc << TQString::number( tqtopLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
             proc.start( KProcess::DontCare );
         } else {
@@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont()
 
 void KPrView::slotCounterStyleSelected()
 {
-    TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+    TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
     if ( actionName.startsWith( "counterstyle_" ) )
     {
         TQString styleStr = actionName.mid(13);
@@ -2175,7 +2175,7 @@ void KPrView::createGUI()
 
     // setup page
     pageBase = new PageBase( splitterVertical, this );
-    pageBase->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+    pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
     m_canvas=new KPrCanvas( pageBase, "Canvas", this );
 
@@ -2414,7 +2414,7 @@ void KPrView::setupActions()
     actionToolsZoom->setExclusiveGroup( "tools" );
 
     actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle",
-                                             actionCollection(), "tools_shapepopup" );
+                                             actionCollection(), "tools_tqshapepopup" );
     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").arg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").tqarg( 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_alignment" );
+    actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" );
     actionAlignVerticalTop->setChecked( true );
 
 
     actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ),
                                                    actionCollection(), "align_bottom" );
-    actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" );
+    actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" );
 
     actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ),
                                                    actionCollection(), "align_center" );
-    actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" );
+    actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" );
 
 
     actionSavePicture= new KAction( i18n("Save Picture..."), 0,
@@ -3491,8 +3491,8 @@ void KPrView::reorganize()
 
         if(kPresenterDoc()->showRuler())
         {
-            int hSpace = v_ruler->minimumSizeHint().width();
-            int vSpace = h_ruler->minimumSizeHint().height();
+            int hSpace = v_ruler->tqminimumSizeHint().width();
+            int vSpace = h_ruler->tqminimumSizeHint().height();
 
             m_canvas->move( hSpace, vSpace );
             if ( h_ruler )
@@ -3552,8 +3552,8 @@ void PageBase::resizeEvent( TQResizeEvent *e )
     TQSize s = e ? e->size() : size();
 
     if ( view->m_bShowGUI ) {
-        int hSpace = view->getVRuler()->minimumSizeHint().width();
-        int vSpace = view->getVRuler()->minimumSizeHint().height();
+        int hSpace = view->getVRuler()->tqminimumSizeHint().width();
+        int vSpace = view->getVRuler()->tqminimumSizeHint().height();
 
         view->m_canvas->resize( s.width() - ( hSpace + 16 ), s.height() - ( vSpace + 16 ) );
         view->vert->setGeometry( s.width() - 16, 0, 16, s.height() - 32 );
@@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus()
     actionToolsLinePopup->insert(actionToolsCubicBezierCurve);
     actionToolsLinePopup->insert(actionToolsQuadricBezierCurve);
 
-    // create insert-shape popup
+    // create insert-tqshape popup
     actionToolsShapePopup->insert(actionToolsRectangle);
     actionToolsShapePopup->insert(actionToolsCircleOrEllipse);
     actionToolsShapePopup->insert(actionToolsPie);
@@ -3778,8 +3778,8 @@ void KPrView::setupRulers()
     v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() );
     v_ruler->setReadWrite(kPresenterDoc()->isReadWrite());
 
-    int hSpace = v_ruler->minimumSizeHint().width();
-    int vSpace = h_ruler->minimumSizeHint().height();
+    int hSpace = v_ruler->tqminimumSizeHint().width();
+    int vSpace = h_ruler->tqminimumSizeHint().height();
 
     m_canvas->resize( m_canvas->width() - hSpace, m_canvas->height() - vSpace );
     m_canvas->move( hSpace, vSpace );
@@ -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->repaint( FALSE );
+    m_pKPresenterDoc->tqrepaint( FALSE );
 
     m_pKPresenterDoc->displayActivePage( page );
 }
@@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo()
 {
     if (m_sbPageLabel)
         m_sbPageLabel->setText( TQString(" ") +
-                                i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+
+                                i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(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)" )
-                    .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 ) ) );
+                    .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 ) ) );
         }
         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->repaint( false );
+        m_canvas->tqrepaint( 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/*repaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
 }
 
 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/*repaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
 
     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").arg(i).latin1();
+                TQCString name = TQString("custom-action_%1").tqarg(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").arg(i).latin1() );
+                       TQString("custom-action_%1").tqarg(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()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
             if( getVRuler())
@@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler()
                 if( getVRuler()->flags() != 0 )
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
         }
@@ -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%").arg(*it) );
+            lst.append( i18n("%1%").tqarg(*it) );
     }
     else
     {
-        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");
+        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");
     }
     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%").arg( zoom ) );
+    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
     int pos = list.findIndex(zoomStr);
     if( pos == -1)
     {
@@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s )
     }
 
     m_canvas->setFocus();
-    m_canvas->repaint();
+    m_canvas->tqrepaint();
 }
 
 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->repaint();
+    m_canvas->tqrepaint();
 }
 
 void KPrView::setZoom( int zoom, bool updateViews )
@@ -5360,8 +5360,8 @@ KoTextZoomHandler *KPrView::zoomHandler() const
 void KPrView::slotViewFormattingChars()
 {
     m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked());
-    m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 void KPrView::setPageDuration( int _pgNum )
@@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines()
     m_pKPresenterDoc->updateGuideLineButton();
     deSelectAllObjects();
     refreshRuler( state );
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 
@@ -5656,7 +5656,7 @@ void KPrView::viewGrid()
     m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() );
     m_pKPresenterDoc->setModified( true );
     m_pKPresenterDoc->updateGridButton();
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 
@@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getHRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getHRuler()->repaint();
+            getHRuler()->tqrepaint();
         }
         else
         {
@@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getHRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getHRuler()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
             else
@@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != 0 )
                 {
                     getHRuler()->changeFlags( 0 );
-                    getHRuler()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
         }
@@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getVRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getVRuler()->repaint();
+            getVRuler()->tqrepaint();
         }
         else
         {
@@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getVRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
             else
@@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags()!= 0)
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
         }
@@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged()
         KoParagCounter counter;
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
-        int align = paragLayout->alignment;
+        int align = paragLayout->tqalignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         alignChanged( align );
@@ -5964,11 +5964,11 @@ void KPrView::duplicateObj()
         m_canvas->copyObjs();
         m_canvas->setToolEditMode( TEM_MOUSE );
         deSelectAllObjects();
-        TQMimeSource *data = TQApplication::clipboard()->data();
+        TQMimeSource *data = TQApplication::tqclipboard()->data();
         TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter");
         if ( data->provides( clip_str ) )
         {
-            m_canvas->activePage()->pasteObjs( data->encodedData(clip_str),
+            m_canvas->activePage()->pasteObjs( data->tqencodedData(clip_str),
                                                nbCopy, angle, increaseX,increaseY, moveX, moveY );
             m_canvas->setMouseSelectedObject(true);
             emit objectSelectedChanged();
@@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode()
             getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             getHRuler()->changeFlags(0);
-        getHRuler()->repaint();
+        getHRuler()->tqrepaint();
     }
 }
 
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index f00b7e2d1..1fc3cc7e2 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -1172,7 +1172,7 @@ private:
 
     CurrentLineTool m_currentLineTool;
 
-    // store the currently selected shape-tool
+    // store the currently selected tqshape-tool
     enum CurrentShapeTool {
         StRectangle = 1,
         StCircle = 2,
diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp
index 49c2d8877..6f8aa3147 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")
-                                .arg( page->pageTitle( TQString("Page%1").arg(_nPage) ) );
+                                .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) );
                         res << TQString("Notes=%1")
-                                .arg( page->noteText() );
+                                .tqarg( page->noteText() );
                     }
                 }
             }
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 5641c6cd3..2197cf32e 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -33,7 +33,7 @@
 #include <ktempfile.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
@@ -46,10 +46,10 @@
 #include <tqdir.h>
 #include <tqheader.h>
 #include <tqwmatrix.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqregexp.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
@@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
         {
@@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
             {
                 if (!codec->canEncode(ch))
                 {
-                    strReturn+=TQString("&#%1;").arg(ch.unicode());
+                    strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
                     break;
                 }
             }
@@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str
         {
             if (!codec->canEncode(ch))
             {
-                strReturn+=TQString("&#%1;").arg(ch.unicode());
+                strReturn+=TQString("&#%1;").tqarg(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" ).arg( i );
+            TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( 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" ).arg( i ), slideInfos[ i ].slideTitle );
+        cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( 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" ).arg( path ).arg( i + 1 );
+        filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( 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" ).arg( path ).arg( pgNum );
-        TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
+        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
 
         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" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
+                      << i18n( "Slide %1" ).tqarg( 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>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
+                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
             streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                          .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+                                          .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( 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" ).arg( path );
+    TQString dest = TQString( "%1/index.html" ).tqarg( 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>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
+                         TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
     streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                      .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+                                      .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) );
 
     streamOut << "</body>\n</html>\n";
     file.close();
@@ -664,63 +664,63 @@ void KPrWebPresentationWizard::setupPage1()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page1 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 7, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
     helptext->setText( i18n( "Enter your name, email address and "
                              "the title of the web presentation. "
                              "Also enter the output directory where the "
                              "web presentation should be saved. " ) );
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Author:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title:"), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall "
                                   "presentation." ) );
-    layout->addWidget( label2, 3, 0 );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label3, i18n("This is where you enter the email address of the "
                                   "person or organization that is responsible for "
                                   "the presentation.") );
-    layout->addWidget( label3, 4, 0 );
+    tqlayout->addWidget( label3, 4, 0 );
 
     TQLabel *label4 = new TQLabel( i18n("Path:"), canvas );
-    label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label4, i18n("The value entered for the path is the directory "
                                   "where the presentation will be saved. If it does "
                                   "not exist, you'll be asked if you want to create "
                                   "the directory or abort the creation.") );
-    layout->addWidget( label4, 5, 0 );
+    tqlayout->addWidget( label4, 5, 0 );
 
     author = new KLineEdit( webPres.getAuthor(), canvas );
     TQWhatsThis::add( author, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    layout->addWidget( author, 2, 1 );
+    tqlayout->addWidget( author, 2, 1 );
 
     title = new KLineEdit( webPres.getTitle(), canvas );
     TQWhatsThis::add( title, i18n("This is where you enter the title of the overall "
                                  "presentation." ) );
-    layout->addWidget( title, 3, 1 );
+    tqlayout->addWidget( title, 3, 1 );
 
     email = new KLineEdit( webPres.getEmail(), canvas );
     TQWhatsThis::add( email, i18n("This is where you enter the email address of the "
                                  "person or organization that is responsible for "
                                  "the presentation.") );
-    layout->addWidget( email, 4, 1 );
+    tqlayout->addWidget( email, 4, 1 );
 
     path=new KURLRequester( canvas );
     path->setMode( KFile::Directory);
@@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1()
                                 "where the presentation will be saved. If it does "
                                 "not exist, you'll be asked if you want to create "
                                 "the directory or abort the creation.") );
-    layout->addWidget( path, 5, 1 );
+    tqlayout->addWidget( path, 5, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 6, 6, 0, 1 );
+    tqlayout->addMultiCell( spacer, 6, 6, 0, 1 );
 
     connect(path, TQT_SIGNAL(textChanged(const TQString&)),
             this,TQT_SLOT(slotChoosePath(const TQString&)));
@@ -762,43 +762,43 @@ void KPrWebPresentationWizard::setupPage2()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page2 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure the style of the web pages.");
     help += i18n( "You can also specify the zoom for the slides." );
     helptext->setText(help);
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the size of the slide image." ) );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
 
-    layout->addWidget( label2, 3, 0 );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label3, 4, 0 );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label3, 4, 0 );
 
     zoom = new KIntNumInput( webPres.getZoom(), canvas );
     TQWhatsThis::add( zoom, i18n( "This selection allows you to specify "
                                  "the size of the slide image." ) );
-    layout->addWidget( zoom, 2, 1 );
+    tqlayout->addWidget( zoom, 2, 1 );
     zoom->setSuffix( " %" );
     zoom->setRange( 25, 1000, 5 );
 
     encoding = new KComboBox( false, canvas );
-    layout->addWidget( encoding, 3, 1 );
+    tqlayout->addWidget( encoding, 3, 1 );
 
     // Fill encoding combo
     // Stolen from tdelibs/kate/part/katedialogs.cpp
@@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2()
     }
 
     doctype = new KComboBox( false, canvas );
-    layout->addWidget( doctype, 4, 1 );
+    tqlayout->addWidget( doctype, 4, 1 );
     doctype->insertItem( "HTML 4.01", -1 );
     doctype->insertItem( "XHTML 1.0", -1 );
 
@@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2()
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page2, i18n( "Step 2: Configure HTML" ) );
 
@@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page3 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Now you can customize the colors of the web pages." ) );
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label1, 2, 0 );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label2, 3, 0 );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label3, 4, 0 );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label3, 4, 0 );
 
     textColor = new KColorButton( webPres.getTextColor(), canvas );
-    layout->addWidget( textColor, 2, 1 );
+    tqlayout->addWidget( textColor, 2, 1 );
 
     titleColor = new KColorButton( webPres.getTitleColor(), canvas );
-    layout->addWidget( titleColor, 3, 1 );
+    tqlayout->addWidget( titleColor, 3, 1 );
 
     backColor = new KColorButton( webPres.getBackColor(), canvas );
-    layout->addWidget( backColor, 4, 1 );
+    tqlayout->addWidget( backColor, 4, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page3, i18n( "Step 3: Customize Colors" ) );
 
@@ -909,11 +909,11 @@ void KPrWebPresentationWizard::setupPage4()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page4 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 3, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Here you can specify titles for "
                              "each slide. Click on a slide in "
                              "the list and then enter the title "
@@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4()
                              "click on a title, KPresenter "
                              "mainview will display the slide.") );
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
     TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas );
-    label->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label, 1, 0 );
+    label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label, 1, 0 );
 
     slideTitle = new KLineEdit( canvas );
-    layout->addWidget( slideTitle, 1, 1 );
+    tqlayout->addWidget( slideTitle, 1, 1 );
     connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this,
              TQT_SLOT( slideTitleChanged( const TQString & ) ) );
 
     slideTitles = new KListView( canvas );
-    layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
+    tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
     slideTitles->addColumn( i18n( "No." ) );
     slideTitles->addColumn( i18n( "Slide Title" ) );
     connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
@@ -977,60 +977,60 @@ void KPrWebPresentationWizard::setupPage5()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page5 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure some options for unattended "
                         "presentations, such as time elapsed before automatically advance to "
                         "the next slide, looping and the presence of headers.");
     helptext->setText(help);
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the time between slides." ) );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas );
     timeBetweenSlides->setSpecialValueText(i18n( "Disabled" ));
     TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify "
                                  "the time between slides." ) );
-    layout->addWidget( timeBetweenSlides, 2, 1 );
+    tqlayout->addWidget( timeBetweenSlides, 2, 1 );
     timeBetweenSlides->setSuffix( " seconds" );
     timeBetweenSlides->setRange( 0, 900, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
 
     writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas);
     TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you "
                                        "want to write the navigation buttons on top "
                                        "of the slide." ) );
     writeHeader->setChecked( webPres.wantHeader() );
-    layout->addWidget( writeHeader, 3, 1);
+    tqlayout->addWidget( writeHeader, 3, 1);
 
     writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas);
     TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you "
                                        "want to write an imprint consisting on the author "
                                        "and the software used to create these slides." ) );
     writeFooter->setChecked( webPres.wantFooter() );
-    layout->addWidget( writeFooter, 4, 1);
+    tqlayout->addWidget( writeFooter, 4, 1);
 
     loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas);
     TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you "
                                        "want the presentation to start again once "
                                        "the latest slide is reached." ) );
     loopSlides->setChecked( webPres.wantLoopSlides() );
-    layout->addWidget( loopSlides, 5, 1);
+    tqlayout->addWidget( loopSlides, 5, 1);
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) );
 
@@ -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.arg( pathname ),
+            if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
                                             i18n( "Directory Not Found" ) )
                 == KMessageBox::Yes)
             {
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index d33675ab5..ccbfc0e85 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqwhatsthis.h>
 
@@ -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 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." ) );
+            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." ) );
             grpPtr->loadWid = new KIconCanvas(grpPtr->tab);
             // Changes for the new KIconCanvas (Werner)
             TQDir d( grpPtr->dir.absFilePath() );
@@ -137,7 +137,7 @@ void AFChoose::setupTabs()
                         continue; // Invalid .desktop file
                 }
             }
-            grpPtr->loadWid->setBackgroundColor(colorGroup().base());
+            grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base());
             grpPtr->loadWid->setResizeMode(TQIconView::Adjust);
             grpPtr->loadWid->sort();
             connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)),
@@ -148,7 +148,7 @@ void AFChoose::setupTabs()
                     TQT_SLOT(slotDoubleClick()));
             grpPtr->label = new TQLabel(grpPtr->tab);
             grpPtr->label->setText(" ");
-            grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height());
+            grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height());
             addTab(grpPtr->tab,grpPtr->name);
         }
     }
diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp
index 0f01368ae..5f010518d 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.at(),px,py);
+            pntArray.setPoint(coordList.tqat(),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).at(0) != COMMENT)
+        if (!(*it).isEmpty() && (*it).tqat(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).at(0)).latin1())
+                switch (((*it).tqat(0)).latin1())
                 {
                 case VAR_1:
                 {
@@ -310,7 +310,7 @@ void ATFInterpreter::interpret()
                 } break;
                 case VAR_PW:
                 {
-                    pw = 1; pw = ((*it).at(4)).latin1() - 48;
+                    pw = 1; pw = ((*it).tqat(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.at(i)==' ')
+        if(s.tqat(i)==' ')
             continue;
         signPtr = new Sign;
-        switch (s.at(i).latin1())
+        switch (s.tqat(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.at(i+1).latin1())
+                switch (s.tqat(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.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48;
+                    signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48;
                     i++;
                 } break;
                 default:
-                    signPtr->num = s.at(i).latin1() - 48; break;
+                    signPtr->num = s.tqat(i).latin1() - 48; break;
                 }
             }
             else
-                signPtr->num = s.at(i).latin1() - 48;
+                signPtr->num = s.tqat(i).latin1() - 48;
         } break;
         }
         list.append(signPtr);
diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui
index 0dad8b48d..eec430f15 100644
--- a/kpresenter/generalpropertyui.ui
+++ b/kpresenter/generalpropertyui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui
index b0ccae0a6..bc7f07071 100644
--- a/kpresenter/gradientpropertyui.ui
+++ b/kpresenter/gradientpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -77,7 +77,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui
index ec1f99597..430bfac8d 100644
--- a/kpresenter/imageEffectBase.ui
+++ b/kpresenter/imageEffectBase.ui
@@ -48,7 +48,7 @@
                             <verstretch>1</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>200</height>
@@ -60,7 +60,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -336,7 +336,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>130</height>
@@ -409,7 +409,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>130</height>
@@ -471,7 +471,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>81</height>
@@ -523,7 +523,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -572,7 +572,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>111</height>
@@ -621,7 +621,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -648,7 +648,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -672,7 +672,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -718,7 +718,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>111</height>
@@ -767,7 +767,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>121</height>
@@ -794,7 +794,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -818,7 +818,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -867,7 +867,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -946,7 +946,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -998,7 +998,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -1050,7 +1050,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1102,7 +1102,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1148,7 +1148,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -1200,7 +1200,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1246,7 +1246,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>183</height>
@@ -1325,7 +1325,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>41</height>
@@ -1374,7 +1374,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>81</height>
@@ -1436,7 +1436,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>91</height>
diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui
index aecf704d2..9d7372cf6 100644
--- a/kpresenter/insertpagedia.ui
+++ b/kpresenter/insertpagedia.ui
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl
index 524b3d8df..60aa3fb38 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
-      $alignment=$1 if(/horzAlign=(\"[0-2]+\")/);
-      $alignment =~ tr/01/14/;
-      s/horzAlign=\"[0-2]+\"/align=$alignment/;
+      $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/);
+      $tqalignment =~ tr/01/14/;
+      s/horzAlign=\"[0-2]+\"/align=$tqalignment/;
       s/>$/ type=$objType>/;
     }
   elsif (/<\/PARAGRAPH>/)
diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui
index 8e6383819..b4e1bd1ed 100644
--- a/kpresenter/marginui.ui
+++ b/kpresenter/marginui.ui
@@ -43,7 +43,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -59,7 +59,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui
index 56241f6f6..bcbcca09a 100644
--- a/kpresenter/penstyle.ui
+++ b/kpresenter/penstyle.ui
@@ -82,7 +82,7 @@
             <property name="name">
                 <cstring>pbPreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>80</width>
                     <height>40</height>
diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui
index b1df2a2f1..6812256cc 100644
--- a/kpresenter/picturepropertyui.ui
+++ b/kpresenter/picturepropertyui.ui
@@ -131,7 +131,7 @@
             <property name="name">
                 <cstring>picturePreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>200</height>
diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui
index 39c77f24e..854e31682 100644
--- a/kpresenter/piepropertyui.ui
+++ b/kpresenter/piepropertyui.ui
@@ -56,7 +56,7 @@
             <property name="name">
                 <cstring>piePreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>200</height>
diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui
index 813215dbe..2b1b87ddf 100644
--- a/kpresenter/polygonpropertyui.ui
+++ b/kpresenter/polygonpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -42,7 +42,7 @@
                     <property name="name">
                         <cstring>polygonPreview</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>200</height>
diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui
index 98bedfd52..ce16ef615 100644
--- a/kpresenter/rectpropertyui.ui
+++ b/kpresenter/rectpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -111,13 +111,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>16</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>16</width>
                             <height>32767</height>
@@ -142,7 +142,7 @@
             <property name="name">
                 <cstring>rectPreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>100</height>
diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui
index 3f6044903..ea998478b 100644
--- a/kpresenter/rotationpropertyui.ui
+++ b/kpresenter/rotationpropertyui.ui
@@ -50,7 +50,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -100,7 +100,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -113,7 +113,7 @@
             <property name="name">
                 <cstring>previewPanel</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>160</width>
                     <height>160</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui
index 9434c919d..44fc0e02f 100644
--- a/kpresenter/shadowdialog.ui
+++ b/kpresenter/shadowdialog.ui
@@ -336,7 +336,7 @@
                     <property name="name">
                         <cstring>previewPanel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>160</width>
                             <height>160</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui
index b97746396..2314d8b98 100644
--- a/kpresenter/slidetransitionwidget.ui
+++ b/kpresenter/slidetransitionwidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout39</cstring>
+                <cstring>tqlayout39</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>240</width>
                             <height>180</height>
@@ -67,7 +67,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -75,7 +75,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -147,7 +147,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -276,7 +276,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>29</height>
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 3c43a860c..31059876d 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -22,7 +22,7 @@ and the source code itself.</p>
 
 <h2>Document/View Architecture</h2>
 
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>MVC (Model/View/Controller) means that the application consists of three
 big parts, the <i>Model</i> which holds the data structure and objects,
@@ -49,7 +49,7 @@ to some extent he can take most part of the KSpread back-end and glue a new
 user interface around the code.</p>
 
 <h2>Dependency Handling</h2>
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>When a cell holds a formula, then it is likely that it depends on other
 cell(s) for calculating the result. For example, if cell A11 has the formula
@@ -181,7 +181,7 @@ and the dependency manager will do the rest. In addition, this gives us
 recursive dependency calculation at almost no cost.</p>
 
 <h2>Manipulators</h2>
-<p>Status: PLANNED.</p>
+<p>tqStatus: PLANNED.</p>
 
 <p>Currently, every operation on a cell or on a range of cells is quite complex.
 You need to ensure correct repainting, recalculation, iterate on a range and so on.</p>
@@ -218,7 +218,7 @@ below.</p>
 accomplish this.</p>
 
 <h2>Selection handling</h2>
-<p>Status: PLANNED</p>
+<p>tqStatus: PLANNED</p>
 
 <p>The selection shall be an instance of some RangeList class,
 or however we want to call it - this will contain a list of
@@ -227,7 +227,7 @@ more entries. This will allow easy implementation of CTRL-selections and so,
 because thanks to manipulators, each operation will automatically support these.</p>
 
 <h2>Repaint Triggering</h2>
-<p>Status: PLANNED</p>
+<p>tqStatus: PLANNED</p>
 
 <p>As mentioned above, the interface between the core and the GUI needs to be kept
 at minimum. Also, the number of repaints needs to be as low as possible, and repaints
@@ -255,7 +255,7 @@ the manipulators that derive from it, so that it knows whether it changed
 cell's content or formatting.</p>
 
 <h2>Formula Engine</h2>
-<p>Status: FINISHED.</p>
+<p>tqStatus: FINISHED.</p>
 
 <p>This formula engine is just an expression evaluator. To offer better
 performance, the expression is first compiled into byte codes which will
@@ -472,7 +472,7 @@ token right before the percent. If yes, then the following code is generated:
 
 <h2>Value</h2>
 
-<p>Status: FINISHED.<br>
+<p>tqStatus: FINISHED.<br>
 </p>
 
 <p>to be written.</p>
@@ -480,7 +480,7 @@ token right before the percent. If yes, then the following code is generated:
 <h2>Commands Based on KCommand<br>
 </h2>
 
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>Until lately, to implement undo and redo, KSpread creates corresponding
 KSpreadUndo classes for each action and runs them when the user undoes
@@ -492,15 +492,15 @@ hence we should be able to undo/redo every operation (provided that the
 corresponding manipulator provides methods to store/recall the undo information).</p>
 
 <h2>Cell Storage</h2>
-<p>Status: PLANNED.</p>
+<p>tqStatus: PLANNED.</p>
 
 <p>Cells are grouped together, and then hashed.</p>
 
 <h2>Format Storage</h2>
-<p>Status: PLANNED.</p>
+<p>tqStatus: PLANNED.</p>
 
 <p>Formatting specifies how a cell should look like. It involves font
-attributes like bold or italics, vertical and horizontal alignment,
+attributes like bold or italics, vertical and horizontal tqalignment,
 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>
@@ -589,7 +589,7 @@ be in more than one leaf in the quad-tree. <i>Details on the possible use of
 quad-tree or other methods should be explored further more</i>.</p>
 
 <h2>Default Toolbars</h2>
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -652,7 +652,7 @@ Borders, Background, Foreground</li>
 </ul>
 
 <h2>Test Framework</h2>
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>Relevant mailing-list threads:</p>
 
@@ -704,7 +704,7 @@ test cases.</p>
 </p>
 
 <h2>Coding Style</h2>
-<p>Status: IN PROGRESS.</p>
+<p>tqStatus: IN PROGRESS.</p>
 
 <p>(to be written in details).</p>
 
diff --git a/kspread/KSpreadColumnIface.cc b/kspread/KSpreadColumnIface.cc
index b7686b2f9..c0fc813f4 100644
--- a/kspread/KSpreadColumnIface.cc
+++ b/kspread/KSpreadColumnIface.cc
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "kspread_format.h"
 #include "KSpreadLayoutIface.h"
diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc
index 8099df6f9..1ca174cfe 100644
--- a/kspread/KSpreadLayoutIface.cc
+++ b/kspread/KSpreadLayoutIface.cc
@@ -21,54 +21,54 @@
 */
 
 #include "KSpreadLayoutIface.h"
-#include <brush.h>
+#include <tqbrush.h>
 #include "kspread_format.h"
 
 using namespace KSpread;
 
 LayoutIface::LayoutIface(Format *_layout)
 {
-    layout=_layout;
+    tqlayout=_layout;
 }
 
 void LayoutIface::setBgColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setBgColor(c);
+    tqlayout->setBgColor(c);
 }
 
 void LayoutIface::setBgColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setBgColor(c);
+    tqlayout->setBgColor(c);
 }
 
 
 void LayoutIface::setTextColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setTextColor(c);
+    tqlayout->setTextColor(c);
 }
 
 void LayoutIface::setTextColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setTextColor(c);
+    tqlayout->setTextColor(c);
 }
 
 void LayoutIface::setAngle(int angle)
 {
-    layout->setAngle(angle);
+    tqlayout->setAngle(angle);
 }
 
 void LayoutIface::setVerticalText(bool _vertical)
 {
-    layout->setVerticalText(_vertical);
+    tqlayout->setVerticalText(_vertical);
 }
 
 void LayoutIface::setMultiRow(bool _multi)
 {
-    layout->setMultiRow( _multi );
+    tqlayout->setMultiRow( _multi );
 }
 
 void LayoutIface::setAlign( const TQString& _Align )
@@ -82,7 +82,7 @@ void LayoutIface::setAlign( const TQString& _Align )
         Align=Format::Center;
     else
         Align=Format::Undefined;
-    layout->setAlign( Align);
+    tqlayout->setAlign( Align);
 }
 
 void LayoutIface::setAlignY( const TQString& _AlignY )
@@ -96,23 +96,23 @@ void LayoutIface::setAlignY( const TQString& _AlignY )
         AlignY=Format::Bottom;
     else
         AlignY=Format::Middle;
-    layout->setAlignY( AlignY);
+    tqlayout->setAlignY( AlignY);
 }
 
 void LayoutIface::setPostfix(const TQString &_postfix)
 {
-    layout->setPostfix( _postfix );
+    tqlayout->setPostfix( _postfix );
 }
 
 void LayoutIface::setPrefix(const TQString &_prefix)
 {
-    layout->setPrefix( _prefix );
+    tqlayout->setPrefix( _prefix );
 }
 
 void LayoutIface::setFormatType(const TQString &_formatType)
 {
     FormatType format;
-    layout->setPrecision(2);
+    tqlayout->setPrecision(2);
     if (_formatType=="Generic")
         format = Generic_format;
     else if(_formatType=="Number")
@@ -151,43 +151,43 @@ void LayoutIface::setFormatType(const TQString &_formatType)
         format=fraction_three_digits;
     else
         format=Generic_format;
-    layout->setFormatType( format);
+    tqlayout->setFormatType( format);
 }
 
 
 void LayoutIface::setPrecision(int _p)
 {
-    layout->setPrecision( _p );
+    tqlayout->setPrecision( _p );
 }
 
 void LayoutIface::setTextFontBold(bool _b)
 {
-    layout->setTextFontBold( _b );
+    tqlayout->setTextFontBold( _b );
 }
 
 void LayoutIface::setTextFontItalic(bool _b)
 {
-    layout->setTextFontItalic( _b );
+    tqlayout->setTextFontItalic( _b );
 }
 
 void LayoutIface::setTextFontUnderline(bool _b)
 {
-    layout->setTextFontUnderline( _b );
+    tqlayout->setTextFontUnderline( _b );
 }
 
 void LayoutIface::setTextFontStrike(bool _b)
 {
-    layout->setTextFontStrike( _b );
+    tqlayout->setTextFontStrike( _b );
 }
 
 void LayoutIface::setTextFontSize( int _size )
 {
-    layout->setTextFontSize( _size );
+    tqlayout->setTextFontSize( _size );
 }
 
 void LayoutIface::setTextFontFamily( const TQString& _font )
 {
-    layout->setTextFontFamily( _font );
+    tqlayout->setTextFontFamily( _font );
 }
 
 
@@ -195,34 +195,34 @@ void LayoutIface::setTextFontFamily( const TQString& _font )
 void LayoutIface::setLeftBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setLeftBorderStyle(Qt::DotLine);
+        tqlayout->setLeftBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setLeftBorderStyle(Qt::DashLine);
+        tqlayout->setLeftBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setLeftBorderStyle(Qt::DashDotLine);
+        tqlayout->setLeftBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setLeftBorderStyle(Qt::DashDotDotLine);
+        tqlayout->setLeftBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setLeftBorderStyle(Qt::SolidLine);
+        tqlayout->setLeftBorderStyle(Qt::SolidLine);
     else
-        layout->setLeftBorderStyle(Qt::SolidLine);
+        tqlayout->setLeftBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setLeftBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setLeftBorderColor(c );
+    tqlayout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setLeftBorderColor(c );
+    tqlayout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderWidth( int _size )
 {
-    layout->setLeftBorderWidth( _size );
+    tqlayout->setLeftBorderWidth( _size );
 }
 
 
@@ -230,34 +230,34 @@ void LayoutIface::setLeftBorderWidth( int _size )
 void LayoutIface::setRightBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setRightBorderStyle(Qt::DotLine);
+        tqlayout->setRightBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setRightBorderStyle(Qt::DashLine);
+        tqlayout->setRightBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setRightBorderStyle(Qt::DashDotLine);
+        tqlayout->setRightBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setRightBorderStyle(Qt::DashDotDotLine);
+        tqlayout->setRightBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setRightBorderStyle(Qt::SolidLine);
+        tqlayout->setRightBorderStyle(Qt::SolidLine);
     else
-        layout->setRightBorderStyle(Qt::SolidLine);
+        tqlayout->setRightBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setRightBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setRightBorderColor(c );
+    tqlayout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setRightBorderColor(c );
+    tqlayout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderWidth( int _size )
 {
-    layout->setRightBorderWidth( _size );
+    tqlayout->setRightBorderWidth( _size );
 }
 
 
@@ -265,34 +265,34 @@ void LayoutIface::setRightBorderWidth( int _size )
 void LayoutIface::setTopBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setTopBorderStyle(Qt::DotLine);
+        tqlayout->setTopBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setTopBorderStyle(Qt::DashLine);
+        tqlayout->setTopBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setTopBorderStyle(Qt::DashDotLine);
+        tqlayout->setTopBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setTopBorderStyle(Qt::DashDotDotLine);
+        tqlayout->setTopBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setTopBorderStyle(Qt::SolidLine);
+        tqlayout->setTopBorderStyle(Qt::SolidLine);
     else
-        layout->setTopBorderStyle(Qt::SolidLine);
+        tqlayout->setTopBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setTopBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setTopBorderColor(c );
+    tqlayout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setTopBorderColor(c );
+    tqlayout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderWidth( int _size )
 {
-    layout->setTopBorderWidth( _size );
+    tqlayout->setTopBorderWidth( _size );
 }
 
 
@@ -300,33 +300,33 @@ void LayoutIface::setTopBorderWidth( int _size )
 void LayoutIface::setBottomBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setBottomBorderStyle(Qt::DotLine);
+        tqlayout->setBottomBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setBottomBorderStyle(Qt::DashLine);
+        tqlayout->setBottomBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setBottomBorderStyle(Qt::DashDotLine);
+        tqlayout->setBottomBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setBottomBorderStyle(Qt::DashDotDotLine);
+        tqlayout->setBottomBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setBottomBorderStyle(Qt::SolidLine);
+        tqlayout->setBottomBorderStyle(Qt::SolidLine);
     else
-        layout->setBottomBorderStyle(Qt::SolidLine);
+        tqlayout->setBottomBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setBottomBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setBottomBorderColor(c );
+    tqlayout->setBottomBorderColor(c );
 }
 void LayoutIface::setBottomBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setBottomBorderColor(c );
+    tqlayout->setBottomBorderColor(c );
 }
 
 void LayoutIface::setBottomBorderWidth( int _size )
 {
-    layout->setBottomBorderWidth( _size );
+    tqlayout->setBottomBorderWidth( _size );
 }
 
 
@@ -334,33 +334,33 @@ void LayoutIface::setBottomBorderWidth( int _size )
 void LayoutIface::setFallDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setFallDiagonalStyle(Qt::DotLine);
+        tqlayout->setFallDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setFallDiagonalStyle(Qt::DashLine);
+        tqlayout->setFallDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setFallDiagonalStyle(Qt::DashDotLine);
+        tqlayout->setFallDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setFallDiagonalStyle(Qt::DashDotDotLine);
+        tqlayout->setFallDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setFallDiagonalStyle(Qt::SolidLine);
+        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
     else
-        layout->setFallDiagonalStyle(Qt::SolidLine);
+        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setFallDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setFallDiagonalColor(c );
+    tqlayout->setFallDiagonalColor(c );
 }
 void LayoutIface::setFallDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setFallDiagonalColor(c );
+    tqlayout->setFallDiagonalColor(c );
 }
 
 void LayoutIface::setFallDiagonalWidth( int _size )
 {
-    layout->setFallDiagonalWidth( _size );
+    tqlayout->setFallDiagonalWidth( _size );
 }
 
 
@@ -369,47 +369,47 @@ void LayoutIface::setFallDiagonalWidth( int _size )
 void LayoutIface::setGoUpDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        layout->setGoUpDiagonalStyle(Qt::DotLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        layout->setGoUpDiagonalStyle(Qt::DashLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        layout->setGoUpDiagonalStyle(Qt::DashDotLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        layout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        layout->setGoUpDiagonalStyle(Qt::SolidLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
     else
-        layout->setGoUpDiagonalStyle(Qt::SolidLine);
+        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setGoUpDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    layout->setGoUpDiagonalColor(c );
+    tqlayout->setGoUpDiagonalColor(c );
 }
 void LayoutIface::setGoUpDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    layout->setGoUpDiagonalColor(c );
+    tqlayout->setGoUpDiagonalColor(c );
 }
 
 void LayoutIface::setGoUpDiagonalWidth( int _size )
 {
-    layout->setGoUpDiagonalWidth( _size );
+    tqlayout->setGoUpDiagonalWidth( _size );
 }
 
 
 void LayoutIface::setIndent( double indent )
 {
     if( indent >= 0.0 )
-        layout->setIndent( indent );
+        tqlayout->setIndent( indent );
     else
-        layout->setIndent( 0.0 );
+        tqlayout->setIndent( 0.0 );
 }
 
 
 void LayoutIface::setDontPrintText ( bool _print)
 {
-    layout->setDontPrintText ( _print);
+    tqlayout->setDontPrintText ( _print);
 }
 
diff --git a/kspread/KSpreadLayoutIface.h b/kspread/KSpreadLayoutIface.h
index 84de8ac4d..c4231032d 100644
--- a/kspread/KSpreadLayoutIface.h
+++ b/kspread/KSpreadLayoutIface.h
@@ -95,7 +95,7 @@ k_dcop:
     //don't print text
     virtual void setDontPrintText ( bool _b);
 private:
-    Format *layout;
+    Format *tqlayout;
 };
 
 } //namespace KSpread
diff --git a/kspread/KSpreadRowIface.cc b/kspread/KSpreadRowIface.cc
index 826e49e58..69db292f6 100644
--- a/kspread/KSpreadRowIface.cc
+++ b/kspread/KSpreadRowIface.cc
@@ -22,7 +22,7 @@
 #include "KSpreadLayoutIface.h"
 #include "KSpreadRowIface.h"
 #include "kspread_format.h"
-#include <brush.h>
+#include <tqbrush.h>
 
 using namespace KSpread;
 
diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt
index bf0feb94b..2eb878c8a 100644
--- a/kspread/OASIS.txt
+++ b/kspread/OASIS.txt
@@ -51,7 +51,7 @@ Document/Workbook
    [x] Active sheet
    [x] Header
    [x] Footer
-   [x] Page layout
+   [x] Page tqlayout
    [x] Protection status
    [x] Print range
    [x] Print setup
@@ -155,29 +155,29 @@ Merged cells
      </table:table-cell>
      <table:covered-table-cell table:style-name="ce3"/>
 
-Cell horizontal alignment: top
+Cell horizontal tqalignment: 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 alignment: middle
+Cell horizontal tqalignment: 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 alignment: bottom
+Cell horizontal tqalignment: 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 alignment: top
+Cell vertical tqalignment: 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 alignment: middle
+Cell vertical tqalignment: 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 alignment: middle
     </style:style>
 
 
-Cell vertical alignment: bottom
+Cell vertical tqalignment: 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 490bee81b..a4788bdab 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").arg( rangeName );
+    return i18n("Merge Cells %1").tqarg( rangeName );
 }
 
 void MergeCellCommand::execute()
@@ -174,7 +174,7 @@ void HideSheetCommand::unexecute()
 
 TQString HideSheetCommand::name() const
 {
-    TQString n = TQString( i18n("Hide Sheet %1") ).arg( sheetName );
+    TQString n = TQString( i18n("Hide Sheet %1") ).tqarg( 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") ).arg( sheetName );
+    TQString n = TQString( i18n("Show Sheet %1") ).tqarg( sheetName );
     if( n.length() > 64 ) n = i18n("Show Sheet");
     return n;
 }
@@ -590,37 +590,37 @@ ChangeObjectGeometryCommand::~ChangeObjectGeometryCommand()
 
 void ChangeObjectGeometryCommand::execute()
 {
-    doc->repaint( obj->geometry() );
+    doc->tqrepaint( obj->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 );
+    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 );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-    doc->repaint( obj );
+    doc->tqrepaint( obj );
 }
 
 void ChangeObjectGeometryCommand::unexecute()
 {
-  doc->repaint( obj->geometry() );
+  doc->tqrepaint( obj->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 );
+  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 );
 
 //     if ( object->isSelected())
 //       doc->updateObjectStatusBarItem();
-  doc->repaint( obj );
+  doc->tqrepaint( obj );
 }
 
 TQString ChangeObjectGeometryCommand::name() const
 {
-  /*if ( fabs( obj->geometry().width() - newGeometry.width() )<1e-3  && fabs( obj->geometry().height() - newGeometry.height() ) < 1e-3 )
+  /*if ( fabs( obj->tqgeometry().width() - newGeometry.width() )<1e-3  && fabs( obj->tqgeometry().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->repaint( obj );
+  doc->tqrepaint( obj );
   executed = true;
 }
 
@@ -677,7 +677,7 @@ void RemoveObjectCommand::unexecute()
     EmbeddedKOfficeObject *eko = dynamic_cast<EmbeddedKOfficeObject *>(obj);
     eko->embeddedObject()->setDeleted(false);
   }
-  doc->repaint( obj );
+  doc->tqrepaint( obj );
   executed = false;
 }
 
@@ -689,18 +689,18 @@ TQString RemoveObjectCommand::name() const
     return i18n("Remove Object");
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
+InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
 {
-  geometry = _geometry;
+  tqgeometry = _tqgeometry;
   entry = _entry;
   canvas = _canvas;
   type = OBJECT_KOFFICE_PART;
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
+InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
 {
-  geometry = _geometry;
+  tqgeometry = _tqgeometry;
   entry = _entry;
   data = _data;
   canvas = _canvas;
@@ -708,10 +708,10 @@ InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntr
   obj = 0;
 }
 
-InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry , KURL& _file, Canvas *_canvas ) //picture
+InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry , KURL& _file, Canvas *_canvas ) //picture
 {
   //In the case of pictures, only the top left point of the rectangle is relevant
-  geometry = _geometry;
+  tqgeometry = _tqgeometry;
   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()->repaint( obj );
+    canvas->doc()->tqrepaint( obj );
   }
   else
   {
@@ -746,17 +746,17 @@ void InsertObjectCommand::execute()
     {
       case OBJECT_CHART:
       {
-        success = canvas->activeSheet()->insertChart( geometry, entry, data );
+        success = canvas->activeSheet()->insertChart( tqgeometry, entry, data );
         break;
       }
       case OBJECT_KOFFICE_PART:
       {
-        success = canvas->activeSheet()->insertChild( geometry, entry );
+        success = canvas->activeSheet()->insertChild( tqgeometry, entry );
         break;
       }
       case OBJECT_PICTURE:
       {
-        success = canvas->activeSheet()->insertPicture( geometry.topLeft() , file );
+        success = canvas->activeSheet()->insertPicture( tqgeometry.topLeft() , file );
         break;
       }
       default:
@@ -780,7 +780,7 @@ void InsertObjectCommand::unexecute()
 
   canvas->doc()->embeddedObjects().removeRef( obj );
   obj->setSelected( false );
-  canvas->doc()->repaint( obj );
+  canvas->doc()->tqrepaint( obj );
 
   executed = false;
 }
@@ -871,7 +871,7 @@ void GeometryPropertiesCommand::execute()
         {
             it.current()->setProtect( m_newValue );
             if ( it.current()->isSelected() )
-                m_doc->repaint( it.current() );
+                m_doc->tqrepaint( 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->repaint( obj );
+                m_doc->tqrepaint( 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->repaint( objects.at( i )->geometry() );
+        doc->tqrepaint( objects.at( i )->tqgeometry() );
 
-        KoRect r = objects.at( i )->geometry();
+        KoRect r = objects.at( i )->tqgeometry();
         r.moveBy( diff.x(), diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( objects.at( i ) );
     }
 }
 
@@ -935,12 +935,12 @@ void MoveObjectByCmd::unexecute()
     TQRect oldRect;
 
     for ( unsigned int i = 0; i < objects.count(); i++ ) {
-        doc->repaint( objects.at( i )->geometry() );
+        doc->tqrepaint( objects.at( i )->tqgeometry() );
 
-        KoRect r = objects.at( i )->geometry();
+        KoRect r = objects.at( i )->tqgeometry();
         r.moveBy( -diff.x(), -diff.y() );
         objects.at( i )->setGeometry( r );
 
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( objects.at( i ) );
     }
 }
diff --git a/kspread/commands.h b/kspread/commands.h
index b3622035e..d0bd91328 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& _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( 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();
 
     virtual void execute();
@@ -402,7 +402,7 @@ class InsertObjectCommand : public KCommand
     virtual TQString name() const;
 
   protected:
-    KoRect geometry;
+    KoRect tqgeometry;
     Canvas *canvas;
     bool executed;
     KoDocumentEntry entry;
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 095f11887..6e7f7403c 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -22,7 +22,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -168,7 +168,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -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="alignment">
+                    <property name="tqalignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index 5dc3f83df..7c97f6c22 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kbuttonbox.h>
@@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker)
   lay->addWidget( m_pAngle );
 
   TQWidget* spacer = new TQWidget( page );
-  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
+  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) );
   lay->addWidget( spacer );
 
   m_pAngle->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index 71cb2ada3..9a78074ba 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
@@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke
   lay1->addWidget( label );
 
   m_areaName = new TQLineEdit(page);
-  m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 );
+  m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 );
 
   lay1->addWidget( m_areaName );
   m_areaName->setFocus();
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 8705fc5a1..9ed3c5512 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -23,7 +23,7 @@
 
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kbuttonbox.h>
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 83f37b2f6..531f2ee3d 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -43,7 +43,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace KSpread;
 
@@ -54,10 +54,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" );
   groupBox1_3->setColumnLayout(0, Qt::Vertical );
-  groupBox1_3->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_3->layout()->setMargin( KDialog::marginHint() );
-  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() );
-  groupBox1_3Layout->setAlignment( TQt::AlignTop );
+  groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() );
+  TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() );
+  groupBox1_3Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" );
   groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 );
@@ -89,11 +89,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" );
   groupBox1_2->setColumnLayout(0, Qt::Vertical );
-  groupBox1_2->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_2->layout()->setMargin( KDialog::marginHint() );
+  groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() );
-  groupBox1_2Layout->setAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() );
+  groupBox1_2Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" );
   groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 );
@@ -125,11 +125,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
 
   TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" );
   groupBox1_1->setColumnLayout(0, Qt::Vertical );
-  groupBox1_1->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox1_1->layout()->setMargin( KDialog::marginHint() );
+  groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() );
-  groupBox1_1Layout->setAlignment( TQt::AlignTop );
+  TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() );
+  groupBox1_1Layout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" );
   groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 );
@@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags
   groupBox1_1Layout->addItem( spacer_6, 1, 3 );
 
   Form1Layout->addWidget( groupBox1_1, 0, 0 );
-  resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) );
+  resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) );
   clearWState( WState_Polished );
 
   TQStringList list;
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index 7d63a668a..91589f9f1 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
@@ -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" ).arg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( 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" ).arg( *( r.begin() ) ));
+    KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( 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" ).arg( r[i]));
+      KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( 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").arg( *( r.begin() ) ).arg( r[i] );
+      TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( 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").arg( txt ));
+    KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt ));
     return;
   }
 
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index 7008de4eb..c8ce26715 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_targetRect.setBottom( lastCell->row() );
 
   m_sheet = new TQTable( page, "m_table" );
-  //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
+  //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
   m_sheet->setNumRows( 0 );
   m_sheet->setNumCols( 0 );
 
@@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   // Delimiter: comma, semicolon, tab, space, other
   m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" );
-  m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
   m_delimiterBox->setTitle( i18n( "Delimiter" ) );
   m_delimiterBox->setColumnLayout(0, Qt::Vertical );
-  m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() );
-  m_delimiterBox->layout()->setMargin( KDialog::marginHint() );
-  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() );
-  m_delimiterBoxLayout->setAlignment( TQt::AlignTop );
+  m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() );
+  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() );
+  m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 );
 
   m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" );
@@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 );
 
   m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" );
-  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
   m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
   m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 );
 
 
   // Format: number, text, currency,
   m_formatBox = new TQButtonGroup( page, "m_formatBox" );
-  m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
+  m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
   m_formatBox->setTitle( i18n( "Format" ) );
   m_formatBox->setColumnLayout(0, Qt::Vertical );
-  m_formatBox->layout()->setSpacing( KDialog::spacingHint() );
-  m_formatBox->layout()->setMargin( KDialog::marginHint() );
-  m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() );
-  m_formatBoxLayout->setAlignment( TQt::AlignTop );
+  m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_formatBox->tqlayout()->setMargin( KDialog::marginHint() );
+  m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() );
+  m_formatBoxLayout->tqsetAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 );
 
   m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" );
@@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" );
   m_comboLine->insertItem( i18n( "1" ) );
-  m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
+  m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboLine, 1, 3 );
 
@@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_comboQuote->insertItem( i18n( "\"" ) );
   m_comboQuote->insertItem( i18n( "'" ) );
   m_comboQuote->insertItem( i18n( "None" ) );
-  m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
+  m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboQuote, 1, 2 );
   TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
   MyDialogLayout->addItem( spacer_2, 2, 3 );
 
   TextLabel3 = new TQLabel( page, "TextLabel3" );
-  TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
+  TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
   TextLabel3->setText( i18n( "Start at line:" ) );
 
   MyDialogLayout->addWidget( TextLabel3, 0, 3 );
 
   TextLabel2 = new TQLabel( page, "TextLabel2" );
-  TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
+  TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
   TextLabel2->setText( i18n( "Textquote:" ) );
 
   MyDialogLayout->addWidget( TextLabel2, 0, 2 );
@@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   if ( m_mode == Clipboard )
   {
     setCaption( i18n( "Inserting From Clipboard" ) );
-    TQMimeSource * mime = TQApplication::clipboard()->data();
+    TQMimeSource * mime = TQApplication::tqclipboard()->data();
     if ( !mime )
     {
       KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_cancelled = true;
       return;
     }
-    m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
+    m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {
@@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   fillSheet();
   fillComboBox();
 
-  resize(sizeHint());
+  resize(tqsizeHint());
 
   m_sheet->setSelectionMode(TQTable::NoSelection);
 
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 4c1a5bcff..7cf242a91 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -48,7 +48,7 @@
 #include <tqsqlfield.h>
 #include <tqsqlquery.h>
 #include <tqsqlrecord.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -139,16 +139,16 @@ 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_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" );
+  m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) );
+  m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) );
+  m_databasetqStatus->setText( " " );
+  Frame5Layout->addWidget( m_databasetqStatus );
 
   m_databaseLayout->addWidget( Frame5, 0, 1 );
 
   TQFrame * Frame17 = new TQFrame( m_database, "Frame17" );
-  Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
+  Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) );
   Frame17->setMinimumSize( TQSize( 111, 0 ) );
   Frame17->setFrameShape( TQFrame::NoFrame );
   Frame17->setFrameShadow( TQFrame::Plain );
@@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2Layout->addLayout( Layout21, 0, 0 );
 
-  m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" );
-  m_sheetStatus->setText( " " );
-  Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 );
+  m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" );
+  m_sheettqStatus->setText( " " );
+  Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 );
 
   m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" );
   m_SelectSheetLabel->setText( i18n( "Select tables:" ) );
@@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_sheetLayout->addWidget( Frame5_2, 0, 1 );
 
   TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" );
-  Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
+  Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) );
   Frame17_2->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_2->setFrameShape( TQFrame::NoFrame );
   Frame17_2->setFrameShadow( TQFrame::Plain );
@@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
 
   Frame5_2_2Layout->addWidget( m_columnView, 1, 0 );
 
-  m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
-  m_columnsStatus->setText( " " );
-  Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 );
+  m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" );
+  m_columnstqStatus->setText( " " );
+  Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 );
 
   m_columnsLayout->addWidget( Frame5_2_2, 0, 1 );
 
   TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" );
-  Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
+  Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) );
   Frame17_3->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_3->setFrameShape( TQFrame::NoFrame );
   Frame17_3->setFrameShadow( TQFrame::Plain );
@@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_optionsLayout->addWidget( optionsFrame, 0, 1 );
 
   TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" );
-  Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
+  Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) );
   Frame17_4->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_4->setFrameShape( TQFrame::NoFrame );
   Frame17_4->setFrameShadow( TQFrame::Plain );
@@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char *
   m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 );
 
   TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" );
-  Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
+  Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) );
   Frame17_5->setMinimumSize( TQSize( 111, 0 ) );
   Frame17_5->setFrameShape( TQFrame::NoFrame );
   Frame17_5->setFrameShadow( TQFrame::Plain );
@@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext()
       m_dbConnection->setPort( port );
     }
 
-    m_databaseStatus->setText( i18n("Connecting to database...") );
+    m_databasetqStatus->setText( i18n("Connecting to database...") );
     if ( m_dbConnection->open() )
     {
-      m_databaseStatus->setText( i18n("Connected. Retrieving table information...") );
+      m_databasetqStatus->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_databasetqStatus->setText( " " );
     }
     else
     {
@@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext()
         errorMsg.append( error.databaseText() );
         errorMsg.append( "\n" );
       }
-      m_databaseStatus->setText( " " );
+      m_databasetqStatus->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_databasetqStatus->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_databasetqStatus->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 9334935c9..6e82adc30 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_databasetqStatus;
   TQLineEdit    * m_username;
   TQLineEdit    * m_port;
   TQLineEdit    * m_databaseName;
@@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard
   TQWidget      * m_sheet;
   TQComboBox    * m_databaseList;
   KPushButton  * m_connectButton;
-  TQLabel       * m_sheetStatus;
+  TQLabel       * m_sheettqStatus;
   TQLabel       * m_SelectSheetLabel;
   KListView    * m_sheetView;
   TQWidget      * m_columns;
   KListView    * m_columnView;
-  TQLabel       * m_columnsStatus;
+  TQLabel       * m_columnstqStatus;
   TQWidget      * m_options;
   TQComboBox    * m_columns_1;
   TQComboBox    * m_columns_2;
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index 75330563d..d63bfd690 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -20,7 +20,7 @@
 
 #include "kspread_dlg_find.h"
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
@@ -30,17 +30,17 @@ using namespace KSpread;
 
 FindOption::FindOption( TQWidget *parent)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(parent);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
     m_moreOptions = new TQPushButton( i18n( "More Options" ), parent );
-    layout->addWidget(  m_moreOptions );
+    tqlayout->addWidget(  m_moreOptions );
 
     connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) );
 
     m_findExtension = new TQWidget( parent );
-    layout->addWidget( m_findExtension );
-    TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension );
+    tqlayout->addWidget( m_findExtension );
+    TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension );
     m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension );
-    layout1->addWidget( m_searchInAllSheet );
+    tqlayout1->addWidget( m_searchInAllSheet );
 
     TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension );
     TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension );
@@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchIn = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchIn );
-    layout1->addLayout( comboLayout );
+    tqlayout1->addLayout( comboLayout );
 
     TQStringList lst;
     lst << i18n( "Cell Values" );
@@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent)
 
     m_searchDirection = new TQComboBox( m_findExtension );
     comboLayout->addWidget( m_searchDirection );
-    layout1->addLayout( comboLayout );
+    tqlayout1->addLayout( comboLayout );
 
     lst.clear();
     lst << i18n( "Across then Down" );
@@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 FindDlg::~FindDlg()
@@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS
 {
     m_findOptions = new FindOption( findExtension() );
     connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) );
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
 }
 
 SearchDlg::~SearchDlg()
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index efb00f636..6374c1020 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -25,7 +25,7 @@
 
 #include <tqcombobox.h>
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index )
     if ( img.isEmpty() )
     {
 	TQString str( i18n( "Could not find image %1." ) );
-	str = str.arg( m_entries[ index ].image );
+	str = str.tqarg( 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.arg( img );
+	str = str.tqarg( 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.arg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.tqarg( 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.arg( m_entries[ m_combo->currentItem() ].xml );
+	str = str.tqarg( m_entries[ m_combo->currentItem() ].xml );
 	KMessageBox::error( this, str );
 	return;
     }
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index a63ff039e..62e637f51 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqtabwidget.h>
 
 #include "kspread_dlg_formula.h"
@@ -49,7 +49,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace KSpread;
 
@@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     searchFunct = new KLineEdit(page);
     TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-    searchFunct->setSizePolicy( sp3 );
+    searchFunct->tqsetSizePolicy( sp3 );
 
     grid1->addWidget( searchFunct, 0, 0 );
 
@@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     functions = new TQListBox(page);
     TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-    functions->setSizePolicy( sp1 );
+    functions->tqsetSizePolicy( sp1 );
     grid1->addWidget( functions, 2, 0 );
 
     selectFunction = new TQPushButton( page );
@@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     m_tabwidget = new TQTabWidget( page );
     TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-    m_tabwidget->setSizePolicy( sp2 );
+    m_tabwidget->tqsetSizePolicy( sp2 );
     grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 );
 
     m_browser = new TQTextBrowser( m_tabwidget );
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 44af6b68d..8902cf6cb 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -44,7 +44,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
@@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent,  TQPoint const & marker,
 
   m_resultText = new TQLabel( m_resultFrame, "m_resultText" );
   m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" );
-  m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
   m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 );
 
@@ -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:" ).arg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( 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." ).arg( m_sourceEdit->text() ) );
+    m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( 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_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc
index 83ae08bdb..2d9935ac2 100644
--- a/kspread/dialogs/kspread_dlg_goto.cc
+++ b/kspread/dialogs/kspread_dlg_goto.cc
@@ -23,7 +23,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index f7b0ce446..8cd3f89f9 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kbuttonbox.h>
 #include <kdebug.h>
@@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->layout();
+  grp->tqlayout();
   lay1->addWidget(grp);
   if( insRem==Insert)
   {
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 2bac06367..53942457b 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqfontdatabase.h>
 #include <tqradiobutton.h>
@@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * )
 {
     penStyle = Qt::NoPen;
     penWidth = 1;
-    penColor = colorGroup().text();
+    penColor = tqcolorGroup().text();
     selected = false;
     undefined = false;
 }
@@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle
     penStyle = _style;
     penColor = _color;
     penWidth = _width;
-    repaint();
+    tqrepaint();
 }
 
 void PatternSelect::setUndefined()
@@ -127,7 +127,7 @@ void PatternSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    repaint();
+    tqrepaint();
 }
 
 void PatternSelect::slotSelect()
@@ -136,7 +136,7 @@ void PatternSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    repaint();
+    tqrepaint();
 }
 
 
@@ -151,16 +151,16 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
   : TQWidget( parent ),
     m_dlg( dlg )
 {
-  TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout");
+  TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout");
 
   TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->setTitle( i18n( "Style" ) );
-  groupBox->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox->layout()->setMargin( KDialog::marginHint() );
+  groupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  groupBox->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
-  groupBoxLayout->setAlignment( TQt::AlignTop );
+  TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
+  groupBoxLayout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * label1 = new TQLabel( groupBox, "label1" );
   label1->setText( i18n( "Name:" ) );
@@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  layout->addWidget( groupBox, 0, 0 );
-  layout->addItem( spacer, 1, 0 );
+  tqlayout->addWidget( groupBox, 0, 0 );
+  tqlayout->addItem( spacer, 1, 0 );
 
   if ( m_dlg->getStyle()->type() == Style::BUILTIN )
   {
@@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg )
     m_parentBox->setEnabled( false );
   }
 
-  resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) );
+  resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) );
 }
 
 GeneralTab::~GeneralTab()
@@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName )
     {
       KMessageBox::sorry( this,
                           i18n( "The style cannot inherit from '%1' because of recursive references." )
-                          .arg( m_parentBox->currentText() ) );
+                          .tqarg( m_parentBox->currentText() ) );
       return false;
     }
 
@@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y)
 
 void CellFormatDialog::init()
 {
-  TQColorGroup colorGroup = TQApplication::palette().active();
+  TQColorGroup tqcolorGroup = TQApplication::tqpalette().active();
 
   // Did we initialize the bitmaps ?
   if ( formatOnlyNegSignedPixmap == 0L )
   {
-    TQColor black = colorGroup.text(); // not necessarily black :)
+    TQColor black = tqcolorGroup.text(); // not necessarily black :)
     formatOnlyNegSignedPixmap    = paintFormatPixmap( "123.456", black, "-123.456", black );
     formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red );
     formatRedNeverSignedPixmap   = paintFormatPixmap( "123.456", black, "123.456", TQt::red );
@@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC
 
   TQPainter painter;
   painter.begin( pixmap );
-  painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() );
+  painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() );
   painter.setPen( _color1 );
   painter.drawText( 2, 11, TQString(_string1) );
   painter.setPen( _color2 );
@@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
   : TQWidget ( parent ),
     dlg( _dlg )
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 );
 
     TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this);
     TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint());
@@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
     listFormat=new TQListBox(grp);
     grid->addMultiCellWidget(listFormat,2,7,1,1);
     TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) );
-    layout->addWidget(grp);
+    tqlayout->addWidget(grp);
 
     /* *** */
 
@@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d
         format->setCurrentItem( 3 );
     else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed )
         format->setCurrentItem( 4 );
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     cellFormatType=dlg->formatType;
     newFormatType = cellFormatType;
@@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init()
     TQString tmp;
     TQString tmp2;
     TQDate tmpDate( 2000,2,18);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true);
-    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true);
+    list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false);
 
     ValueFormatter *fmt = dlg->getDoc()->formatter();
 
@@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg
 
   TQStringList tmpListFont;
   TQFontDatabase *fontDataBase = new TQFontDatabase();
-  tmpListFont = fontDataBase->families();
+  tmpListFont = fontDataBase->tqfamilies();
   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" ).arg( i ) );
+        lst.append( TQString( "%1" ).tqarg( 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->repaint();
+  example_label->tqrepaint();
 }
 
 void CellFormatPageFont::setCombos()
@@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos()
  if ( dlg->bTextColor )
    textColor = dlg->textColor;
  else
-   textColor = colorGroup().text();
+   textColor = tqcolorGroup().text();
 
  if ( !textColor.isValid() )
-   textColor =colorGroup().text();
+   textColor =tqcolorGroup().text();
 
  textColorButton->setColor( textColor );
 
@@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial
     if ( dlg->isRowSelected )
         width->setEnabled(false);
 
-    defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName()));
+    defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(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)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma
+    defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma
     if ( dlg->isColumnSelected )
         defaultHeight->setEnabled(false);
 
@@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton
 {
   penStyle = Qt::NoPen;
   penWidth = 1;
-  penColor = colorGroup().text();
+  penColor = tqcolorGroup().text();
   setToggleButton( true );
   setOn( false);
   setChanged(false);
@@ -2549,7 +2549,7 @@ void BorderButton::setUndefined()
 {
  setPenStyle(Qt::SolidLine );
  setPenWidth(1);
- setColor(colorGroup().midlight());
+ setColor(tqcolorGroup().midlight());
 }
 
 
@@ -2558,7 +2558,7 @@ void BorderButton::unselect()
   setOn(false);
   setPenWidth(1);
   setPenStyle(Qt::NoPen);
-  setColor( colorGroup().text() );
+  setColor( tqcolorGroup().text() );
   setChanged(true);
 }
 
@@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev )
   TQPen pen;
   TQPainter painter;
   painter.begin( this );
-  pen=TQPen( colorGroup().midlight(),2,SolidLine);
+  pen=TQPen( tqcolorGroup().midlight(),2,SolidLine);
   painter.setPen( pen );
 
   painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY );
@@ -2678,18 +2678,18 @@ void CellFormatPageBorder::InitializeGrids()
     { {0,0}, {0,1},{0,2} };
   /***********************/
 
-  /* set up a layout box for most of the border setting buttons */
+  /* set up a tqlayout box for most of the border setting buttons */
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Border") );
-  tmpTQGroupBox->setAlignment( AlignLeft );
+  tmpTQGroupBox->tqsetAlignment( AlignLeft );
   grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint());
   int fHeight = tmpTQGroupBox->fontMetrics().height();
   grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title
 
   area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow);
   grid2->addMultiCellWidget(area,2,4,1,3);
-  area->setBackgroundColor( colorGroup().base() );
+  area->setBackgroundColor( tqcolorGroup().base() );
 
   /* initailize the buttons that are in this box */
   for (int i=BorderType_Top; i < BorderType_END; i++)
@@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preselect") );
-  tmpTQGroupBox->setAlignment( AlignLeft );
+  tmpTQGroupBox->tqsetAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint());
 
@@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Pattern") );
-  tmpTQGroupBox->setAlignment( AlignLeft );
+  tmpTQGroupBox->tqsetAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids()
   style->insertItem(paintFormatPixmap(DashDotLine),2 );
   style->insertItem(paintFormatPixmap(DashDotDotLine),3  );
   style->insertItem(paintFormatPixmap(SolidLine),4);
-  style->setBackgroundColor( colorGroup().background() );
+  style->setBackgroundColor( tqcolorGroup().background() );
 
   grid2->addMultiCell(grid3,6,6,0,1);
   grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1);
@@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids()
   tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" );
   tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
   tmpTQGroupBox->setTitle( i18n("Preview") );
-  tmpTQGroupBox->setAlignment( AlignLeft );
+  tmpTQGroupBox->tqsetAlignment( AlignLeft );
 
   grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint());
   fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style)
   TQPixmap pixmap( style->width(), 14 );
   TQPainter painter;
   TQPen pen;
-  pen=TQPen( colorGroup().text(),1,_style);
+  pen=TQPen( tqcolorGroup().text(),1,_style);
   painter.begin( &pixmap );
-  painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() );
+  painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() );
   painter.setPen( pen );
   painter.drawLine( 0, 7, style->width(), 7 );
   painter.end();
@@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p )
       vertical->setChanged(true);
     }
   }
-  area->repaint();
+  area->tqrepaint();
 }
 
 void CellFormatPageBorder::changeState( BorderButton *_p)
@@ -3240,10 +3240,10 @@ void CellFormatPageBorder::changeState( BorderButton *_p)
   {
     _p->setPenWidth(1);
     _p->setPenStyle(Qt::NoPen);
-    _p->setColor( colorGroup().text() );
+    _p->setColor( tqcolorGroup().text() );
   }
 
- area->repaint();
+ area->tqrepaint();
 }
 
 void CellFormatPageBorder::draw()
@@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     }
   }
 
-  area->repaint();
+  area->tqrepaint();
 }
 
 
@@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style )
 {
     brushStyle = _style;
     brushColor = _color;
-    repaint();
+    tqrepaint();
 }
 
 
@@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect()
 
     setLineWidth( 1 );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    repaint();
+    tqrepaint();
 }
 
 void BrushSelect::slotSelect()
@@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect()
 
     setLineWidth( 2 );
     setFrameStyle( TQFrame::Panel | TQFrame::Plain );
-    repaint();
+    tqrepaint();
 }
 
 
@@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
     tmpTQGroupBox->setTitle( i18n("Pattern") );
-    tmpTQGroupBox->setAlignment( AlignLeft );
+    tmpTQGroupBox->tqsetAlignment( AlignLeft );
 
     TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint());
     int fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     if ( dlg->bBgColor )
         bgColor = dlg->bgColor;
     else
-        bgColor = colorGroup().base();
+        bgColor = tqcolorGroup().base();
 
     if (!bgColor.isValid())
-        bgColor = colorGroup().base();
+        bgColor = tqcolorGroup().base();
 
     bgColorButton->setColor( bgColor );
     connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ),
@@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
     tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" );
     tmpTQGroupBox->setTitle( i18n("Preview") );
     tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken );
-    tmpTQGroupBox->setAlignment( AlignLeft );
+    tmpTQGroupBox->tqsetAlignment( AlignLeft );
 
     grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint());
     fHeight = tmpTQGroupBox->fontMetrics().height();
@@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog
 void CellFormatPagePattern::slotNotAnyColor()
 {
   b_notAnyColor = true;
-  bgColorButton->setColor( colorGroup().base() );
-  current->setBackgroundColor( colorGroup().base() );
+  bgColorButton->setColor( tqcolorGroup().base() );
+  current->setBackgroundColor( tqcolorGroup().base() );
 }
 
 void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color )
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index 8d38663ac..b8ec0bba8 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; repaint(); }
+    void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); }
     Qt::PenStyle getPenStyle() { return penStyle; }
-    void setColor( const TQColor &_col ) { penColor = _col; repaint(); }
+    void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); }
     const TQColor& getColor() { return penColor; }
-    void setPenWidth( int _w ) { penWidth = _w; repaint(); }
+    void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); }
     int getPenWidth() { return penWidth; }
 
     void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style );
     void setUndefined();
-    void setDefined() { undefined = FALSE; repaint(); }
+    void setDefined() { undefined = FALSE; tqrepaint(); }
 
     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; repaint(); }
+    void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); }
     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_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index cdff22f13..f4e032694 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqmultilineedit.h>
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index 6e89e2cf9..f0e6f6648 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhgroupbox.h>
 
 #include <kapplication.h>
@@ -48,11 +48,11 @@
 using namespace KSpread;
 
 PaperLayout::PaperLayout( TQWidget * parent, const char * name,
-                                        const KoPageLayout & layout,
+                                        const KoPageLayout & tqlayout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
@@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox )
     rangeGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( rangeGroup );
 
-    TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() );
+    TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() );
 
     TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup );
     grid->addWidget( pPrintRange, 0, 0 );
@@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     zoomGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( zoomGroup );
 
-    TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6,
+    TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6,
                                          KDialog::spacingHint() );
 
     m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup );
@@ -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%" ) ).arg( i ) );
+        lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) );
         if( tqRound( print->zoom() * 100 ) > i &&
             tqRound( print->zoom() * 100 ) < i + 5 )
         {
-            lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) );
+            lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) );
         }
     }
     m_cZoom->insertStringList( lst );
 
     int number_of_entries = m_cZoom->count();
-    TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) );
+    TQString string = TQString( i18n( "%1%" ) ).tqarg( 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" ).arg( i ) );
+        lstX.append( TQString( "%1" ).tqarg( i ) );
     }
     if( print->pageLimitX() > 20 )
     {
-      lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) );
+      lstX.append( TQString( "%1" ).tqarg( 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" ).arg( i ) );
+        lstY.append( TQString( "%1" ).tqarg( i ) );
     }
     if( print->pageLimitY() > 20 )
     {
-      lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) );
+      lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) );
     }
     m_cLimitPagesY->insertStringList( lstY );
 
@@ -312,7 +312,7 @@ void PaperLayout::slotOk()
     {
       SheetPrint *print = sheet->print();
 
-      KoPageLayout pl = layout();
+      KoPageLayout pl = tqlayout();
       KoHeadFoot hf = headFoot();
       KoUnit::Unit unit = sheet->doc()->unit();
       print->setPrintGrid( pPrintGrid->isChecked() );
@@ -407,7 +407,7 @@ void PaperLayout::slotOk()
       if ( m_rScalingZoom->isChecked() )
       {
         kdDebug() << "Zoom is selected" << endl;
-        if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
+        if( TQString( "%1%" ).tqarg( 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_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index 0260c1c8d..c9a9e6e5b 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia
   TQ_OBJECT
 public:
   PaperLayout( TQWidget* parent, const char* name,
-                      const KoPageLayout& layout,
+                      const KoPageLayout& tqlayout,
                       const KoHeadFoot& headfoot,
                       int tabs, KoUnit::Unit unit,
                       Sheet * sheet, View *view);
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index 8dda529ed..9b54644d3 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <tqbuttongroup.h>
@@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec
 
   TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page);
   grp->setRadioButtonExclusive( TRUE );
-  grp->layout();
+  grp->tqlayout();
   lay1->addWidget(grp);
   rb1 = new TQRadioButton( i18n("Move towards right"), grp );
   rb2 = new TQRadioButton( i18n("Move towards bottom"), grp );
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 531e62607..51ca3cdc9 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -26,7 +26,7 @@
 */
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqvgroupbox.h>
@@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig()
 
 void parameterLocale::updateToMatchLocale(KLocale* locale)
 {
-  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) ));
+  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::tqcurrentDate() )));
+  m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,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) ));
 }
 
 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):").arg(KoUnit::unitName(indentUnit)));
+  valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit)));
 
   msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox);
   msgError->setChecked(m_bMsgError);
@@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name )
   m_pView = _view;
 
   TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" );
-  tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
+  tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1);
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1);
   grid1->addRowSpacing( 0, KDialog::marginHint()  );
   grid1->setRowStretch( 7, 10 );
 
@@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name )
   TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) );
 
   TQWidget* spacer = new TQWidget( box );
-  spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+  spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     if( config->hasGroup("KSpell kspread") )
     {
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 7c3007e84..c456efb3f 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -40,7 +40,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kbuttonbox.h>
 #include <kmessagebox.h>
@@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name )
   m_pOk = bb->addButton( KStdGuiItem::ok() );
   m_pCancel = bb->addButton( KStdGuiItem::cancel() );
   m_pOk->setDefault( TRUE );
-  bb->layout();
+  bb->tqlayout();
   lay1->addWidget( bb );
 
   TQString text;
@@ -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").arg(""));
+  m_rangeName->setText(i18n("Area: %1").tqarg(""));
 
   resize( 250, 200 );
 }
@@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName)
     }
   }
 
-  tmpName = i18n("Area: %1").arg(tmpName);
+  tmpName = i18n("Area: %1").tqarg(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").arg(""));
+  m_rangeName->setText(i18n("Area: %1").tqarg(""));
   TQString tmp = m_list->text(m_list->currentItem());
   if (!tmp.isEmpty())
     displayAreaValues( tmp );
@@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent,
   m_pView = parent;
 
   resize( 350, 142 );
-  setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
+  tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
                               (TQSizePolicy::SizeType)4, 0, 0,
                               sizePolicy().hasHeightForWidth() ) );
 
diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc
index 4185847e1..e6d74d26d 100644
--- a/kspread/dialogs/kspread_dlg_resize2.cc
+++ b/kspread/dialogs/kspread_dlg_resize2.cc
@@ -26,7 +26,7 @@
 #include <float.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 4ce74abde..0158dd2a5 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -30,7 +30,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index e497a790c..c73f71ec8 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -22,7 +22,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqlistbox.h>
 #include <tqlabel.h>
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 450737a18..75a50cc3d 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -21,7 +21,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 
@@ -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").arg(Cell::columnName(*it));
+	      listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it));
 	    else
-	      listCol+=i18n("Column: %1").arg(text.setNum(*it));
+	      listCol+=i18n("Column: %1").tqarg(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").arg(text.setNum(*it));
+	  listRow+=i18n("Row: %1").tqarg(text.setNum(*it));
 
         list->insertStringList(listRow);
         }
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 4ce0d91ef..1e58ccf5d 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
-  orientationGroup->layout()->setMargin(0);
+  orientationGroup->tqlayout()->setMargin(0);
 
   m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" );
   m_sortColumn->setText( i18n( "Sort &Rows" ) );
@@ -108,10 +108,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->setTitle( i18n( "Sort By" ) );
   sort1Box->setFlat(true);
   sort1Box->setColumnLayout(0, Qt::Vertical );
-  sort1Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort1Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() );
-  sort1BoxLayout->setAlignment( TQt::AlignTop );
+  sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
+  sort1BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
   sort1BoxLayout->addWidget( m_sortKey1 );
@@ -127,10 +127,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->setTitle( i18n( "Then By" ) );
   sort2Box->setFlat(true);
   sort2Box->setColumnLayout(0, Qt::Vertical );
-  sort2Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort2Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() );
-  sort2BoxLayout->setAlignment( TQt::AlignTop );
+  sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
+  sort2BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
   m_sortKey2->insertItem( i18n( "None" ) );
@@ -147,10 +147,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->setTitle( i18n( "Then By" ) );
   sort3Box->setFlat(true);
   sort3Box->setColumnLayout(0, Qt::Vertical );
-  sort3Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort3Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() );
-  sort3BoxLayout->setAlignment( TQt::AlignTop );
+  sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
+  sort3BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
   m_sortKey3->insertItem( i18n( "None" ) );
@@ -171,15 +171,15 @@ SortDialog::SortDialog( View * parent,  const char * name,
 
   m_page2 = new TQWidget( m_tabWidget, "m_page2" );
   TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout");
-  page2Layout->setAlignment(TQt::AlignTop);
+  page2Layout->tqsetAlignment(TQt::AlignTop);
 
   TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" );
   firstKeyBox->setTitle( i18n( "First Key" ) );
   firstKeyBox->setColumnLayout(0, Qt::Vertical );
-  firstKeyBox->layout()->setSpacing( KDialog::spacingHint() );
-  firstKeyBox->layout()->setMargin( KDialog::marginHint() );
-  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() );
-  firstKeyBoxLayout->setAlignment( TQt::AlignTop );
+  firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
+  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
+  firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
   m_useCustomLists->setText( i18n( "&Use custom list" ) );
@@ -201,12 +201,12 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" );
   resultToBox->setTitle( i18n( "Location to Store Sort Results" ) );
   resultToBox->setColumnLayout(0, Qt::Vertical );
-  resultToBox->layout()->setSpacing( KDialog::spacingHint() );
-  resultToBox->layout()->setMargin( KDialog::marginHint() );
+  resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  resultToBox->tqlayout()->setMargin( KDialog::marginHint() );
   
   
-  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
-  resultToBoxLayout->setAlignment( TQt::AlignTop );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
+  resultToBoxLayout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
   destinationSheet->setText("Destination Sheet:");
@@ -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)").arg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -359,13 +359,13 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+		m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
 		
 		if ( i == r.left() )
 		  selectionMayHaveHeader=false;
             }
     }
-     // m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+     // m_listColumn += i18n("Column %1").tqarg(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)").arg(i);
+	    TQString rowName=i18n(" (Row %1)").tqarg(i);
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -385,7 +385,7 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listRow += i18n("Row %1").arg(i);
+		m_listRow += i18n("Row %1").tqarg(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)").arg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 		    m_listColumn += guessName + colName;
 	    else
 	    {
-		    m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+		    m_listColumn += i18n("Column %1").tqarg(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)").arg(i);
+	    TQString rowName=i18n(" (Row %1)").tqarg(i);
 	    
 	    if (!guessName.isEmpty())
 		    m_listRow += guessName + rowName;
 	    else
 	    {
-		    m_listRow += i18n("Row %1").arg(i);
+		    m_listRow += i18n("Row %1").tqarg(i);
 		    
 		    if (i == r.top())
 		      selectionMayHaveHeader=false;
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 5c9f44a34..3f0c27e02 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
@@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->layout();
+    grp->tqlayout();
     lay1->addWidget(grp);
     rb1 = new TQRadioButton( i18n("Everything"), grp );
     rb2 = new TQRadioButton( i18n("Text"), grp );
@@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
 
     grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page);
     grp->setRadioButtonExclusive( TRUE );
-    grp->layout();
+    grp->tqlayout();
     lay1->addWidget(grp);
 
 
@@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name )
     rb5->setChecked(true);
 
     // cb = new TQCheckBox(i18n("Transpose"),this);
-    // cb->layout();
+    // cb->tqlayout();
     // lay1->addWidget(cb);
 
     connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 071aae69d..32a5474a6 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 
 #include <kcombobox.h>
@@ -42,15 +42,15 @@ using namespace KSpread;
 StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   : TQWidget( parent, name, fl )
 {
-  TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout");
+  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout");
 
   m_styleList = new KListView( this, "m_styleList" );
   m_styleList->addColumn( i18n( "Styles" ) );
   m_styleList->setResizeMode( KListView::AllColumns );
-  layout->addWidget( m_styleList );
+  tqlayout->addWidget( m_styleList );
 
   m_displayBox = new KComboBox( FALSE, this, "m_displayBox" );
-  layout->addWidget( m_displayBox );
+  tqlayout->addWidget( m_displayBox );
 
   m_styleList->header()->setLabel( 0, i18n( "Styles" ) );
   m_displayBox->clear();
@@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl )
   m_displayBox->insertItem( i18n( "Custom Styles" ) );
   m_displayBox->insertItem( i18n( "Hierarchical" ) );
   connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle()));
-  resize( TQSize(446, 384).expandedTo(minimumSizeHint()) );
+  resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) );
 }
 
 StyleWidget::~StyleWidget()
@@ -232,11 +232,11 @@ void StyleDlg::slotUser1()
     s = m_styleManager->defaultStyle();
 
   int i = 1;
-  TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) );
+  TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) );
   while ( m_styleManager->style( newName ) != 0 )
   {
     ++i;
-    newName = i18n( "style%1" ).arg( m_styleManager->count() + i );
+    newName = i18n( "style%1" ).tqarg( 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 f88f3a7fd..1b899ebf5 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.arg( Cell::columnName( i ) );
+      text = col.tqarg( Cell::columnName( i ) );
     }
 
     m_dialog->m_columnBox->insertItem( text );
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 4a370246a..8f61c5d8b 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -28,7 +28,7 @@
 #include "kspread_sheet.h"
 #include "kspread_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 
 using namespace KSpread;
@@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
 
   TQGroupBox* tmpTQButtonGroup;
   tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2);
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2);
 
   TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" );
   tmpTQLabel->setText(i18n("Allow:" ));
@@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
 
   displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup );
   displayMessage->setChecked( true );
@@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker )
   lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() );
 
   tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" );
-  tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint());
-  tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint());
+  tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+  tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2);
+  TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2);
 
   displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup );
   displayMessage->setChecked( false );
@@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index)
         }
         break;
     }
-    if ( width() < sizeHint().width() )
-        resize( sizeHint() );
+    if ( width() < tqsizeHint().width() )
+        resize( tqsizeHint() );
 }
 
 void DlgValidity::changeIndexCond(int _index)
diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui
index 341d72a96..cb73b12dc 100644
--- a/kspread/dialogs/kspreadsubtotal.ui
+++ b/kspread/dialogs/kspreadsubtotal.ui
@@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>152</height>
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index 58b275284..aba1a170c 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
@@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     fLayout->add( d->fileLink );
     fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) );
     TQComboBox* recentFile = new TQComboBox( d->filePage );
-    recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+    recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
     fLayout->add( recentFile );
     fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
     connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this,
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index 5e4af84df..df2ff2113 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -55,7 +55,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>10</width>
                                     <height>20</height>
@@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index c9c3eb7af..0768d4f72 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string>
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>21</height>
@@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string>
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>20</height>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 7cdd64493..69397687c 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ):
   TQVBox* mainWidget = makeVBoxMainWidget();
   d = new SheetPropertiesBase( mainWidget );
   TQWidget* spacer = new TQWidget( mainWidget );
-  spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
+  spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
   enableButtonSeparator( true );
 }
 
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index d2a24d6cd..0750b8a9a 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kspread/digest.cc b/kspread/digest.cc
index 0d27375b2..ca45c35d6 100644
--- a/kspread/digest.cc
+++ b/kspread/digest.cc
@@ -831,7 +831,7 @@ void rtl_digest_destroySHA1 (rtlDigest Digest)
 bool SHA1::getHash( TQString const & text, TQCString & hash )
 {
   rtlDigest aDigest     = rtl_digest_createSHA1();
-  rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.unicode(), text.length() * sizeof(TQChar) );
+  rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.tqunicode(), text.length() * sizeof(TQChar) );
   
   if ( aError == rtl_Digest_E_None )
   {
diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html
index 1f2578f2d..d3c739a81 100644
--- a/kspread/doc/PAINTING.html
+++ b/kspread/doc/PAINTING.html
@@ -59,10 +59,10 @@ If it doesn't, two things can happen:</p>
       slightly buggy.)
 </ol>
 
-The layout code also takes into account if the cell has vertical text,
+The tqlayout code also takes into account if the cell has vertical text,
 if it is angled, indented text, and so on.</p>
 
-<p>The result of the layout process is the setting of the following
+<p>The result of the tqlayout process is the setting of the following
 variables in a cell:</p>
 
 <table cellspacing="0" cellpadding="3" border="1">
@@ -100,7 +100,7 @@ variables in a cell:</p>
 </pre>
 </table>
 
-<p>After the layout process, paintCell() uses these
+<p>After the tqlayout process, paintCell() uses these
 variables to position the text within the cell and also to paint "more
 text" markers, etc.</p>
 
@@ -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 alignment, if the neighbors are
+      are affected is dependent on tqalignment, if the neighbors are
       empty, etc, etc.  </ul>
 
 <h3>Borders and overflow</h3>
diff --git a/kspread/formula.cc b/kspread/formula.cc
index fbcf8c0e5..1e42867ab 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -134,7 +134,7 @@ Token::Op KSpread::matchOperator( const TQString& text )
   if( text.length() == 1 )
   {
     TQChar p = text[0];
-    switch( p.unicode() )
+    switch( p.tqunicode() )
     {
         case '+': result = Token::Plus; break;
         case '-': result = Token::Minus; break;
@@ -355,7 +355,7 @@ void TokenStack::ensureSpace()
 // helper function: return true for valid identifier character
 bool KSpread::isIdentifier( TQChar ch )
 {
-  return ( ch.unicode() == '_' ) || (ch.unicode() == '$' ) || ( ch.isLetter() );
+  return ( ch.tqunicode() == '_' ) || (ch.tqunicode() == '$' ) || ( ch.isLetter() );
 }
 
 
@@ -527,7 +527,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const
        }
 
        // aposthrophe (') marks sheet name for 3-d cell, e.g 'Sales Q3'!A4, or a named range
-       else if ( ch.unicode() == '\'' )
+       else if ( ch.tqunicode() == '\'' )
        {
          i++;
          state = InSheetOrAreaName;
@@ -680,7 +680,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const
     case InSheetOrAreaName:
 
        // consume until '
-        if ( ch.unicode() != '\'' )
+        if ( ch.tqunicode() != '\'' )
           tokenText.append( ex[i++] );
 
        else
@@ -1479,10 +1479,10 @@ TQString Formula::dump() const
     compile( tokens );
   }
 
-  result = TQString("Expression: [%1]\n").arg( d->expression );
+  result = TQString("Expression: [%1]\n").tqarg( d->expression );
 #if 0
   Value value = eval();
-  result.append( TQString("Result: %1\n").arg(
+  result.append( TQString("Result: %1\n").tqarg(
       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]").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");
+    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");
     else if( val.isError() ) vtext = "error";
     else vtext = "???";
-    result += TQString("    #%1 = %2\n").arg(c).arg( vtext );
+    result += TQString("    #%1 = %2\n").tqarg(c).tqarg( 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").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::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::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 f3c6953c6..3a66549bd 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%" ).arg( m_xfactor / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).arg( m_yfactor / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).tqarg( m_xfactor / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).tqarg( m_yfactor / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kspread/kspread_brush.h b/kspread/kspread_brush.h
index 4a5679aae..ebb0c5f64 100644
--- a/kspread/kspread_brush.h
+++ b/kspread/kspread_brush.h
@@ -21,7 +21,7 @@
 #ifndef KSPREADBRUSH_H
 #define KSPREADBRUSH_H
 
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "kspread_global.h"
 
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 08ab33e07..3f482e273 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -47,7 +47,7 @@
 
 #include <tqapplication.h>
 #include <tqbuffer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdrawutil.h>
 #include <tqlabel.h>
 #include <tqpoint.h>
@@ -547,7 +547,7 @@ void Canvas::validateSelection()
                 ypos = sheet->dblRowPos( moveY );
             }
             //d->validationInfo->setGeometry( 3, y + 3, len + 2, hei + 2 );
-            d->validationInfo->setAlignment( TQt::AlignVCenter );
+            d->validationInfo->tqsetAlignment( TQt::AlignVCenter );
             TQPainter painter;
             painter.begin( this );
             int len = 0;
@@ -1011,7 +1011,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
               (int) _ev->y() );
     if ( ( obj = getObject( p, activeSheet() ) ) && obj->isSelected() )
     {
-      KoRect const bound = obj->geometry();
+      KoRect const bound = obj->tqgeometry();
       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
-  //shape to a resize arrow
+  //tqshape 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
         {
-          repaint();
+          tqrepaint();
         }
         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").arg(d->anchor);
+        	//TQString question = i18n("Do you want to open this link to '%1'?\n").tqarg(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?").arg(d->anchor);
+					"Malicious programs can harm your computer.  Are you sure that you want to run this program?").tqarg(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->geometry().width() ) /
-            static_cast<double>( obj->geometry().height() );
-        d->m_rectBeforeResize = obj->geometry();
+        d->m_ratio = static_cast<double>( obj->tqgeometry().width() ) /
+            static_cast<double>( obj->tqgeometry().height() );
+        d->m_rectBeforeResize = obj->tqgeometry();
       }
 
       KoPoint docPoint ( doc()->unzoomPoint( _ev->pos() ) );
@@ -1816,7 +1816,7 @@ void Canvas::dropEvent( TQDropEvent * _ev )
     }
 
 
-    b = _ev->encodedData( TextDrag::selectionMimeType() );
+    b = _ev->tqencodedData( TextDrag::selectionMimeType() );
     sheet->paste( b, TQRect( col, row, 1, 1 ), makeUndo );
 
     if ( _ev->source() == this )
@@ -2150,13 +2150,13 @@ void Canvas::processEscapeKey(TQKeyEvent * event)
       case MT_RESIZE_RU:
       case MT_RESIZE_RD:
       {
-        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->geometry()/*getRepaintRect()*/);
+        TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->tqgeometry()/*getRepaintRect()*/);
         d->m_resizeObject->setGeometry( d->m_rectBeforeResize );
         oldBoundingRect.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) ,
                             (int)( -yOffset() * doc()->zoomedResolutionY()) );
 
         activeSheet()->setRegionPaintDirty( oldBoundingRect );
-        repaint( oldBoundingRect );
+        tqrepaint( 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() )->geometry();
+        KoRect const bound = ( itObject.current() )->tqgeometry();
         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->geometry();
+    KoRect objRect = obj->tqgeometry();
     objRect.moveBy( -xOffset(), -yOffset() );
     TQRect oldBoundingRect( doc()->zoomRect( objRect ) );
 
@@ -3440,22 +3440,22 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
     if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU )
     {
         top = true;
-//         snapStatus |= KoGuides::SNAP_HORIZ;
+//         snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD )
     {
         bottom = true;
-//         snapStatus |= KoGuides::SNAP_HORIZ;
+//         snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD )
     {
         left = true;
-//         snapStatus |= KoGuides::SNAP_VERT;
+//         snaptqStatus |= KoGuides::SNAP_VERT;
     }
     if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD )
     {
         right = true;
-//         snapStatus |= KoGuides::SNAP_VERT;
+//         snaptqStatus |= KoGuides::SNAP_VERT;
     }
 
     double newLeft = objRect.left();
@@ -3572,34 +3572,34 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep
 //       {
 //         sp.setY( rect.bottom() );
 //       }
-//       m_gl.repaintSnapping( sp, snapStatus );
+//       m_gl.repaintSnapping( sp, snaptqStatus );
 //     }
 
-    repaint( oldBoundingRect );
+    tqrepaint( oldBoundingRect );
     repaintObject( obj );
     emit objectSizeChanged();
   }
 }
 
 
-void Canvas::finishResizeObject( const TQString &/*name*/, bool /*layout*/ )
+void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ )
 {
   if ( d->m_resizeObject )
   {
-    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() );
+    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() );
 
-    if ( ( d->m_resizeObject->geometry() ) != d->m_rectBeforeResize )
+    if ( ( d->m_resizeObject->tqgeometry() ) != d->m_rectBeforeResize )
     {
         ChangeObjectGeometryCommand *resizeCmd = new ChangeObjectGeometryCommand( d->m_resizeObject, move, size );
         // the command is not executed as the object is allready resized.
         doc()->addCommand( resizeCmd );
     }
 
-//     if ( layout )
-//       doc()->layout( m_resizeObject );
+//     if ( tqlayout )
+//       doc()->tqlayout( m_resizeObject );
 
     d->m_ratio = 0.0;
     d->m_isResizing = false;
@@ -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 repaint after the cell editor
+  // That means we get a synchronous tqrepaint after the cell editor
   // widget is gone. Otherwise we may get painting errors.
   delete d->cellEditor;
   d->cellEditor = 0;
@@ -3775,7 +3775,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
 
     TQColor color = cell->format()->textColor( markerColumn(), markerRow() );
     if ( !color.isValid() )
-        color = TQApplication::palette().active().text();
+        color = TQApplication::tqpalette().active().text();
     g.setColor( TQColorGroup::Text, color);
 
     color = cell->bgColor( markerColumn(), markerRow() );
@@ -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 repaint that part of the widget
-	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->geometry() );
+	//Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget
+	TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() );
 	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->geometry();
+    KoRect g = obj->tqgeometry();
     g.moveBy( -xOffset(), -yOffset() );
-    TQRect geometry( doc()->zoomRect( g ) );
+    TQRect tqgeometry( doc()->zoomRect( g ) );
 
-    update( geometry );
+    update( tqgeometry );
   }
   else
   {
     TQPainter p(this);
     p.translate( -xOffset() * doc()->zoomedResolutionX() , -yOffset() * doc()->zoomedResolutionY() );
-    obj->draw(&p); //this goes faster than calling repaint
+    obj->draw(&p); //this goes faster than calling tqrepaint
     p.end();
   }*/
 }
@@ -3888,7 +3888,7 @@ void Canvas::copyOasisObjects()
       for( ; itObject.current(); ++itObject )
       {
         if ( itObject.current()->isSelected() )
-          p.drawPixmap( itObject.current()->geometry().toTQRect().left() - r.left(), itObject.current()->geometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
+          p.drawPixmap( itObject.current()->tqgeometry().toTQRect().left() - r.left(), itObject.current()->tqgeometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) );
       }
       p.end();
       if (!pixmap.isNull())
@@ -3899,7 +3899,7 @@ void Canvas::copyOasisObjects()
     }
 
     TQDragObject *dragObject = multiDrag;
-    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void Canvas::closeEditor()
@@ -4064,7 +4064,7 @@ void Canvas::paintUpdates()
   }
   else
   {
-    matrix = painter.worldMatrix();
+    matrix = painter.tqworldMatrix();
   }
 
 
@@ -4109,7 +4109,7 @@ void Canvas::paintUpdates()
       {
         cell = sheet->cellAt( x, y );
 
-        // recalc and relayout only for non default cells
+        // recalc and retqlayout only for non default cells
         if (!cell->isDefault())
         {
           if (cell->calcDirtyFlag()) cell->calc();
@@ -4202,7 +4202,7 @@ void Canvas::paintUpdates()
   paintHighlightedRanges(painter, unzoomedRect);
   paintNormalMarker(painter, unzoomedRect);
 
-  //restore clip region with children area
+  //restore clip region with tqchildren 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()->geometry());
+	TQRect childGeometry = doc()->zoomRect( itObject.current()->tqgeometry());
 
 	//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()->geometry() ), TQColor("red" ) );
+      //painter.fillRect( doc()->zoomRect( itObject.current()->tqgeometry() ), TQColor("red" ) );
     }
   }
 
@@ -4263,11 +4263,11 @@ void Canvas::paintChildren( TQPainter& painter, TQWMatrix& /*matrix*/ )
 
   for( ; itObject.current(); ++itObject )
   {
-    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->geometry() );
+    TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->tqgeometry() );
     if ( ( itObject.current() )->sheet() == activeSheet() &&
            zoomedWindowGeometry.intersects( zoomedObjectGeometry ) )
     {
-	    //To prevent unnecessary redrawing of the embedded object, we only repaint
+	    //To prevent unnecessary redrawing of the embedded object, we only tqrepaint
 	    //if one or more of the cells underneath the object has been marked as 'dirty'.
 
 	   TQRect canvasRelativeGeometry = zoomedObjectGeometry;
@@ -4656,7 +4656,7 @@ VBorder::~VBorder()
     delete m_scrollTimer;
 }
 
-TQSize VBorder::sizeHint() const
+TQSize VBorder::tqsizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5036,9 +5036,9 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
 
     TQString tmpSize;
     if ( m_iResizePos != y )
-        tmpSize = i18n("Height: %1 %2").arg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
+        tmpSize = i18n("Height: %1 %2").tqarg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ),
                                                                m_pView->doc()->unit() ) )
-                                       .arg( m_pView->doc()->unitName() );
+                                       .tqarg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Row" );
 
@@ -5057,7 +5057,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
           else
             m_lSize->setGeometry( 3, y + 3, len + 2,hei + 2 );
 
-          m_lSize->setAlignment( TQt::AlignVCenter );
+          m_lSize->tqsetAlignment( TQt::AlignVCenter );
           m_lSize->setText( tmpSize );
           m_lSize->setPalette( TQToolTip::palette() );
           m_lSize->show();
@@ -5095,7 +5095,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
   TQColor highlightColor = View::highlightColor();
   TQPen pen( TQt::black, 1 );
   painter.setPen( pen );
-  // painter.setBackgroundColor( colorGroup().base() );
+  // painter.setBackgroundColor( tqcolorGroup().base() );
 
   // painter.eraseRect( _ev->rect() );
 
@@ -5146,7 +5146,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
     }
     else
     {
-      TQColor c = colorGroup().background();
+      TQColor c = tqcolorGroup().background();
       TQBrush fill( c );
       qDrawPlainRect ( &painter, 0, zoomedYPos, width, height+1, c.dark(150),
            1, &fill );
@@ -5156,10 +5156,10 @@ void VBorder::paintEvent( TQPaintEvent* _ev )
 
     // Reset painter
     painter.setFont( normalFont );
-    painter.setPen( colorGroup().text() );
+    painter.setPen( tqcolorGroup().text() );
 
     if ( selected )
-      painter.setPen( colorGroup().highlightedText() );
+      painter.setPen( tqcolorGroup().highlightedText() );
     else if ( highlighted )
       painter.setFont( boldFont );
 
@@ -5212,7 +5212,7 @@ HBorder::~HBorder()
     delete m_scrollTimer;
 }
 
-TQSize HBorder::sizeHint() const
+TQSize HBorder::tqsizeHint() const
 {
   return TQSize( 40, 10 );
 }
@@ -5738,9 +5738,9 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     TQString tmpSize;
     if ( m_iResizePos != x )
         tmpSize = i18n("Width: %1 %2")
-                  .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
+                  .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
                                                                            m_pView->doc()->unit() )))
-                  .arg( m_pView->doc()->unitName() );
+                  .tqarg( m_pView->doc()->unitName() );
     else
         tmpSize = i18n( "Hide Column" );
 
@@ -5758,7 +5758,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
         else
           m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 );
 
-        m_lSize->setAlignment( TQt::AlignVCenter );
+        m_lSize->tqsetAlignment( TQt::AlignVCenter );
         m_lSize->setText( tmpSize );
         m_lSize->setPalette( TQToolTip::palette() );
         m_lSize->show();
@@ -5866,7 +5866,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = colorGroup().background();
+        TQColor c = tqcolorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5874,10 +5874,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( colorGroup().text() );
+      painter.setPen( tqcolorGroup().text() );
 
       if ( selected )
-        painter.setPen( colorGroup().highlightedText() );
+        painter.setPen( tqcolorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5929,7 +5929,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
       }
       else
       {
-        TQColor c = colorGroup().background();
+        TQColor c = tqcolorGroup().background();
         TQBrush fill( c );
         qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150),
            1, &fill );
@@ -5937,10 +5937,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
 
       // Reset painter
       painter.setFont( normalFont );
-      painter.setPen( colorGroup().text() );
+      painter.setPen( tqcolorGroup().text() );
 
       if ( selected )
-        painter.setPen( colorGroup().highlightedText() );
+        painter.setPen( tqcolorGroup().highlightedText() );
       else if ( highlighted )
         painter.setFont( boldFont );
       if ( !m_pView->activeSheet()->getShowColumnNumber() )
@@ -5991,7 +5991,7 @@ ToolTip::ToolTip( Canvas* canvas )
 // this is a hack of course, because it's not available from TQToolTip
 TQLabel *tip_findLabel()
 {
-    TQWidgetList  *list = TQApplication::allWidgets();
+    TQWidgetList  *list = TQApplication::tqallWidgets();
     TQWidgetListIt it( *list );
     TQWidget * w;
     while ( (w=it.current()) != 0 )
diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h
index ea7e3dd17..f5aa67469 100644
--- a/kspread/kspread_canvas.h
+++ b/kspread/kspread_canvas.h
@@ -284,7 +284,7 @@ public:
      */
     void closeEditor();
 
-    // Created by the view since it's layout is managed there,
+    // Created by the view since it's tqlayout is managed there,
     // but is in fact a sibling of the canvas, which needs to know about it.
     void setEditWidget( KSpread::EditWidget * ew );
 
@@ -326,7 +326,7 @@ public:
     /// resize the m_resizeObject
     void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio );
     /// create KPrResizeCmd
-    void finishResizeObject( const TQString &name, bool layout = true );
+    void finishResizeObject( const TQString &name, bool tqlayout = true );
 
     /**
      * @brief Display object above the other objects in editiong mode
@@ -444,7 +444,7 @@ private:
     TQRect cellsInArea( const TQRect area ) const;
     
     /**
-     * Paints the children
+     * Paints the tqchildren
      */
     void paintChildren( TQPainter& painter, TQWMatrix& matrix );
 
@@ -586,7 +586,7 @@ public:
 
     void updateColumns( int from, int to );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 private slots:
     void doAutoScroll();
@@ -672,7 +672,7 @@ public:
     void equalizeRow( double resize );
     void updateRows( int from, int to );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 private slots:
     void doAutoScroll();
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index 0c5de5e6e..fdcf38be6 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -486,7 +486,7 @@ void Cell::setValue( const Value& v )
     clearAllErrors();
 
   //If the value has not changed then we don't need to do anything
-  //(ie. no need to relayout, update dependant cells etc.),
+  //(ie. no need to retqlayout, update dependant cells etc.),
   //unless this cell contains a formula, in which case its dependancies might have changed
   //even though the value has not.  For example, if this cell was previously empty (and its value is
   //therefore empty) and a new dependency upon an empty cell has been added.  The new value would still
@@ -697,7 +697,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y )
       d->extra()->mergedYCells = 0;
     }
 
-    // Refresh the layout
+    // Refresh the tqlayout
     setFlag( Flag_LayoutDirty );
     return;
   }
@@ -717,7 +717,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y )
     }
   }
 
-  // Refresh the layout
+  // Refresh the tqlayout
   setFlag( Flag_LayoutDirty );
 }
 
@@ -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" ).arg( col );
+                            erg += TQString( "$%1" ).tqarg( col );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1" ).arg( col );
+                                erg += TQChar(0xA7) + TQString( "%1" ).tqarg( col );
                             else
-                                erg += TQString( "#%1" ).arg( col - _col );
+                                erg += TQString( "#%1" ).tqarg( col - _col );
 
                         if ( fix2 )
-                            erg += TQString( "$%1#").arg( row );
+                            erg += TQString( "$%1#").tqarg( row );
                         else
                             if (_era)
-                                erg += TQChar(0xA7) + TQString( "%1#" ).arg( row );
+                                erg += TQChar(0xA7) + TQString( "%1#" ).tqarg( row );
                             else
-                                erg += TQString( "#%1#" ).arg( row - _row );
+                                erg += TQString( "#%1#" ).tqarg( row - _row );
                     }
                 }
                 else
@@ -1204,7 +1204,7 @@ void Cell::freeAllObscuredCells()
 //                              Layout
 
 
-// Recalculate the entire layout.  This includes the following members:
+// Recalculate the entire tqlayout.  This includes the following members:
 //
 //   d->textX,     d->textY
 //   d->textWidth, d->textHeight
@@ -1222,11 +1222,11 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row )
 {
   // Are _col and _row really needed ?
   //
-  // Yes they are: they are useful if this is the default layout, in
+  // Yes they are: they are useful if this is the default tqlayout, in
   // which case d->row and d->column are 0 and 0, but _col and _row
   // are the real coordinates of the cell.
 
-  // There is no need to remake the layout if it hasn't changed.
+  // There is no need to remake the tqlayout if it hasn't changed.
   if ( !testFlag( Flag_LayoutDirty ) )
     return;
 
@@ -1244,7 +1244,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row )
          d->extra()->mergedXCells, d->extra()->mergedYCells );
 
   // If the column for this cell is hidden or the row is too low,
-  // there is no use in remaking the layout.
+  // there is no use in remaking the tqlayout.
   ColumnFormat  *cl1 = format()->sheet()->columnFormat( _col );
   RowFormat     *rl1 = format()->sheet()->rowFormat( _row );
   if ( cl1->isHide()
@@ -1597,11 +1597,11 @@ void Cell::setOutputText()
     return;
   }
 
-  // If nothing has changed, we don't need to remake the text layout.
+  // If nothing has changed, we don't need to remake the text tqlayout.
   if ( !testFlag(Flag_TextFormatDirty) )
     return;
 
-  // We don't want to remake the layout unnecessarily.
+  // We don't want to remake the tqlayout unnecessarily.
   clearFlag( Flag_TextFormatDirty );
 
   // Display a formula if warranted.  If not, display the value instead;
@@ -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 alignment and a few
+  // Calculate d->textY based on the vertical tqalignment 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 alignment and textwidth.
+  // Calculate d->textX based on tqalignment 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.arg( fullName() );
+      tmp = tmp.tqarg( fullName() );
       KMessageBox::error( (TQWidget*)0L, tmp);
     }
     setFlag(Flag_ParseError);
@@ -2193,7 +2193,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   double  width   = width0;
   double  height  = height0;
 
-  // Handle right-to-left layout.
+  // Handle right-to-left tqlayout.
   // In an RTL sheet the cells have to be painted at their opposite horizontal
   // location on the canvas, meaning that column A will be the rightmost column
   // on screen, column B will be to the left of it and so on. Here we change
@@ -2253,14 +2253,14 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
     selected = selected && !( markerArea.contains( cellRef ) );
 
     // Don't draw any selection at all when printing.
-    if ( painter.device()->isExtDev() || !drawCursor )
+    if ( painter.tqdevice()->isExtDev() || !drawCursor )
       selected = false;
   }
 
-  // Need to make a new layout ?
+  // Need to make a new tqlayout ?
   //
   // FIXME: We have already used (at least) extraWidth/Height above,
-  //        and now we are recalculating the layout.  This has to be
+  //        and now we are recalculating the tqlayout.  This has to be
   //        moved up above all uses.
   //
   // FIXME: This needs to be taken out eventually - it is done in
@@ -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.device()->devType() != TQInternal::Printer
+  if ( painter.tqdevice()->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.device()->isExtDev() )
+  if ( painter.tqdevice()->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.device()->isExtDev() )
+  if ( painter.tqdevice()->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.device()->isExtDev()
+    if ( !painter.tqdevice()->isExtDev()
    || format()->sheet()->print()->printCommentIndicator() )
       paintCommentIndicator( painter, cellRect, cellRef, backgroundColor );
 
     // 6b. Paint possible formula indicator.
-    if ( !painter.device()->isExtDev()
+    if ( !painter.tqdevice()->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.device()->isExtDev()
+   && ( !painter.tqdevice()->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.device()->isExtDev() ) )
+       !( sheetDir == Sheet::RightToLeft && painter.tqdevice()->isExtDev() ) )
   {
 
     //kdDebug(36001) << "painting cells that obscure " << name() << endl;
@@ -2498,7 +2498,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
      */
   if ( d->style == Cell::ST_Button ) {
     TQBrush fill( TQt::lightGray );
-    TQApplication::style().drawControl( TQStyle::CE_PushButton, &_painter, this,
+    TQApplication::style().tqdrawControl( TQStyle::CE_PushButton, &_painter, this,
                TQRect( _tx + 1, _ty + 1, w2 - 1, h2 - 1 ),
                defaultColorGroup ); //, selected, &fill );
   }
@@ -2686,7 +2686,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
           const TQPoint &cellRef, bool selected,
           TQColor &backgroundColor )
 {
-  TQColorGroup  defaultColorGroup = TQApplication::palette().active();
+  TQColorGroup  defaultColorGroup = TQApplication::tqpalette().active();
   TQRect        zoomedCellRect    = sheet()->doc()->zoomRect( cellRect );
 
   // If this is not the KS_rowMax and/or KS_colMax, then we reduce
@@ -2723,7 +2723,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect,
     TQColor bg( backgroundColor );
 
     // Handle printers separately.
-    if ( !painter.device()->isExtDev() ) {
+    if ( !painter.tqdevice()->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.device()->isExtDev() )
+  if ( !painter.tqdevice()->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.device()->isExtDev();
+  bool paintingToExternalDevice = painter.tqdevice()->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.device()->isExtDev() )     {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) {
+           || ( !painter.tqdevice()->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.device()->isExtDev() &&
+      !painter.tqdevice()->isExtDev() &&
       cellRect.height() > 4.0  &&
       cellRect.width()  > 4.0 )
   {
@@ -3175,15 +3175,15 @@ void Cell::paintText( TQPainter& painter,
 
   ColumnFormat  *colFormat         = format()->sheet()->columnFormat( cellRef.x() );
 
-  TQColorGroup    defaultColorGroup = TQApplication::palette().active();
+  TQColorGroup    defaultColorGroup = TQApplication::tqpalette().active();
   TQColor         textColorPrint    = effTextColor( cellRef.x(), cellRef.y() );
 
   // Resolve the text color if invalid (=default).
   if ( !textColorPrint.isValid() ) {
-    if ( painter.device()->isExtDev() )
+    if ( painter.tqdevice()->isExtDev() )
       textColorPrint = TQt::black;
     else
-      textColorPrint = TQApplication::palette().active().text();
+      textColorPrint = TQApplication::tqpalette().active().text();
   }
 
   TQPen tmpPen( textColorPrint );
@@ -3209,7 +3209,7 @@ void Cell::paintText( TQPainter& painter,
 
   // Check for blue color, for hyperlink.
   if ( !link().isEmpty() ) {
-    tmpPen.setColor( TQApplication::palette().active().link() );
+    tmpPen.setColor( TQApplication::tqpalette().active().link() );
     TQFont f = painter.font();
     f.setUnderline( true );
     painter.setFont( f );
@@ -3466,7 +3466,7 @@ void Cell::paintPageBorders( TQPainter& painter,
            bool paintBorderBottom )
 {
   // Not screen?  Return immediately.
-  if ( painter.device()->isExtDev() )
+  if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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 repaint these corners.
+  // to tqrepaint 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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+    if ( painter.tqdevice()->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.device()->isExtDev() ) {
+      if ( painter.tqdevice()->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.device()->isExtDev() )      {
+      if ( painter.tqdevice()->isExtDev() )      {
         if ( sheetDir == Sheet::RightToLeft )
           painter.drawLine( TQMAX( zrect_left, zcellRect_left ),
                             TQMAX( zrect_top, zcellRect_bottom - bottom ),
@@ -4704,7 +4704,7 @@ TQString Cell::link() const
 
 void Cell::update()
 {
-  /* those obscuring us need to redo their layout cause they can't obscure us
+  /* those obscuring us need to redo their tqlayout cause they can't obscure us
      now that we've got text.
      This includes cells obscuring cells that we are obscuring
   */
@@ -5232,7 +5232,7 @@ TQDomElement Cell::save( TQDomDocument& doc,
         {
                 TQDomElement dateMin = doc.createElement( "datemin" );
                 TQString tmp("%1/%2/%3");
-                tmp = tmp.arg(d->extra()->validity->dateMin.year()).arg(d->extra()->validity->dateMin.month()).arg(d->extra()->validity->dateMin.day());
+                tmp = tmp.tqarg(d->extra()->validity->dateMin.year()).tqarg(d->extra()->validity->dateMin.month()).tqarg(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.arg(d->extra()->validity->dateMax.year()).arg(d->extra()->validity->dateMax.month()).arg(d->extra()->validity->dateMax.day());
+                tmp = tmp.tqarg(d->extra()->validity->dateMax.year()).tqarg(d->extra()->validity->dateMax.month()).tqarg(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.arg(dd.year()).arg(dd.month()).arg(dd.day());
+          str = str.tqarg(dd.year()).tqarg(dd.month()).tqarg(dd.day());
       }
       else if( isTime() )
       {
@@ -6048,25 +6048,25 @@ void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext&
             if ( !point.isValid() )
               continue;
 
-            KoRect geometry = obj->geometry();
-            geometry.setLeft( geometry.left() + sheet()->columnPos( d->column, 0 ) );
-            geometry.setTop( geometry.top() + sheet()->rowPos( d->row, 0 ) );
+            KoRect tqgeometry = obj->tqgeometry();
+            tqgeometry.setLeft( tqgeometry.left() + sheet()->columnPos( d->column, 0 ) );
+            tqgeometry.setTop( tqgeometry.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 );
-              geometry.setRight( sheet()->columnPos( point.column(), 0) + end_x );
+              tqgeometry.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 );
-              geometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
+              tqgeometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y );
             }
 
-            obj->setGeometry( geometry );
+            obj->setGeometry( tqgeometry );
           }
         }
     }
@@ -6744,8 +6744,8 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op )
           if( inside_tag )
           {
             inside_tag = false;
-            if( tag.startsWith( "a href=\"", true ) )
-            if( tag.endsWith( "\"" ) )
+            if( tag.tqstartsWith( "a href=\"", true ) )
+            if( tag.tqendsWith( "\"" ) )
               qml_link = tag.mid( 8, tag.length()-9 );
             tag = TQString();
           }
diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h
index fd100c453..500804f3d 100644
--- a/kspread/kspread_cell.h
+++ b/kspread/kspread_cell.h
@@ -265,7 +265,7 @@ public:
 
     /**
      * Moves around the cell. It cares about obscured and obscuring cells and
-     * forces, relayout, calculation and redrawing of the cell.
+     * forces, retqlayout, calculation and redrawing of the cell.
      */
     void move( int column, int row );
 
@@ -807,7 +807,7 @@ public:
     void clearAllErrors();
 
     /**
-     * Calculates the layout of the cell, i,e, determines what should be shown
+     * Calculates the tqlayout of the cell, i,e, determines what should be shown
      * for this cell, m_strOutText.
      */
     void makeLayout( TQPainter &_painter, int _col, int _row );
@@ -900,9 +900,9 @@ public:
    * In that case the cell usually displays "#####"
    *
    * LayoutDirty
-   * Flag showing whether the current layout is OK.
+   * Flag showing whether the current tqlayout is OK.
    * If you change for example the fonts point size, set this flag. When the
-   * cell must draw itself on the screen it will first recalculate its layout.
+   * cell must draw itself on the screen it will first recalculate its tqlayout.
    *
    * CalcDirty
    * Shows whether recalculation is necessary.
@@ -925,7 +925,7 @@ public:
    * If this flag is set, then it is known that this cell has to be updated
    * on the display. This means that somewhere in the calling stack there is a
    * function which will call @ref Sheet::updateCell once it retains
-   * the control. If a function changes the contents/layout of this cell and this
+   * the control. If a function changes the contents/tqlayout of this cell and this
    * flag is not set, then the function must set it at once. After the changes
    * are done the function must call <tt>m_pSheet->updateCell(...).
    * The flag is cleared by the function format()->sheet()->updateCell.
diff --git a/kspread/kspread_cluster.cc b/kspread/kspread_cluster.cc
index 318ee7582..21fe0ef0f 100644
--- a/kspread/kspread_cluster.cc
+++ b/kspread/kspread_cluster.cc
@@ -1039,7 +1039,7 @@ bool ColumnCluster::insertColumn( int col )
     int cx = col / KSPREAD_CLUSTER_LEVEL2;
     int dx = col % KSPREAD_CLUSTER_LEVEL2;
 
-    // Is there a column layout at the right most position ?
+    // Is there a column tqlayout at the right most position ?
     // In this case the shift is impossible.
     ColumnFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ];
     if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] )
@@ -1356,7 +1356,7 @@ bool RowCluster::insertRow( int row )
     int cx = row / KSPREAD_CLUSTER_LEVEL2;
     int dx = row % KSPREAD_CLUSTER_LEVEL2;
 
-    // Is there a row layout at the bottom most position ?
+    // Is there a row tqlayout at the bottom most position ?
     // In this case the shift is impossible.
     RowFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ];
     if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] )
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index ea698845c..188dbe2ee 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.arg( d->s_docId++ );
+      tmp = tmp.tqarg( d->s_docId++ );
       setName( tmp.local8Bit());//tmp.latin1() );
       dcopObject();
   }
@@ -941,7 +941,7 @@ void Doc::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles ) con
     styles = mainStyles.styles( KoGenStyle::STYLE_PAGELAYOUT );
     it = styles.begin();
     for ( ; it != styles.end() ; ++it ) {
-        (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
+        (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
         stylesWriter->endElement();
     }
 
@@ -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." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).tqarg( 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" ).arg( spread.attribute("mime") ) );
+    setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).tqarg( 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.").arg(d->syntaxVersion),
+                  "When you open it with this version of KSpread, some information may be lost.").tqarg(d->syntaxVersion),
           i18n("File Format Mismatch"), KStdGuiItem::cont() );
       if ( ret == KMessageBox::Cancel )
       {
@@ -1179,7 +1179,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc )
       return false;
   }
 
-  //Backwards compatibility with older versions for paper layout
+  //Backwards compatibility with older versions for paper tqlayout
   if ( d->syntaxVersion < 1 )
   {
     TQDomElement paper = spread.namedItem( "paper" ).toElement();
@@ -1549,7 +1549,7 @@ void Doc::setZoomAndResolution( int zoom, int dpiX, int dpiY )
 
 void Doc::newZoomAndResolution( bool updateViews, bool /*forPrint*/ )
 {
-/*    layout();
+/*    tqlayout();
     updateAllFrames();*/
     if ( updateViews )
     {
@@ -1656,12 +1656,12 @@ void Doc::paintContent( TQPainter& painter, const TQRect& rect,
     if ( m_zoomedResolutionX != zoomX )
         d_zoom *= ( zoomX / m_zoomedResolutionX );
 
-    // KSpread support zoom, therefore no need to scale with worldMatrix
-    TQWMatrix matrix = painter.worldMatrix();
+    // KSpread support zoom, therefore no need to scale with tqworldMatrix
+    TQWMatrix matrix = painter.tqworldMatrix();
     matrix.setMatrix( 1, 0, 0, 1, matrix.dx(), matrix.dy() );
     TQRect prect = rect;
-    prect.setWidth( (int) (prect.width() * painter.worldMatrix().m11()) );
-    prect.setHeight( (int) (prect.height() * painter.worldMatrix().m22()) );
+    prect.setWidth( (int) (prect.width() * painter.tqworldMatrix().m11()) );
+    prect.setHeight( (int) (prect.height() * painter.tqworldMatrix().m22()) );
     setZoomAndResolution( (int) ( d_zoom * 100 ), KoGlobal::dpiX(), KoGlobal::dpiY() );
     // paint the content, now zoom is correctly set
     kdDebug(36001)<<"paintContent-------------------------------------\n";
@@ -1731,7 +1731,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
 			   const Sheet* sheet, bool /*drawCursor*/)
 {
   //
-  // Clip away children
+  // Clip away tqchildren
   //
 
   TQRegion rgn = painter.clipRegion();
@@ -1746,10 +1746,10 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect,
                       - view->canvasWidget()->yOffset() );
   }
   else {
-    matrix = painter.worldMatrix();
+    matrix = painter.tqworldMatrix();
   }
 
-//   TQPtrListIterator<KoDocumentChild> it( children() );
+//   TQPtrListIterator<KoDocumentChild> it( tqchildren() );
 //   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->shape() != TQt::waitCursor.shape()) )  )
+    if (waitCursor && ( (!activeOverride) || (activeOverride->tqshape() != TQt::waitCursor.tqshape()) )  )
     {
         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()->shape());
+//        TQApplication::setOverrideCursor(TQApplication::overrideCursor()->tqshape());
 //    }
 
     KoDocument::emitBeginOperation();
@@ -2379,7 +2379,7 @@ KoPictureCollection *Doc::pictureCollection()
   return &d->m_pictureCollection;
 }
 
-void Doc::repaint( const TQRect& rect )
+void Doc::tqrepaint( const TQRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
@@ -2393,7 +2393,7 @@ void Doc::repaint( const TQRect& rect )
   }
 }
 
-void Doc::repaint( EmbeddedObject *obj )
+void Doc::tqrepaint( EmbeddedObject *obj )
 {
   TQPtrListIterator<KoView> it( views() );
   for( ; it.current(); ++it )
@@ -2404,7 +2404,7 @@ void Doc::repaint( EmbeddedObject *obj )
   }
 }
 
-void Doc::repaint( const KoRect& rect )
+void Doc::tqrepaint( const KoRect& rect )
 {
   TQRect r;
   TQPtrListIterator<KoView> it( views() );
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index 64d1fbf58..63320a96d 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 repaint of any cells or regions of cells which
+   * Mark the end of an operation and triggers a tqrepaint 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;
 
-  // repaint (update) all views
-  void repaint( const TQRect& );
-  void repaint( EmbeddedObject* );
-  void repaint( const KoRect& );
+  // tqrepaint (update) all views
+  void tqrepaint( const TQRect& );
+  void tqrepaint( EmbeddedObject* );
+  void tqrepaint( const KoRect& );
 
   virtual void addShell( KoMainWindow *shell );
 
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 7f0fa282a..ddf41d317 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -315,11 +315,11 @@ TQObject( editor )
   d->editor = editor;
   d->hintLabel = 0;
 
-  d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup );
+  d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup );
   d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
   d->completionPopup->setLineWidth( 1 );
   d->completionPopup->installEventFilter( this );
-  d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+  d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
 
   d->completionListBox = new KListBox( d->completionPopup );
   d->completionPopup->setFocusProxy( d->completionListBox );
@@ -430,7 +430,7 @@ void FunctionCompletion::showCompletion( const TQStringList &choices )
 
   // size of the pop-up
   d->completionPopup->setMaximumHeight( 100 );
-  d->completionPopup->resize( d->completionListBox->sizeHint() +
+  d->completionPopup->resize( d->completionListBox->tqsizeHint() +
     TQSize( d->completionListBox->verticalScrollBar()->width() + 4,
         d->completionListBox->horizontalScrollBar()->height() + 4 ) );
   int h = d->completionListBox->height();
@@ -612,7 +612,7 @@ void CellEditor::triggerFunctionAutoComplete()
   TQStringList fnames = KSpread::FunctionRepository::self()->functionNames();
   TQStringList choices;
   for( unsigned i=0; i<fnames.count(); i++ )
-    if( fnames[i].startsWith( id, false ) )
+    if( fnames[i].tqstartsWith( id, false ) )
       choices.append( fnames[i] );
   choices.sort();
 
@@ -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 repaint the obscured cells
+    // don't make it smaller: then we would have to tqrepaint the obscured cells
     if (mw < width())
       mw = width();
 
@@ -1455,7 +1455,7 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas,
   m_pCanvas = _canvas;
   Q_ASSERT(m_pCanvas != NULL);
   // Those buttons are created by the caller, so that they are inserted
-  // properly in the layout - but they are then managed here.
+  // properly in the tqlayout - but they are then managed here.
   m_pCancelButton = cancelButton;
   m_pOkButton = okButton;
   isArray = false;
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index b0960735d..ecebff607 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 repaint )
+void RowFormat::setHide( bool _hide, bool tqrepaint )
 {
     if ( _hide != m_bHide ) // only if we change the status
     {
@@ -2734,14 +2734,14 @@ void RowFormat::setHide( bool _hide, bool repaint )
 	    // 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, repaint );
+      m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
 	}
 	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, repaint );
+            m_pSheet->emit_updateRow( this, m_iRow, tqrepaint );
 	}
     }
 }
diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h
index 83b2daeeb..ed89807a2 100644
--- a/kspread/kspread_format.h
+++ b/kspread/kspread_format.h
@@ -22,7 +22,7 @@
 #ifndef __kspread_format_h__
 #define __kspread_format_h__
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqpen.h>
@@ -557,7 +557,7 @@ public:
     /**
      * Sets the hide flag
      */
-    void setHide( bool _hide, bool repaint = true );
+    void setHide( bool _hide, bool tqrepaint = true );
     bool isHide()const { return m_bHide;}
 
     bool operator==( const RowFormat& other ) const;
diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc
index 23f2ca015..422468380 100644
--- a/kspread/kspread_functions_conversion.cc
+++ b/kspread/kspread_functions_conversion.cc
@@ -168,7 +168,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *)
   if ((value < 0) || (value > 3999))
     return Value::errorNA();
   TQString result;
-  result = TQString::fromLatin1 (RNThousands[(value / 1000)] +
+  result = TQString::tqfromLatin1 (RNThousands[(value / 1000)] +
                                 RNHundreds[(value / 100) % 10] +
                                 RNTens[(value / 10 ) % 10] +
                                 RNUnits[(value) % 10]);
@@ -179,7 +179,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *)
 // return < 0 if invalid
 int func_arabic_helper (TQChar c)
 {
-  switch (c.upper().unicode())
+  switch (c.upper().tqunicode())
   {
     case 'M': return 1000;
     case 'D': return 500;
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc
index 0136d298c..b139057d9 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cc
@@ -32,8 +32,8 @@
 using namespace KSpread;
 
 // prototypes, sorted
-Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *);
-Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *);
+Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_date (valVector args, ValueCalc *calc, FuncExtra *);
 Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *);
@@ -77,10 +77,10 @@ void RegisterDateTimeFunctions()
   FunctionRepository* repo = FunctionRepository::self();
   Function *f;
   
-  f = new Function ("CURRENTDATE",  func_currentDate);
+  f = new Function ("CURRENTDATE",  func_tqcurrentDate);
   f->setParamCount (0);
   repo->add (f);
-  f = new Function ("CURRENTDATETIME",  func_currentDateTime);
+  f = new Function ("CURRENTDATETIME",  func_tqcurrentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("CURRENTTIME",  func_currentTime);
@@ -140,7 +140,7 @@ void RegisterDateTimeFunctions()
   f = new Function ("MONTHS",  func_months);
   f->setParamCount (3);
   repo->add (f);
-  f = new Function ("NOW",  func_currentDateTime);
+  f = new Function ("NOW",  func_tqcurrentDateTime);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("SECOND",  func_second);
@@ -154,7 +154,7 @@ void RegisterDateTimeFunctions()
   repo->add (f);
   f = new Function ("TIMEVALUE",  func_timevalue);
   repo->add (f);
-  f = new Function ("TODAY",  func_currentDate);
+  f = new Function ("TODAY",  func_tqcurrentDate);
   f->setParamCount (0);
   repo->add (f);
   f = new Function ("WEEKDAY",  func_weekday);
@@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *)
   int number = calc->conv()->asInteger (args[0]).asInteger();
 
   TQString monthName = calc->conv()->locale()->calendar()->monthName (number,
-      TQDate::currentDate().year());
+      TQDate::tqcurrentDate().year());
   if (monthName.isNull())
     return Value::errorVALUE();
   return Value (monthName);
@@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *)
   return Value (TQTime (h, m, s));
 }
 
-// Function: currentDate
-Value func_currentDate (valVector, ValueCalc *, FuncExtra *)
+// Function: tqcurrentDate
+Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDate::currentDate ());
+  return Value (TQDate::tqcurrentDate ());
 }
 
 // Function: currentTime
@@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *)
   return Value (TQTime::currentTime ());
 }
 
-// Function: currentDateTime
-Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *)
+// Function: tqcurrentDateTime
+Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *)
 {
-  return Value (TQDateTime::currentDateTime ());
+  return Value (TQDateTime::tqcurrentDateTime ());
 }
 
 // Function: dayOfYear
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc
index 2a5775aae..52ae0f99f 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)").arg( name.sysname ).
-         arg( name.release ).arg( name.machine );
+       TQString os = TQString("%1 %2 (%3)").tqarg( name.sysname ).
+         tqarg( name.release ).tqarg( name.machine );
        return Value (os);
     }
   }
diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc
index e61aff934..1f661d274 100644
--- a/kspread/kspread_functions_text.cc
+++ b/kspread/kspread_functions_text.cc
@@ -188,7 +188,7 @@ Value func_code (valVector args, ValueCalc *calc, FuncExtra *)
   if (str.length() <= 0)
      return Value::errorVALUE();
 
-  return Value (str[0].unicode());
+  return Value (str[0].tqunicode());
 }
 
 // Function: COMPARE
@@ -496,11 +496,11 @@ Value func_rot (valVector args, ValueCalc *calc, FuncExtra *)
 
   for( unsigned i=0; i<text.length(); i++ )
   {
-    unsigned c = text[i].upper().unicode();
+    unsigned c = text[i].upper().tqunicode();
     if( ( c >= 'A' ) && ( c <= 'M' ) )
-      text[i] = TQChar( text[i].unicode() + 13);
+      text[i] = TQChar( text[i].tqunicode() + 13);
     if( ( c >= 'N' ) && ( c <= 'Z' ) )
-      text[i] = TQChar( text[i].unicode() - 13);
+      text[i] = TQChar( text[i].tqunicode() - 13);
   }
 
   return Value (text);
diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp
index 506626bf9..d2518494c 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #include <knuminput.h>
@@ -38,11 +38,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal
 , m_generalValue( generalValue )
 , m_unit( unit )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     if ( m_generalValue.m_name.isNull() )
     {
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc
index a24c8cf25..7d55a8ff3 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.arg( tableId++ );
+  s = s.tqarg( tableId++ );
   Sheet *t = new Sheet ( this, s , s.utf8());
   t->setSheetName( s, true ); // huh? (Werner)
   return t;
@@ -159,7 +159,7 @@ void Map::loadOasisSettings( KoOasisSettings &settings )
 
 void Map::saveOasisSettings( KoXmlWriter &settingsWriter )
 {
-    settingsWriter.addConfigItem( "ViewId", TQString::fromLatin1( "View1" ) );
+    settingsWriter.addConfigItem( "ViewId", TQString::tqfromLatin1( "View1" ) );
     // Save visual info for the first view, such as active sheet and active cell
     // It looks like a hack, but reopening a document creates only one view anyway (David)
     View * view = m_doc->views().isEmpty() ? 0 : dynamic_cast<View*>(m_doc->views().getFirst());
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 8c273700c..9257a3f57 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -55,8 +55,8 @@ class View;
  * EmbeddedObject
  *
  **********************************************************/
-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 )
+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 )
 {
   angle = 0.0;
   inObjList = true;
@@ -66,23 +66,23 @@ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry )
 EmbeddedObject::~EmbeddedObject()
 {
 }
-KoRect EmbeddedObject::geometry()
+KoRect EmbeddedObject::tqgeometry()
 {
-    return m_geometry;
+    return m_tqgeometry;
 }
 void EmbeddedObject::setGeometry( const KoRect &rect )
 {
-    m_geometry = rect;
+    m_tqgeometry = rect;
 }
 
 void EmbeddedObject::moveBy( const KoPoint &_point )
 {
-  m_geometry.moveTopLeft( m_geometry.topLeft() + _point );
+  m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + _point );
 }
 
 void EmbeddedObject::moveBy( double _dx, double _dy )
 {
-  m_geometry.moveTopLeft( m_geometry.topLeft() + KoPoint( _dx, _dy ) );
+  m_tqgeometry.moveTopLeft( m_tqgeometry.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_geometry.setSize( KoSize( m_geometry.width()+_dx, m_geometry.height()+_dy) );
+  m_tqgeometry.setSize( KoSize( m_tqgeometry.width()+_dx, m_tqgeometry.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_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() ) ) );
+  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() ) ) );
     //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_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() );
+    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() );
 
 //     if ( kAbs( angle ) > 1E-6 )
 //     {
 //         double value = -1 * ( ( double )angle* M_PI )/180.0;
-//         TQString str=TQString( "rotate (%1)" ).arg( value );
+//         TQString str=TQString( "rotate (%1)" ).tqarg( 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 = geometry().size().toTQSize();
+	TQSize actualSize = tqgeometry().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( geometry().left(), geometry().top(),
-                geometry().width() , geometry().height() );
+  KoRect bound( tqgeometry().left(), tqgeometry().top(),
+                tqgeometry().width() , tqgeometry().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 &geometry) const
+TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry) const
 {
     int px = /*sheet()->doc()->zoomItX*/(_point.x());
     int py = /*sheet()->doc()->zoomItY*/(_point.y());
-    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());
+    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());
 
 //     if ( angle != 0.0 )
 //     {
@@ -367,10 +367,10 @@ void EmbeddedObject::doDelete()
  * EmbeddedKOfficeObject
  *
  **********************************************************/
-EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry )
-    : EmbeddedObject( _sheet, geometry ), m_parent(parent)
+EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
+    : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent)
 {
-    m_embeddedObject = new KoDocumentChild(parent, doc, geometry.toTQRect() );
+    m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.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" ).arg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).tqarg( 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()->geometry() ) );
+    setGeometry( KoRect::fromTQRect( embeddedObject()->tqgeometry() ) );
     return result;
 }
 
@@ -436,7 +436,7 @@ void EmbeddedKOfficeObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 TQDomElement EmbeddedKOfficeObject::save( TQDomDocument& doc )
 {
     kdDebug() << "Saving EmbeddedKOfficeObject" << endl;
-    embeddedObject()->setGeometry( geometry().toTQRect() );
+    embeddedObject()->setGeometry( tqgeometry().toTQRect() );
     return m_embeddedObject->save( doc );
 }
 
@@ -446,21 +446,21 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
   int const penw = pen.width() ;
   KoRect bound( 0, 0,
-                geometry().width() - ( 2 * penw ), geometry().height() - ( 2 * penw ) );
+                tqgeometry().width() - ( 2 * penw ), tqgeometry().height() - ( 2 * penw ) );
   TQRect const zoomedBound = sheet()->doc()->zoomRect( bound );
 
   _painter->save();
-  int const xOffset = sheet()->doc()->zoomItX( geometry().left() + penw);
-  int const yOffset = sheet()->doc()->zoomItY( geometry().top() + penw );
+  int const xOffset = sheet()->doc()->zoomItX( tqgeometry().left() + penw);
+  int const yOffset = sheet()->doc()->zoomItY( tqgeometry().top() + penw );
 
-  TQRect new_geometry = zoomedBound;
+  TQRect new_tqgeometry = zoomedBound;
 
   //if ( translate )
   //{
   	_painter->translate( xOffset , yOffset );
 
-  	new_geometry.moveBy(  xOffset , yOffset );
-  	new_geometry.moveBy( -_painter->window().x(), -_painter->window().y() );
+  	new_tqgeometry.moveBy(  xOffset , yOffset );
+  	new_tqgeometry.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_geometry );
+   embeddedObject()->setGeometry( new_tqgeometry );
   _painter->restore();
 
   EmbeddedObject::draw( _painter );
@@ -485,10 +485,10 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter )
 
 TQPixmap EmbeddedKOfficeObject::toPixmap( double xZoom , double yZoom )
 {
-	TQPixmap pixmap( (int)( geometry().width()*xZoom ), (int)( geometry().height()*yZoom ) );
+	TQPixmap pixmap( (int)( tqgeometry().width()*xZoom ), (int)( tqgeometry().height()*yZoom ) );
 
 	TQPainter painter(&pixmap);
-	TQRect  bound( 0,0,(int)( geometry().width()*xZoom ), (int)(geometry().height()*yZoom) );
+	TQRect  bound( 0,0,(int)( tqgeometry().width()*xZoom ), (int)(tqgeometry().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( geometry() ), true );
+//   embeddedObject()->setGeometry( zh->zoomRect( tqgeometry() ), true );
 
 //   return;
-//   TQRect r = sheet()->doc()->zoomRect( geometry() );
+//   TQRect r = sheet()->doc()->zoomRect( tqgeometry() );
 //   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& geometry )
-  : EmbeddedKOfficeObject( _spread, _sheet, doc, geometry )
+EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry )
+  : EmbeddedKOfficeObject( _spread, _sheet, doc, tqgeometry )
 {
     m_pBinding = 0;
 }
@@ -687,8 +687,8 @@ KoChart::Part* EmbeddedChart::chart()
  * EmbeddedPictureObject
  *
  **********************************************************/
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection )
-   : EmbeddedObject( _sheet, _geometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection )
+   : EmbeddedObject( _sheet, _tqgeometry )
 {
     imageCollection = _imageCollection;
     pen = KoPen( TQt::black, 1.0, Qt::NoPen );
@@ -706,8 +706,8 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom
 }
 
 
-EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
-    : EmbeddedObject( _sheet, _geometry )
+EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key )
+    : EmbeddedObject( _sheet, _tqgeometry )
 {
     imageCollection = _imageCollection;
 
@@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href/*.mid(1)*/);
-        const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+        const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
         image.setKey(key);
 
         KoStore* store = context.store();
@@ -1149,10 +1149,10 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin
 
 void EmbeddedPictureObject::drawShadow( TQPainter* /*_painter*/,  KoZoomHandler* /*_zoomHandler*/)
 {
-//     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 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();
 //
 //     _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_geometry.size() /*ext*/ ) );
+    TQSize size( _zoomHandler->zoomSize( m_tqgeometry.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_geometry.width() ) - 2.0 * penw ),
-                 (int)( _zoomHandler->zoomItY( /*ext*/m_geometry.height() ) - 2.0 * penw ) );
+                 (int)( _zoomHandler->zoomItX( /*ext*/m_tqgeometry.width() ) - 2.0 * penw ),
+                 (int)( _zoomHandler->zoomItY( /*ext*/m_tqgeometry.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_geometry/*ext*/.width() ) - 2 * penw ),
-//                           (int)( _zoomHandler->zoomItY( m_geometry/*ext*/.height() ) - 2 * penw ) );
+//                           (int)( _zoomHandler->zoomItX( m_tqgeometry/*ext*/.width() ) - 2 * penw ),
+//                           (int)( _zoomHandler->zoomItY( m_tqgeometry/*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_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 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 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 b66d67ac5..46074109a 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& _geometry );
+    EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry );
     virtual ~EmbeddedObject();
     virtual ObjType getType() const { return OBJECT_GENERAL; }
     virtual TQString getTypeString() const
         { return TQString(); }
 
-    KoRect geometry();
+    KoRect tqgeometry();
     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 &geometry ) const;
+    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const;
 
     virtual void removeFromObjList()
         { inObjList = false; }
@@ -217,7 +217,7 @@ class EmbeddedObject
      */
     void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom );
     
-    KoRect m_geometry;
+    KoRect m_tqgeometry;
     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& geometry );
+    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
     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& _geometry, KoPictureCollection *_imageCollection );
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, 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 3b84a3db3..6f38c25e3 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()->geometry()/*getRect()*/;
+                    KoRect oldRect = it.current()->tqgeometry()/*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()->geometry()/*getRect()*/;
+        generalValue.m_rect = it.current()->tqgeometry()/*getRect()*/;
         ++it;
     }
 
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index d0eb13d7e..09abcf8aa 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -29,9 +29,9 @@
 
 #include <tqapplication.h>
 #include <tqcheckbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpicture.h>
 #include <tqregexp.h>
@@ -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->geometry().toTQRect();
+	const TQRect chartGeometry = m_child->tqgeometry().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 repaint this chart */
+    /** TODO - replace the call below with something that will tqrepaint this chart */
 #endif
     //    sheet()->emit_polygonInvalidated( m_child->framePointArray() );
 }
@@ -222,12 +222,12 @@ TextDrag::~TextDrag()
 }
 
 
-TQByteArray TextDrag::encodedData( const char * mime ) const
+TQByteArray TextDrag::tqencodedData( const char * mime ) const
 {
   if ( strcmp( selectionMimeType(), mime ) == 0)
     return m_kspread;
   else
-    return TQTextDrag::encodedData( mime );
+    return TQTextDrag::tqencodedData( mime );
 }
 
 bool TextDrag::canDecode( TQMimeSource* e )
@@ -1819,7 +1819,7 @@ struct SetSelectionFirstLetterUpperWorker : public Sheet::CellWorker
   cell->setDisplayDirtyFlag();
   TQString tmp = cell->text();
   int len = tmp.length();
-  cell->setCellText( (tmp.at(0).upper()+tmp.right(len-1)) );
+  cell->setCellText( (tmp.tqat(0).upper()+tmp.right(len-1)) );
   cell->clearDisplayDirtyFlag();
     }
 };
@@ -3940,7 +3940,7 @@ void Sheet::swapCells( int x1, int y1, int x2, int y2, bool cpFormat )
     }
 
   // Dummy cell used for swapping cells.
-  // In fact we copy only content and no layout
+  // In fact we copy only content and no tqlayout
   // information. Imagine sorting in a sheet. Swapping
   // the format while sorting is not what you would expect
   // as a user.
@@ -5088,7 +5088,7 @@ void Sheet::copySelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::clipboard()->setData( kd );
+    TQApplication::tqclipboard()->setData( kd );
 }
 
 void Sheet::cutSelection( Selection* selectionInfo )
@@ -5107,7 +5107,7 @@ void Sheet::cutSelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::clipboard()->setData( kd );
+    TQApplication::tqclipboard()->setData( kd );
 
     deleteSelection( selectionInfo, true );
 }
@@ -5117,7 +5117,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
                    bool insert, int insertTo, bool pasteFC,
                    TQClipboard::Mode clipboardMode )
 {
-    TQMimeSource * mime = TQApplication::clipboard()->data( clipboardMode );
+    TQMimeSource * mime = TQApplication::tqclipboard()->data( clipboardMode );
     if ( !mime )
         return;
 
@@ -5125,13 +5125,13 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 
     if ( mime->provides( TextDrag::selectionMimeType() ) )
     {
-        b = mime->encodedData( TextDrag::selectionMimeType() );
+        b = mime->tqencodedData( TextDrag::selectionMimeType() );
     }
     else if( mime->provides( "text/plain" ) )
     {
-        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-)
-        TQString _text = TQApplication::clipboard()->text( clipboardMode );
+        TQString _text = TQApplication::tqclipboard()->text( clipboardMode );
         doc()->emitBeginOperation();
         pasteTextPlain( _text, pasteArea );
         emit sig_updateView( this );
@@ -5152,7 +5152,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
 void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea)
 {
 //  TQString tmp;
-//  tmp= TQString::fromLocal8Bit(_mime->encodedData( "text/plain" ));
+//  tmp= TQString::fromLocal8Bit(_mime->tqencodedData( "text/plain" ));
   if( _text.isEmpty() )
     return;
 
@@ -5523,14 +5523,14 @@ void Sheet::loadSelectionUndo(const TQDomDocument& d, const TQRect& loadArea,
 
 bool Sheet::testAreaPasteInsert()const
 {
-    TQMimeSource* mime = TQApplication::clipboard()->data( TQClipboard::Clipboard );
+    TQMimeSource* mime = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
     if ( !mime )
         return false;
 
     TQByteArray b;
 
     if ( mime->provides( "application/x-kspread-snippet" ) )
-        b = mime->encodedData( "application/x-kspread-snippet" );
+        b = mime->tqencodedData( "application/x-kspread-snippet" );
     else
         return false;
 
@@ -6129,7 +6129,7 @@ KoRect Sheet::getRealRect( bool all )
     {
 
         if ( all || ( it.current()->isSelected() && ! it.current()->isProtect() ) )
-            rect |= it.current()->geometry();
+            rect |= it.current()->tqgeometry();
     }
 
     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 geometry = it.current()->geometry();
-            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect br = doc()->zoomRect( geometry/*it.current()->geometry()*/ );
+            KoRect tqgeometry = it.current()->tqgeometry();
+            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect br = doc()->zoomRect( tqgeometry/*it.current()->tqgeometry()*/ );
             br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) );
             br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) );
-            canvas->repaint( br ); // Previous position
+            canvas->tqrepaint( 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 geometry = it.current()->geometry();
-            geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
-            TQRect oldBoundingRect = doc()->zoomRect( geometry );
+            KoRect tqgeometry = it.current()->tqgeometry();
+            tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() );
+            TQRect oldBoundingRect = doc()->zoomRect( tqgeometry );
 
 
-            KoRect r = it.current()->geometry();
+            KoRect r = it.current()->tqgeometry();
             r.moveBy( _move.x(), _move.y() );
 
             it.current()->setGeometry( r );
             _objects.append( it.current() );
 
-            canvas->repaint( oldBoundingRect );
+            canvas->tqrepaint( 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)").arg( count );
+        objectName += TQString(" (%1)").tqarg( count );
         object->setObjectName( objectName );
     }
 }
@@ -6418,16 +6418,16 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
                 if ( masterStyle )
                 {
                     loadSheetStyleFormat( masterStyle );
-                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-layout-name" ) )
+                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-tqlayout-name" ) )
                     {
-                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-layout-name", TQString() );
+                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() );
                         //kdDebug()<<"masterPageLayoutStyleName :"<<masterPageLayoutStyleName<<endl;
                         const TQDomElement *masterLayoutStyle = oasisContext.oasisStyles().findStyle( masterPageLayoutStyleName );
                       if ( masterLayoutStyle )
                       {
                         //kdDebug()<<"masterLayoutStyle :"<<masterLayoutStyle<<endl;
                         KoStyleStack styleStack;
-                        styleStack.setTypeProperties( "page-layout" );
+                        styleStack.setTypeProperties( "page-tqlayout" );
                         styleStack.push( *masterLayoutStyle );
                         loadOasisMasterLayoutPage( styleStack );
                       }
@@ -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() == "shapes" )
+                else if ( rowElement.localName() == "tqshapes" )
                     loadOasisObjects( rowElement, oasisContext );
             }
         }
@@ -6564,7 +6564,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
     TQString orientation = "Portrait";
     TQString format;
 
-    // Laurent : Why we stored layout information as Millimeter ?!!!!!
+    // Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
     // kspread used point for all other attribute
     // I don't understand :(
     if ( styleStack.hasAttributeNS( KoXmlNS::fo, "page-width" ) )
@@ -6685,7 +6685,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
             kdDebug()<<" table-centering unknown :"<<str<<endl;
 #endif
     }
-    format = TQString( "%1x%2" ).arg( width ).arg( height );
+    format = TQString( "%1x%2" ).tqarg( width ).tqarg( height );
     kdDebug()<<" format : "<<format<<endl;
     d->print->setPaperLayout( left, top, right, bottom, format, orientation );
 
@@ -6717,7 +6717,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         kdDebug() << "Repeated: " << number << endl;
     }
 
-    Format layout( this , doc()->styleManager()->defaultStyle() );
+    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
     if ( column.hasAttributeNS( KoXmlNS::table, "default-cell-style-name" ) )
     {
       const TQString styleName = column.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6726,7 +6726,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          layout.setStyle( style );
+          tqlayout.setStyle( style );
           isNonDefaultColumn = true;
         }
       }
@@ -6799,7 +6799,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
       {
         columnFormat = this->columnFormat( indexCol );
       }
-      columnFormat->copy( layout );
+      columnFormat->copy( tqlayout );
 
       ++indexCol;
     }
@@ -6828,7 +6828,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
     }
     styleStack.setTypeProperties( "table-row" );
 
-    Format layout( this , doc()->styleManager()->defaultStyle() );
+    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
     if ( row.hasAttributeNS( KoXmlNS::table,"default-cell-style-name" ) )
     {
       const TQString styleName = row.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6837,7 +6837,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          layout.setStyle( style );
+          tqlayout.setStyle( style );
           isNonDefaultRow = true;
         }
       }
@@ -6908,7 +6908,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
       {
         rowFormat = this->rowFormat( rowIndex );
       }
-      rowFormat->copy( layout );
+      rowFormat->copy( tqlayout );
 
       ++rowIndex;
     }
@@ -7171,7 +7171,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const
                     TQDomElement t = dd.createElement( "text:date" );
                     t.setAttribute( "text:date-value", "0-00-00" );
                     // todo: "style:data-style-name", "N2"
-                    t.appendChild( dd.createTextNode( TQDate::currentDate().toString() ) );
+                    t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) );
                     parent.appendChild( t );
 #endif
                 }
@@ -7355,7 +7355,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles )
     KoGenStyle pageStyle( Doc::STYLE_PAGE, "table"/*FIXME I don't know if name is sheet*/ );
 
     KoGenStyle pageMaster( Doc::STYLE_PAGEMASTER );
-    pageMaster.addAttribute( "style:page-layout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
+    pageMaster.addAttribute( "style:page-tqlayout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
 
     TQBuffer buffer;
     buffer.open( IO_WriteOnly );
@@ -7391,7 +7391,7 @@ void Sheet::saveOasisColRowCell( KoXmlWriter& xmlWriter, KoGenStyles &mainStyles
         currentColumnStyle.addPropertyPt( "style:column-width", column->dblWidth() );
         currentColumnStyle.addProperty( "fo:break-before", "auto" );/*FIXME auto or not ?*/
 
-        //style default layout for column
+        //style default tqlayout for column
         KoGenStyle currentDefaultCellStyle; // the type is determined in saveOasisCellStyle
         TQString currentDefaultCellStyleName = column->saveOasisCellStyle( currentDefaultCellStyle, mainStyles );
 
@@ -7774,7 +7774,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
         // we just ignore 'ok' - if it didn't work, go on
     }
 
-    // Load the paper layout
+    // Load the paper tqlayout
     TQDomElement paper = sheet.namedItem( "paper" ).toElement();
     if ( !paper.isNull() )
     {
@@ -8071,7 +8071,7 @@ void Sheet::updateCell( Cell */*cell*/, int _column, int _row )
   updateCellArea(cellArea);
 }
 
-void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint )
+void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint )
 {
     if ( doc()->isLoading() )
         return;
@@ -8081,7 +8081,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint )
       if ( c->row() == _row )
           c->setLayoutDirtyFlag( true );
 
-    if ( repaint )
+    if ( tqrepaint )
     {
         //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" ).arg( _path ).arg( i++ );
+            TQString path = TQString( "%1/%2" ).tqarg( _path ).tqarg( 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:shapes" );
+        xmlWriter.startElement( "table:tqshapes" );
         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]").arg( cell->value().asString() );
+                    cellDescr += TQString("  [result: %1]").tqarg( cell->value().asString() );
                 kdDebug(36001) << cellDescr << endl;
             }
         }
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 723e6807c..5d907810a 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -22,7 +22,7 @@
 #ifndef KSPREAD_SHEET
 #define KSPREAD_SHEET
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdragobject.h>
 #include <tqintdict.h>
 #include <tqmemarray.h>
@@ -160,7 +160,7 @@ public:
     void setPlain( TQString const & _plain ) { setText( _plain ); }
     void setKSpread( TQByteArray const & _kspread ) { m_kspread = _kspread; }
 
-    virtual TQByteArray encodedData( const char * mime ) const;
+    virtual TQByteArray tqencodedData( const char * mime ) const;
     virtual const char* format( int i ) const;
 
     static bool canDecode( TQMimeSource * e );
@@ -240,11 +240,11 @@ public:
     Doc* doc() const;
 
     /**
-     * Saves the sheet and all it's children in XML format
+     * Saves the sheet and all it's tqchildren in XML format
      */
     virtual TQDomElement saveXML( TQDomDocument& );
     /**
-     * Loads the sheet and all it's children in XML format
+     * Loads the sheet and all it's tqchildren in XML format
      */
     virtual bool loadXML( const TQDomElement& );
 
@@ -259,12 +259,12 @@ public:
     void saveOasisPrintStyleLayout( KoGenStyle &style ) const;
 
     /**
-     * Saves a children
+     * Saves a tqchildren
      */
     virtual bool saveChildren( KoStore* _store, const TQString &_path );
     bool saveOasisObjects( KoStore *store, KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, int & indexObj, int &partIndexObj );
     /**
-     * Loads a children
+     * Loads a tqchildren
      */
     virtual bool loadChildren( KoStore* _store );
 
@@ -305,13 +305,13 @@ public:
     void unifyObjectName( EmbeddedObject *object );
 
     /**
-     * Returns the layout direction of the sheet.
+     * Returns the tqlayout direction of the sheet.
      */
     LayoutDirection layoutDirection() const;
 
     /**
-     * Sets the layout direction of the sheet. For example, for Arabic or Hebrew
-     * documents, it is possibly to layout the sheet from right to left.
+     * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew
+     * documents, it is possibly to tqlayout the sheet from right to left.
      */
     void setLayoutDirection( LayoutDirection dir );
 
@@ -991,9 +991,9 @@ public:
     void autofill( TQRect &src, TQRect &dest );
 
 
-    bool insertChild( const KoRect& _geometry, KoDocumentEntry& );
+    bool insertChild( const KoRect& _tqgeometry, KoDocumentEntry& );
 
-    bool insertChart( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data );
+    bool insertChart( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data );
 
 
     /**
@@ -1016,9 +1016,9 @@ public:
      */
     bool insertPicture( const KoPoint& point, const TQPixmap& pixmap );
 
-    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _geometry );
+    void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry );
 
-    const TQColorGroup& colorGroup() { return widget()->colorGroup(); }
+    const TQColorGroup& tqcolorGroup() { return widget()->tqcolorGroup(); }
 
     int id() const;
 
@@ -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 repaint of the border, when it is out of range.
+     * Use this function with care, as it involves a tqrepaint 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 repaint of the border, when it is out of range.
+     * Use this function with care, as it involves a tqrepaint of the border, when it is out of range.
      */
     void checkRangeVBorder ( int _row );
 
@@ -1064,7 +1064,7 @@ public:
 #endif
 
     /**
-     * Calculates the cell if necessary, makes its layout if necessary,
+     * Calculates the cell if necessary, makes its tqlayout if necessary,
      * and force redraw.
      * Then it sets the cell's @ref Cell::m_bDisplayDirtyFlag to false.
      */
@@ -1102,7 +1102,7 @@ public:
      */
     void refreshView(const Region& region);
 
-    void emit_updateRow( RowFormat *_format, int _row, bool repaint = true );
+    void emit_updateRow( RowFormat *_format, int _row, bool tqrepaint = true );
     void emit_updateColumn( ColumnFormat *_format, int _column );
 
     /**
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index a70445eb7..c3c12117e 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -126,8 +126,8 @@ TQRect SheetPrint::cellsPrintRange()
         }
     }
 
-    // Now look at the children
-    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->children() );
+    // Now look at the tqchildren
+    TQPtrListIterator<KoDocumentChild> cit( m_pDoc->tqchildren() );
     double dummy;
     int i;
     for( ; cit.current(); ++cit )
@@ -190,7 +190,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range )
 	    }
                // filled = true;
 
-    //Page empty, but maybe children on it?
+    //Page empty, but maybe tqchildren 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->children() );
+        TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
         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()->geometry() );
+      TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->tqgeometry() );
       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 children
+    // Draw the tqchildren
     //
     TQRect zoomedView = m_pDoc->zoomRect( view );
-    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() );
+    //TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() );
     //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")
-//        .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());
+//        .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());
 //        kdDebug(36001)<<tmp<<" offset "<<_childOffset.x()<<"/"<<_childOffset.y()<<endl;
 
-          KoRect const bound = obj->geometry();
+          KoRect const bound = obj->tqgeometry();
           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->geometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
+            painter.drawPixmap( m_pDoc->zoomRect( obj->tqgeometry() ).topLeft(), *(*itObject)->p ); //draw the cached object
 
             //painter.fillRect(zoomedBound, TQBrush("red")); //for debug purpose
             painter.restore();
         }
     }
 
-    //Don't let obscuring cells and children overpaint this area
+    //Don't let obscuring cells and tqchildren overpaint this area
     clipRegion -= TQRegion ( m_pDoc->zoomItX( leftBorderPts() + topLeft.x() ),
                             m_pDoc->zoomItY( topBorderPts() + topLeft.y() ),
                             m_pDoc->zoomItX( xpos ),
@@ -1273,7 +1273,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ
         fileName="";
 
     TQString t(TQTime::currentTime().toString());
-    TQString d(TQDate::currentDate().toString());
+    TQString d(TQDate::tqcurrentDate().toString());
     TQString ta;
     if ( !_sheet.isEmpty() )
         ta = _sheet;
@@ -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").arg(p->pw_name).arg(hostname);
+	email_addr = TQString("%1@%2").tqarg(p->pw_name).tqarg(hostname);
 
     tmp = _data;
     int pos = 0;
diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h
index 1f22dc7da..0062476dc 100644
--- a/kspread/kspread_sheetprint.h
+++ b/kspread/kspread_sheetprint.h
@@ -148,12 +148,12 @@ public:
     void setPaperOrientation(KoOrientation _orient);
 
     /**
-     * Returns the page layout
+     * Returns the page tqlayout
      */
     KoPageLayout paperLayout() const;
 
      /**
-     * Changes the paper layout and repaints the currently displayed Sheet.
+     * Changes the paper tqlayout and repaints the currently displayed Sheet.
      */
     void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder,
                          KoFormat _paper, KoOrientation orientation );
@@ -449,7 +449,7 @@ private:
      *             the printing frame.
      *
      * @param _childOffset KoPoint used to calculate the correct position of
-     *                     children, if there are repeated columns/rows.
+     *                     tqchildren, 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 children
+     * It respects the printrange and the tqchildren
      */
     TQRect cellsPrintRange();
 
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index dc8b7add2..af5b91a1b 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -134,7 +134,7 @@ bool Style::operator == (const Style& style) const
   if ( m_type != style.m_type )
     return false;
   // NOTE Stefan: Only compare the values of the set features.
-  if ( // layout (4)
+  if ( // tqlayout (4)
        ( m_featuresSet & SAlignX ) && ( m_alignX != style.m_alignX ) ||
        ( m_featuresSet & SAlignY ) && ( m_alignY != style.m_alignY ) ||
        ( m_featuresSet & SAngle )  && ( m_rotateAngle != style.m_rotateAngle ) ||
diff --git a/kspread/kspread_style.h b/kspread/kspread_style.h
index a0e7f0d51..2ae6299cf 100644
--- a/kspread/kspread_style.h
+++ b/kspread/kspread_style.h
@@ -20,7 +20,7 @@
 #ifndef __kspread_style__
 #define __kspread_style__
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqpen.h>
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index d2b6edcdc..06e7a6891 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -22,7 +22,7 @@
 
 #include <twin.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqobjectlist.h>
 
@@ -59,7 +59,7 @@ void ToolBox::setEnabled( bool enable )
     }
     else
     {
-	if ( focusWidget() == this )
+	if ( tqfocusWidget() == this )
 	    focusNextPrevChild( TRUE );
 	TQObjectList clo = childrenListObject();
 	if ( !clo.isEmpty() )
@@ -97,12 +97,12 @@ void ToolBox::childEvent( TQChildEvent* ev )
 {
     if ( ev->inserted() && ev->child()->isWidgetType() )
 	m_layout->addWidget( (TQWidget*)ev->child() );
-    resize( sizeHint() );
+    resize( tqsizeHint() );
 }
 
 void ToolBox::mousePressEvent( TQMouseEvent* ev )
 {
-    m_startPos = geometry().topLeft();
+    m_startPos = tqgeometry().topLeft();
     m_mousePos = ev->globalPos();
 }
 
diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc
index 28f592651..6036344ca 100644
--- a/kspread/kspread_undo.cc
+++ b/kspread/kspread_undo.cc
@@ -266,7 +266,7 @@ UndoRemoveColumn::UndoRemoveColumn( Doc *_doc, Sheet *_sheet, int _column,int _n
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -385,7 +385,7 @@ UndoRemoveRow::UndoRemoveRow( Doc *_doc, Sheet *_sheet, int _row,int _nbRow) :
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -942,20 +942,20 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
     /* Don't need to go through the loop twice...
       for (int i = range.left(); i <= right; ++i)
       {
-      layoutColumn tmplayout;
-      tmplayout.col = i;
-      tmplayout.l = new ColumnFormat( sheet, i );
-      tmplayout.l->copy( *(sheet->columnFormat( i )) );
-      listCol.append(tmplayout);
+      layoutColumn tmptqlayout;
+      tmptqlayout.col = i;
+      tmptqlayout.l = new ColumnFormat( sheet, i );
+      tmptqlayout.l->copy( *(sheet->columnFormat( i )) );
+      listCol.append(tmptqlayout);
       }
     */
     for ( int c = range.left(); c <= right; ++c )
     {
-      layoutColumn tmplayout;
-      tmplayout.col = c;
-      tmplayout.l = new ColumnFormat( sheet, c );
-      tmplayout.l->copy( *(sheet->columnFormat( c )) );
-      listCol.append(tmplayout);
+      layoutColumn tmptqlayout;
+      tmptqlayout.col = c;
+      tmptqlayout.l = new ColumnFormat( sheet, c );
+      tmptqlayout.l->copy( *(sheet->columnFormat( c )) );
+      listCol.append(tmptqlayout);
 
       cell = sheet->getFirstCellColumn( c );
       while ( cell )
@@ -966,12 +966,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
           continue;
         }
 
-        layoutCell tmplayout;
-        tmplayout.col = c;
-        tmplayout.row = cell->row();
-        tmplayout.l = new Format( sheet, 0 );
-        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
-        list.append(tmplayout);
+        layoutCell tmptqlayout;
+        tmptqlayout.col = c;
+        tmptqlayout.row = cell->row();
+        tmptqlayout.l = new Format( sheet, 0 );
+        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
+        list.append(tmptqlayout);
 
         cell = sheet->getNextCellDown( c, cell->row() );
       }
@@ -984,12 +984,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
       if ( range.left() <= col && right >= col
           && !c->isPartOfMerged())
       {
-        layoutCell tmplayout;
-        tmplayout.col = c->column();
-        tmplayout.row = c->row();
-        tmplayout.l = new Format( sheet, 0 );
-        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) );
-        list.append(tmplayout);
+        layoutCell tmptqlayout;
+        tmptqlayout.col = c->column();
+        tmptqlayout.row = c->row();
+        tmptqlayout.l = new Format( sheet, 0 );
+        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+        list.append(tmptqlayout);
       }
       }
     */
@@ -998,11 +998,11 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
   {
     for ( int row = range.top(); row <= bottom; ++row )
     {
-      layoutRow tmplayout;
-      tmplayout.row = row;
-      tmplayout.l = new RowFormat( sheet, row );
-      tmplayout.l->copy( *(sheet->rowFormat( row )) );
-      listRow.append(tmplayout);
+      layoutRow tmptqlayout;
+      tmptqlayout.row = row;
+      tmptqlayout.l = new RowFormat( sheet, row );
+      tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
+      listRow.append(tmptqlayout);
 
       cell = sheet->getFirstCellRow( row );
       while ( cell )
@@ -1012,12 +1012,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
           cell = sheet->getNextCellRight( cell->column(), row );
           continue;
         }
-        layoutCell tmplayout;
-        tmplayout.col = cell->column();
-        tmplayout.row = row;
-        tmplayout.l = new Format( sheet, 0 );
-        tmplayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) );
-        list.append(tmplayout);
+        layoutCell tmptqlayout;
+        tmptqlayout.col = cell->column();
+        tmptqlayout.row = row;
+        tmptqlayout.l = new Format( sheet, 0 );
+        tmptqlayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) );
+        list.append(tmptqlayout);
 
         cell = sheet->getNextCellRight( cell->column(), row );
       }
@@ -1030,12 +1030,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
       if ( range.top() <= row && bottom >= row
            && !c->isPartOfMerged())
       {
-        layoutCell tmplayout;
-        tmplayout.col = c->column();
-        tmplayout.row = c->row();
-        tmplayout.l = new Format( sheet, 0 );
-        tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) );
-        list.append(tmplayout);
+        layoutCell tmptqlayout;
+        tmptqlayout.col = c->column();
+        tmptqlayout.row = c->row();
+        tmptqlayout.l = new Format( sheet, 0 );
+        tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+        list.append(tmptqlayout);
       }
       }
     */
@@ -1048,12 +1048,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
         Cell * cell = sheet->nonDefaultCell( x, y );
         if ( !cell->isPartOfMerged() )
         {
-          layoutCell tmplayout;
-          tmplayout.col = x;
-          tmplayout.row = y;
-          tmplayout.l = new Format( sheet, 0 );
-          tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) );
-          list.append(tmplayout);
+          layoutCell tmptqlayout;
+          tmptqlayout.col = x;
+          tmptqlayout.row = y;
+          tmptqlayout.l = new Format( sheet, 0 );
+          tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) );
+          list.append(tmptqlayout);
         }
       }
   }
@@ -1265,24 +1265,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
     Cell * c;
     for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col)
     {
-      layoutColumn tmplayout;
-      tmplayout.col = col;
-      tmplayout.l = new ColumnFormat( sheet, col );
-      tmplayout.l->copy( *(sheet->columnFormat( col )) );
-      listCol.append(tmplayout);
+      layoutColumn tmptqlayout;
+      tmptqlayout.col = col;
+      tmptqlayout.l = new ColumnFormat( sheet, col );
+      tmptqlayout.l->copy( *(sheet->columnFormat( col )) );
+      listCol.append(tmptqlayout);
 
       c = sheet->getFirstCellColumn( col );
       while ( c )
       {
         if ( !c->isPartOfMerged() )
         {
-          layoutTextCell tmplayout;
-          tmplayout.col = col;
-          tmplayout.row = c->row();
-          tmplayout.l = new Format( sheet, 0 );
-          tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
-          tmplayout.text = c->text();
-          list.append(tmplayout);
+          layoutTextCell tmptqlayout;
+          tmptqlayout.col = col;
+          tmptqlayout.row = c->row();
+          tmptqlayout.l = new Format( sheet, 0 );
+          tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
+          tmptqlayout.text = c->text();
+          list.append(tmptqlayout);
         }
 
         c = sheet->getNextCellDown( col, c->row() );
@@ -1294,24 +1294,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
     Cell * c;
     for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row)
     {
-      layoutRow tmplayout;
-      tmplayout.row = row;
-      tmplayout.l = new RowFormat( sheet, row );
-      tmplayout.l->copy( *(sheet->rowFormat( row )) );
-      listRow.append(tmplayout);
+      layoutRow tmptqlayout;
+      tmptqlayout.row = row;
+      tmptqlayout.l = new RowFormat( sheet, row );
+      tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
+      listRow.append(tmptqlayout);
 
       c = sheet->getFirstCellRow( row );
       while ( c )
       {
         if ( !c->isPartOfMerged() )
         {
-          layoutTextCell tmplayout;
-          tmplayout.col = c->column();
-          tmplayout.row = row;
-          tmplayout.l   = new Format( sheet, 0 );
-          tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
-          tmplayout.text = c->text();
-          list.append(tmplayout);
+          layoutTextCell tmptqlayout;
+          tmptqlayout.col = c->column();
+          tmptqlayout.row = row;
+          tmptqlayout.l   = new Format( sheet, 0 );
+          tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
+          tmptqlayout.text = c->text();
+          list.append(tmptqlayout);
         }
         c = sheet->getNextCellRight( c->column(), row );
       }
@@ -1328,13 +1328,13 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol
         cell = sheet->nonDefaultCell( x, y );
         if (!cell->isPartOfMerged())
         {
-          layoutTextCell tmplayout;
-          tmplayout.col = x;
-          tmplayout.row = y;
-          tmplayout.l   = new Format( sheet, 0 );
-          tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) );
-          tmplayout.text = cell->text();
-          list.append(tmplayout);
+          layoutTextCell tmptqlayout;
+          tmptqlayout.col = x;
+          tmptqlayout.row = y;
+          tmptqlayout.l   = new Format( sheet, 0 );
+          tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) );
+          tmptqlayout.text = cell->text();
+          list.append(tmptqlayout);
         }
       }
   }
@@ -1557,7 +1557,7 @@ void UndoDelete::createListCell( TQCString &listCell,TQValueList<columnSize> &li
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2243,7 +2243,7 @@ void UndoAutofill::createListCell( TQCString &list, Sheet* sheet )
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2400,7 +2400,7 @@ UndoRemoveCellRow::UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const TQRect &re
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2459,7 +2459,7 @@ UndoRemoveCellCol::UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_r
     TQTextStream str( &buffer, IO_WriteOnly );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2529,7 +2529,7 @@ void UndoConditional::createListCell( TQCString &list, Sheet* sheet )
     TQDomDocument doc = sheet->saveCellRegion( m_region );
     str << doc;
 
-    // This is a terrible hack to store unicode
+    // This is a terrible hack to store tqunicode
     // data in a TQCString in a way that
     // TQCString::length() == TQCString().size().
     // This allows us to treat the TQCString like a TQByteArray later on.
@@ -2671,7 +2671,7 @@ void UndoCellPaste::createListCell(TQCString& listCell,
   TQTextStream str( &buffer, IO_WriteOnly );
   str << doc;
 
-  // This is a terrible hack to store unicode
+  // This is a terrible hack to store tqunicode
   // data in a TQCString in a way that
   // TQCString::length() == TQCString().size().
   // This allows us to treat the TQCString like a TQByteArray later on.
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc
index e84f1d47b..47edd2ace 100644
--- a/kspread/kspread_util.cc
+++ b/kspread/kspread_util.cc
@@ -53,7 +53,7 @@ bool KSpread::formatIsFraction (FormatType fmt)
 
 
 //used in Point::init, Cell::encodeFormula and
-//  dialogs/kspread_dlg_paperlayout.cc
+//  dialogs/kspread_dlg_papertqlayout.cc
 int KSpread::util_decodeColumnLabelText( const TQString &_col )
 {
     int col = 0;
@@ -72,20 +72,20 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col )
     return col;
 }
 
-//used in dialogs/kspread_dlg_paperlayout.cc
+//used in dialogs/kspread_dlg_papertqlayout.cc
 TQString KSpread::util_rangeColumnName( const TQRect &_area)
 {
     return TQString("%1:%2")
-        .arg( Cell::columnName( _area.left()))
-        .arg( Cell::columnName(_area.right()));
+        .tqarg( Cell::columnName( _area.left()))
+        .tqarg( Cell::columnName(_area.right()));
 }
 
-//used in dialogs/kspread_dlg_paperlayout.cc
+//used in dialogs/kspread_dlg_papertqlayout.cc
 TQString KSpread::util_rangeRowName( const TQRect &_area)
 {
     return TQString("%1:%2")
-        .arg( _area.top())
-        .arg(_area.bottom());
+        .tqarg( _area.top())
+        .tqarg(_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 " ).arg( (pen.width() == 0) ? 1 : pen.width() );
+    TQString s = TQString( "%1pt " ).tqarg( (pen.width() == 0) ? 1 : pen.width() );
     switch( pen.style() )
     {
     case TQt::NoPen:
@@ -1065,7 +1065,7 @@ TQString KSpread::Oasis::decodeFormula(const TQString& expr, const KLocale* loca
        }
 
        // [ marks sheet name for 3-d cell, e.g ['Sales Q3'.A4]
-       else if ( ch.unicode() == '[' )
+       else if ( ch.tqunicode() == '[' )
        {
          ++i;
          state = InReference;
diff --git a/kspread/kspread_value.cc b/kspread/kspread_value.cc
index a4532fdc4..898abd11b 100644
--- a/kspread/kspread_value.cc
+++ b/kspread/kspread_value.cc
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <float.h>
 #include <math.h>
diff --git a/kspread/kspread_value.h b/kspread/kspread_value.h
index b43ac9097..0c76e40f1 100644
--- a/kspread/kspread_value.h
+++ b/kspread/kspread_value.h
@@ -22,7 +22,7 @@
 
 #include <tqdatetime.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <koffice_export.h>
 
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 67b326e56..cb947f34e 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -35,9 +35,9 @@
 
 // TQt includes
 #include <tqbuffer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
@@ -237,7 +237,7 @@ public:
 
     TQPopupMenu *popupRow;
     TQPopupMenu *popupColumn;
-    TQPopupMenu* popupChild;       // for embedded children
+    TQPopupMenu* popupChild;       // for embedded tqchildren
     TQPopupMenu* popupListChoose;  // for list of choose
 
     // the child for which the popup menu has been opened.
@@ -911,7 +911,7 @@ void View::Private::initActions()
 
   actions->paperLayout = new KAction( i18n("Page Layout..."),
       0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" );
-  actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout."));
+  actions->paperLayout->setToolTip(i18n("Specify the tqlayout of the spreadsheet for a printout."));
 
   actions->definePrintRange = new KAction( i18n("Define Print Range"),
       0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" );
@@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/)
 
 TQString KPSheetSelectPage::printOptionForIndex(unsigned int index)
 {
-  return TQString("sheetprintorder%1").arg(index);
+  return TQString("sheetprintorder%1").tqarg(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
-    // repaint, etc.etc. :-) (Simon)
+    // tqrepaint, etc.etc. :-) (Simon)
 
     delete d->selection;
     delete d->choice;
@@ -1968,8 +1968,8 @@ void View::initView()
 
     d->hBorderWidget = new HBorder( this, d->canvas,this );
     d->vBorderWidget = new VBorder( this, d->canvas ,this );
-    d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+    d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     d->canvas->setFocusPolicy( TQ_StrongFocus );
     TQWidget::setFocusPolicy( TQ_StrongFocus );
@@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet )
   if ( updateSheet )
   {
     d->tabBar->setActiveTab( _t->sheetName() );
-    d->vBorderWidget->repaint();
-    d->hBorderWidget->repaint();
+    d->vBorderWidget->tqrepaint();
+    d->hBorderWidget->tqrepaint();
     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->repaint();
-    d->hBorderWidget->repaint();
+    d->vBorderWidget->tqrepaint();
+    d->hBorderWidget->tqrepaint();
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
     t->setRegionPaintDirty( t->visibleRect( d->canvas ) );
@@ -4135,7 +4135,7 @@ void View::paste()
   if (!koDocument()->isReadWrite()) // don't paste into a read only document
     return;
 
-  TQMimeSource *data = TQApplication::clipboard()->data( TQClipboard::Clipboard );
+  TQMimeSource *data = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
   for ( int i=0; data->format(i) != 0; i++ )
     kdDebug() << "format:" << data->format(i) << endl;
 
@@ -4143,7 +4143,7 @@ void View::paste()
   {
     canvasWidget()->deselectAllObjects();
     TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet";
-    const TQByteArray arr = data->encodedData( returnedTypeMime );
+    const TQByteArray arr = data->tqencodedData( returnedTypeMime );
     if( arr.isEmpty() )
       return;
     TQBuffer buffer( arr );
@@ -4206,7 +4206,7 @@ void View::paste()
   else
   {
     //TODO:  What if the clipboard data is available in both pixmap and OASIS format? (ie. for embedded parts)
-    TQPixmap clipboardPixmap = TQApplication::clipboard()->pixmap( TQClipboard::Clipboard );
+    TQPixmap clipboardPixmap = TQApplication::tqclipboard()->pixmap( TQClipboard::Clipboard );
     if (!clipboardPixmap.isNull())
     {
         d->activeSheet->insertPicture( markerDocumentPosition()  , clipboardPixmap );
@@ -4914,7 +4914,7 @@ void View::setupPrinter( KPrinter &prt )
 
     SheetPrint* print = d->activeSheet->print();
 
-    //apply page layout parameters
+    //apply page tqlayout parameters
     KoFormat pageFormat = print->paperFormat();
 
     prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) );
@@ -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").arg(*sheetlistiterator) << endl;
+          kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*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.").arg(
+                i18n("Nothing to print for sheet %1.").tqarg(
                 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& _geometry, KoDocumentEntry& _e )
+void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
 {
     if ( !d->activeSheet )
       return;
 
     // Transform the view coordinates to document coordinates
-    KoRect unzoomedRect = doc()->unzoomRect( _geometry );
+    KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
     unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
     InsertObjectCommand *cmd = 0;
@@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e )
     cmd->execute();
 }
 
-void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e )
+void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e )
 {
   if ( !d->activeSheet )
     return;
 
   // Transform the view coordinates to document coordinates
-  KoRect unzoomedRect = doc()->unzoomRect( _geometry );
+  KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
   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->geometry() == f->partGeometry() )
+  if ( _child->tqgeometry() == f->partGeometry() )
     return;
 
   // TODO zooming
-  f->setPartGeometry( _child->geometry() );
+  f->setPartGeometry( _child->tqgeometry() );
     */
 }
 
@@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ )
 //                 return 0;
 //     }
 //
-//     TQPtrListIterator<KoDocumentChild> it( doc()->children() );
+//     TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() );
 //     for (; it.current(); ++it )
 //     {
 //         // Is the child document on the visible sheet ?
@@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( )
 
   if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
-    p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 );
+    p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 );
   }
 
   d->popupListChoose->popup( p2 );
@@ -6401,7 +6401,7 @@ void View::styleDialog()
     d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) );
   }
   if ( d->canvas )
-    d->canvas->repaint();
+    d->canvas->tqrepaint();
 }
 
 void View::paperLayoutDlg()
@@ -6748,9 +6748,9 @@ void View::zoomMinus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 
 void View::zoomPlus()
@@ -6763,9 +6763,9 @@ void View::zoomPlus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 */
 
@@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet )
 void View::slotRefreshView()
 {
   refreshView();
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 
 void View::slotUpdateView( Sheet *_sheet )
@@ -7209,7 +7209,7 @@ void View::transformPart()
 
     if ( d->transformToolBox.isNull() )
     {
-        d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() );
+        d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() );
         d->transformToolBox->show();
 
         d->transformToolBox->setDocumentChild( selectedChild() );
@@ -7537,7 +7537,7 @@ void View::runInspector()
 
 TQColor View::highlightColor()
 {
-    return TQApplication::palette().active().highlight().light( 175 );
+    return TQApplication::tqpalette().active().highlight().light( 175 );
 }
 
 } // namespace KSpread
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index f9ce1bdd6..2dfecfa54 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -253,22 +253,22 @@ public:
 
     /**
      *
-     * @param _geometry is the zoomed geometry of the new child.
+     * @param _tqgeometry is the zoomed tqgeometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChart( const TQRect& _geometry, KoDocumentEntry& _entry );
+    void insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
     /**
      *
-     * @param _geometry is the geometry of the new child.
+     * @param _tqgeometry is the tqgeometry of the new child.
      * @param _entry is the entry to insert.
      *
      * @todo check validity of @p _entry docs.
      */
-    void insertChild( const TQRect& _geometry, KoDocumentEntry& _entry );
+    void insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _entry );
 
-   // void insertPicture( const TQRect& _geometry, KURL& _file );
+   // void insertPicture( const TQRect& _tqgeometry, 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 repaint)
+     * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint)
      * They will be repainted on the next call to paintUpdates()
      */
     void markSelectionAsDirty();
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index f1a5838b4..bed111ba0 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
       /* Don't need to go through the loop twice...
         for (int i = range.left(); i <= right; ++i)
         {
-        layoutColumn tmplayout;
-        tmplayout.col = i;
-        tmplayout.l = new ColumnFormat( m_sheet, i );
-        tmplayout.l->copy( *(m_sheet->columnFormat( i )) );
-        listCol.append(tmplayout);
+        layoutColumn tmptqlayout;
+        tmptqlayout.col = i;
+        tmptqlayout.l = new ColumnFormat( m_sheet, i );
+        tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) );
+        listCol.append(tmptqlayout);
         }
       */
       for ( int col = range.left(); col <= right; ++col )
       {
-        layoutColumn tmplayout;
-        tmplayout.col = col;
-        tmplayout.l = new ColumnFormat( m_sheet, col );
-        tmplayout.l->copy( *(m_sheet->columnFormat( col )) );
-        listCol.append(tmplayout);
+        layoutColumn tmptqlayout;
+        tmptqlayout.col = col;
+        tmptqlayout.l = new ColumnFormat( m_sheet, col );
+        tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) );
+        listCol.append(tmptqlayout);
 
         cell = m_sheet->getFirstCellColumn( col );
         while ( cell )
@@ -469,12 +469,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
             continue;
           }
 
-          layoutCell tmplayout;
-          tmplayout.col = col;
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )->format()) );
-          list.append(tmplayout);
+          layoutCell tmptqlayout;
+          tmptqlayout.col = col;
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) );
+          list.append(tmptqlayout);
 
           cell = m_sheet->getNextCellDown( col, cell->row() );
         }
@@ -487,12 +487,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
         if ( range.left() <= col && right >= col
             && !cell->isPartOfMerged())
         {
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
-          list.append(tmplayout);
+          layoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+          list.append(tmptqlayout);
         }
         }
       */
@@ -501,11 +501,11 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
     {
       for ( int row = range.top(); row <= bottom; ++row )
       {
-        layoutRow tmplayout;
-        tmplayout.row = row;
-        tmplayout.l = new RowFormat( m_sheet, row );
-        tmplayout.l->copy( *(m_sheet->rowFormat( row )) );
-        listRow.append(tmplayout);
+        layoutRow tmptqlayout;
+        tmptqlayout.row = row;
+        tmptqlayout.l = new RowFormat( m_sheet, row );
+        tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) );
+        listRow.append(tmptqlayout);
 
         cell = m_sheet->getFirstCellRow( row );
         while ( cell )
@@ -515,12 +515,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
             cell = m_sheet->getNextCellRight( cell->column(), row );
             continue;
           }
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = row;
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
-          list.append(tmplayout);
+          layoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = row;
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) );
+          list.append(tmptqlayout);
 
           cell = m_sheet->getNextCellRight( cell->column(), row );
         }
@@ -533,12 +533,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
         if ( range.top() <= row && bottom >= row
             && !cell->isPartOfMerged())
         {
-          layoutCell tmplayout;
-          tmplayout.col = cell->column();
-          tmplayout.row = cell->row();
-          tmplayout.l = new Format( m_sheet, 0 );
-          tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) );
-          list.append(tmplayout);
+          layoutCell tmptqlayout;
+          tmptqlayout.col = cell->column();
+          tmptqlayout.row = cell->row();
+          tmptqlayout.l = new Format( m_sheet, 0 );
+          tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) );
+          list.append(tmptqlayout);
         }
         }
       */
@@ -551,12 +551,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
           Cell * cell = m_sheet->nonDefaultCell( col, row );
           if ( !cell->isPartOfMerged() )
           {
-            layoutCell tmplayout;
-            tmplayout.col = col;
-            tmplayout.row = row;
-            tmplayout.l = new Format( m_sheet, 0 );
-            tmplayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
-            list.append(tmplayout);
+            layoutCell tmptqlayout;
+            tmptqlayout.col = col;
+            tmptqlayout.row = row;
+            tmptqlayout.l = new Format( m_sheet, 0 );
+            tmptqlayout.l->copy( *(m_sheet->cellAt( col, row )->format()) );
+            list.append(tmptqlayout);
           }
         }
     }
@@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r
   if ( cell->textWidth() > long_max )
   {
     double indent = 0.0;
-    Format::Align alignment = cell->format()->align(cell->column(), cell->row());
-    if (alignment == Format::Undefined)
+    Format::Align tqalignment = cell->format()->align(cell->column(), cell->row());
+    if (tqalignment == Format::Undefined)
     {
       if (cell->value().isNumber() || cell->isDate() || cell->isTime())
       {
-        alignment = Format::Right;
+        tqalignment = Format::Right;
       }
       else
       {
-        alignment = Format::Left;
+        tqalignment = Format::Left;
       }
     }
 
-    if (alignment == Format::Left)
+    if (tqalignment == Format::Left)
     {
       indent = cell->format()->getIndent( cell->column(), cell->row() );
     }
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index e02d914dd..cec641931 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // Undefine HAVE_LONG_DOUBLE for Beta 4 since RedHat 5.0 comes with a borken
 // glibc
@@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct)
   lay1->setSpacing( KDialog::spacingHint() );
 
   box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box");
-  box->layout()->setSpacing(KDialog::spacingHint());
-  box->layout()->setMargin(KDialog::marginHint());
+  box->tqlayout()->setSpacing(KDialog::spacingHint());
+  box->tqlayout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2);
+  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2);
   label1 = new TQLabel(box);
   label1->setText(i18n("Foreground color:"));
   grid1->addWidget(label1,0,0);
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index b15f844ce..4c80e7b49 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -26,7 +26,7 @@
 #include "version.h"
 #include <klocale.h>
 #include <knotifyclient.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
@@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     // Create the display
     calc_display = new DLabel( this, "display" );
     calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
-    calc_display->setAlignment( AlignRight|AlignVCenter );
+    calc_display->tqsetAlignment( AlignRight|AlignVCenter );
     calc_display->setFocus();
     calc_display->setFocusPolicy( TQ_StrongFocus );
 
@@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     statusINVLabel = new TQLabel( this, "INV" );
     Q_CHECK_PTR( statusINVLabel );
     statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusINVLabel->setAlignment( AlignCenter );
+    statusINVLabel->tqsetAlignment( AlignCenter );
     statusINVLabel->setText("NORM");
 
     statusHYPLabel = new TQLabel( this, "HYP" );
     Q_CHECK_PTR( statusHYPLabel );
     statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusHYPLabel->setAlignment( AlignCenter );
+    statusHYPLabel->tqsetAlignment( AlignCenter );
 
     statusERRORLabel = new TQLabel( this, "ERROR" );
     Q_CHECK_PTR( statusERRORLabel );
     statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    statusERRORLabel->setAlignment( AlignLeft|AlignVCenter );
+    statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter );
 
     // create angle button group
 
@@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     mainLayout->addLayout(btnLayout);
     mainLayout->addLayout(statusLayout);
 
-    // button layout
+    // button tqlayout
     btnLayout->addWidget(mSmallPage,0,AlignTop);
     btnLayout->addSpacing(mInternalSpacing);
     btnLayout->addWidget(mLargePage,0,AlignTop);
 
-    // small button layout
+    // small button tqlayout
     smallBtnLayout->addWidget(pbhyp, 0, 0);
     smallBtnLayout->addWidget(pbinv, 0, 1);
     smallBtnLayout->addWidget(pbA, 0, 2);
@@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     smallBtnLayout->setRowStretch(4, 0);
     smallBtnLayout->setRowStretch(5, 0);
 
-    // large button layout
+    // large button tqlayout
     largeBtnLayout->addWidget(pbEE, 0, 0);
     largeBtnLayout->addWidget(pbMR, 0, 1);
     largeBtnLayout->addWidget(pbMplusminus, 0, 2);
@@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     topLayout->addWidget(calc_display, 10);
 
 
-    // radiobutton layout
+    // radiobutton tqlayout
     radioLayout->addWidget(base_group);
     radioLayout->addWidget(angle_group);
 
-    // status layout
+    // status tqlayout
     statusLayout->addWidget(statusINVLabel);
     statusLayout->addWidget(statusHYPLabel);
     statusLayout->addWidget(statusERRORLabel, 10);
@@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry()
     s.setWidth(mSmallPage->fontMetrics().width("MMM"));
     s.setHeight(mSmallPage->fontMetrics().lineSpacing());
 
-    l = (TQObjectList*)mSmallPage->children(); // silence please
+    l = (TQObjectList*)mSmallPage->tqchildren(); // silence please
 
     for(uint i=0; i < l->count(); i++)
     {
@@ -586,20 +586,20 @@ void TQtCalculator::updateGeometry()
         if( o->isWidgetType() )
         {
             margin = TQApplication::style().
-                pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
+                tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
             ((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin);
             ((TQWidget*)o)->installEventFilter( this );
             ((TQWidget*)o)->setAcceptDrops(true);
         }
     }
 
-    l = (TQObjectList*)mLargePage->children(); // silence please
+    l = (TQObjectList*)mLargePage->tqchildren(); // silence please
 
-    int h1 = pbF->minimumSize().height();
+    int h1 = pbF->tqminimumSize().height();
     int h2 = (int)((((float)h1 + 4.0) / 5.0));
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
                TQApplication::style().
-               pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
+               tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
     s.setHeight(h1 + h2);
 
     for(uint i = 0; i < l->count(); i++)
@@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry()
     statusINVLabel->setMinimumWidth(s.width());
     statusHYPLabel->setMinimumWidth(s.width());
 
-    //setFixedSize(minimumSize());
+    //setFixedSize(tqminimumSize());
 }
 
 void TQtCalculator::exit()
@@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){
   lay1->setSpacing( KDialog::spacingHint() );
 
   TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box");
-  box->layout()->setSpacing(KDialog::spacingHint());
-  box->layout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2);
+  box->tqlayout()->setSpacing(KDialog::spacingHint());
+  box->tqlayout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2);
   TQLabel  *label = new TQLabel(box,"label");
   TQLabel  *label2 = new TQLabel(box,"label2");
 
@@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){
                       "enabled. See the README for details.");
 #endif
 
-  label->setAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
   label->setText(labelstring);
 
-  label2->setAlignment(AlignLeft|WordBreak|ExpandTabs);
+  label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
   label2->setText(labelstring2);
 
   // HACK
@@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){
     set_precision();
     set_style();
     updateGeometry();
-    resize(minimumSize());
+    resize(tqminimumSize());
   }
   delete configdlg;
 }
@@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){
 
     if(calc_display->isLit()){
 
-      TQClipboard *cb = TQApplication::clipboard();
+      TQClipboard *cb = TQApplication::tqclipboard();
       cb->setText(calc_display->text());
       selection_timer->start(100);
 
@@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){
   }
   else{
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
 
     CALCAMNT result;
     result = (CALCAMNT) cb->text().toDouble();
diff --git a/kspread/plugins/calculator/kcalc.h b/kspread/plugins/calculator/kcalc.h
index a1205bc2e..dfa67b633 100644
--- a/kspread/plugins/calculator/kcalc.h
+++ b/kspread/plugins/calculator/kcalc.h
@@ -35,7 +35,7 @@ using std::queue;
 #include <ctype.h>
 
 #include <tqlistbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqptrlist.h>
 #include <tqaccel.h>
 #include <tqtabdialog.h>
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
index 0311c9137..d55c332b6 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
@@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name)
   
   //we start with a default calendar for the current month;
 
-  TQDate first_day_in_month = TQDate::currentDate();
+  TQDate first_day_in_month = TQDate::tqcurrentDate();
   first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1);
   
   TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth());
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
index d2c8fc085..712b11b4f 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>400</width>
                     <height>19</height>
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index c0d5c1ca9..1bb16a959 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").arg(start.toString()).arg(end.toString()));
+  sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(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 9f67dfbb8..108516dc1 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> children = manager->getChildren();
-    kdDebug() << " there are " << children.size() << endl;
-    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
+    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++)
     {
         kdDebug() << it.key() << " " << it.data() << endl;
     }
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc
index a919b31d9..44f8fa014 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cc
@@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
     setInstance(KSpreadScriptingFactory::instance());
 
     kdDebug() << "Scripting plugin. Class: "
-          << metaObject()->className()
+          << tqmetaObject()->className()
           << ", Parent: "
-          << parent->metaObject()->className()
+          << parent->tqmetaObject()->className()
           << "\n";
 
     if ( parent->inherits("KSpread::View") )
diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
index 529a2d26c..a34a4dd14 100755
--- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
+++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
@@ -30,11 +30,11 @@ class Dialog(qt.QDialog):
 		import qt
 		qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Export to HTML File")
-		layout = qt.QVBoxLayout(self)
+		tqlayout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(10)
 		box.setSpacing(10)
-		layout.addWidget(box)
+		tqlayout.addWidget(box)
 
 		sheetbox = qt.QHBox(box)
 		sheetbox.setSpacing(6)
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index c6da1fe28..e3d6237c0 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -763,11 +763,11 @@ class SampleDialog(qt.QDialog):
 		import qt
 		qt.QDialog.__init__(self, parent, "SampleDialog", 1)
 
-		layout = qt.QVBoxLayout(self)
+		tqlayout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(4)
 		box.setSpacing(10)
-		layout.addWidget(box)
+		tqlayout.addWidget(box)
 
 		self.scrollview = qt.QScrollView(box)
 		self.scrollview.setResizePolicy(qt.QScrollView.AutoOne)
@@ -829,11 +829,11 @@ class MainDialog(qt.QDialog):
 		qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose)
 		self.setCaption("Script Editor")
 		
-		layout = qt.QVBoxLayout(self)
+		tqlayout = qt.QVBoxLayout(self)
 		box = qt.QVBox(self)
 		box.setMargin(4)
 		box.setSpacing(10)
-		layout.addWidget(box)
+		tqlayout.addWidget(box)
 
 		menu = qt.QMenuBar(box)
 
diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc
index f861343c7..171797932 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cc
@@ -19,9 +19,9 @@
 
 #include "inspector.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdialogbase.h>
 
@@ -65,7 +65,7 @@ static TQString boolAsString( bool b )
 
 static TQString longAsHexstring( long l )
 {
-    return TQString("%1").arg(l, 8, 16);
+    return TQString("%1").tqarg(l, 8, 16);
 }
 
 static TQString dirAsString( Sheet::LayoutDirection dir )
diff --git a/kspread/tests/tester.cc b/kspread/tests/tester.cc
index cdadeaefe..05df95d10 100644
--- a/kspread/tests/tester.cc
+++ b/kspread/tests/tester.cc
@@ -20,7 +20,7 @@
 #include "tester.h"
 
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 using namespace KSpread;
 
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index fa45c9c00..53fe60b3c 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -22,8 +22,8 @@
 #include <tqapplication.h>
 #include <tqdict.h>
 #include <tqlabel.h>
-#include <layout.h>
-#include <textedit.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
 
 #include <kcombobox.h>
 #include <kdialogbase.h>
@@ -58,23 +58,23 @@ TestRunner::TestRunner():
   d = new Private;
 
   TQFrame* mainWidget = plainPage();
-  TQGridLayout* layout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
+  TQGridLayout* tqlayout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
   setMinimumSize( 360, 230 );
 
   TQLabel* typeLabel = new TQLabel( "Type of Test:", mainWidget );
-  layout->addWidget( typeLabel, 0, 0 );
+  tqlayout->addWidget( typeLabel, 0, 0 );
 
   d->testType = new KComboBox( mainWidget );
-  layout->addWidget( d->testType, 0, 1 );
+  tqlayout->addWidget( d->testType, 0, 1 );
 
-  TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  layout->addItem( spacerItem, 0, 2 );
+  TQSpacerItem* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+  tqlayout->addItem( tqspacerItem, 0, 2 );
 
   d->runButton = new KPushButton( "Run", mainWidget );
-  layout->addWidget( d->runButton, 0, 3 );
+  tqlayout->addWidget( d->runButton, 0, 3 );
 
   d->logView = new TQTextEdit( mainWidget );
-  layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
   d->logView->setTextFormat( TQt::LogText );
 
   TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) );
@@ -108,7 +108,7 @@ void TestRunner::runTest()
   if( tester )
   {
     d->logView->clear();
-    d->logView->append( TQString("Test: %1").arg( testName ) );
+    d->logView->append( TQString("Test: %1").tqarg( 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>").arg( tester->count() ).
+      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( 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. ").arg( tester->count() ) );
+      d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) );
 
     d->logView->append( "Test finished." );
   }
diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc
index cd649c367..8dda86d17 100644
--- a/kspread/valueconverter.cc
+++ b/kspread/valueconverter.cc
@@ -228,11 +228,11 @@ Value ValueConverter::asDateTime (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDateTime::currentDateTime());
+      val.setValue (TQDateTime::tqcurrentDateTime());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDateTime::currentDateTime());
+      val.setValue (TQDateTime::tqcurrentDateTime());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());
@@ -269,11 +269,11 @@ Value ValueConverter::asDate (const Value &value) const
   
   switch (value.type()) {
     case Value::Empty:
-      val.setValue (TQDate::currentDate());
+      val.setValue (TQDate::tqcurrentDate());
     break;
     case Value::Boolean:
       //ignore the bool value... any better idea? ;)
-      val.setValue (TQDate::currentDate());
+      val.setValue (TQDate::tqcurrentDate());
     break;
     case Value::Integer:
       val.setValue (value.asFloat());
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc
index 1eda41da0..9e3c57da4 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").arg( floor(value) );
-    if( index1 == index ) return TQString("%1").arg( floor(value)+1 );
+    if( index1 == 0 ) return TQString("%1").tqarg( floor(value) );
+    if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 );
     if( floor(value) == 0)
-      return TQString("%1/%2").arg( index1 ).arg( index );
+      return TQString("%1/%2").tqarg( index1 ).tqarg( index );
 
     return TQString("%1 %2/%3")
-        .arg( floor(value) )
-        .arg( index1 )
-        .arg( index );
+        .tqarg( floor(value) )
+        .tqarg( index1 )
+        .tqarg( index );
   }
 
 
@@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType)
   else
   {
     if ( floor(value) == 0 )
-      return TQString("%1/%2").arg(numerator).arg(denominator);
+      return TQString("%1/%2").tqarg(numerator).tqarg(denominator);
     else
       return TQString("%1 %2/%3")
-        .arg(floor(value))
-        .arg(numerator)
-        .arg(denominator);
+        .tqarg(floor(value))
+        .tqarg(numerator)
+        .tqarg(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")
-      .arg((pm ? h - 12 : h),2)
-      .arg(minute,2)
-      .arg(AMPM);
+      .tqarg((pm ? h - 12 : h),2)
+      .tqarg(minute,2)
+      .tqarg(AMPM);
   }
 
   if (fmtType == Time_format2) {  //9:01:05 AM
     return TQString("%1:%2:%3 %4")
-      .arg((pm ? h-12 : h),2)
-      .arg(minute,2)
-      .arg(second,2)
-      .arg(AMPM);
+      .tqarg((pm ? h-12 : h),2)
+      .tqarg(minute,2)
+      .tqarg(second,2)
+      .tqarg(AMPM);
   }
 
   if (fmtType == Time_format3) {
     return TQString("%1 %2 %3 %4 %5 %6")      // 9 h 01 min 28 s
-      .arg(hour,2)
-      .arg(i18n("h"))
-      .arg(minute,2)
-      .arg(i18n("min"))
-      .arg(second,2)
-      .arg(i18n("s"));
+      .tqarg(hour,2)
+      .tqarg(i18n("h"))
+      .tqarg(minute,2)
+      .tqarg(i18n("min"))
+      .tqarg(second,2)
+      .tqarg(i18n("s"));
   }
 
   if (fmtType == Time_format4) {  // 9:01
-    return TQString("%1:%2").arg(hour, 2).arg(minute, 2);
+    return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2);
   }
 
   if (fmtType == Time_format5) {  // 9:01:12
-    return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2);
+    return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(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").arg(m, 1).arg(second, 2);
+    return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2);
   }
   if (fmtType == Time_format7) {  // [h]:mm:ss
-    return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2);
+    return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2);
   }
   if (fmtType == Time_format8)
   {  // [h]:mm
     m += (h * 60);
-    return TQString("%1:%2").arg(h, 1).arg(minute, 2);
+    return TQString("%1:%2").tqarg(h, 1).tqarg(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).at(0) + "-";
+    tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-";
     tmp += TQString::number(date.year()).right(2);
   }
   else if (fmtType == date_format11) {  /*18/Feb */
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 58d27637a..0e7355b2f 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -33,8 +33,8 @@
 #include <tqfileinfo.h>
 #include <tqdockwindow.h>
 #include <tqdom.h>
-#include <textstream.h>
-#include <textcodec.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
 
 #include <canvas.h>
 #include <kugartemplate.h>
diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp
index 6a478a3fd..991d8304d 100644
--- a/kugar/kudesigner/kudesigner_view.cpp
+++ b/kugar/kudesigner/kudesigner_view.cpp
@@ -28,7 +28,7 @@
 #include <tqevent.h>
 #include <tqmainwindow.h>
 #include <tqaction.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdockwindow.h>
 #include <tqmenubar.h>
 #include <tqmessagebox.h>
diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp
index 3d4ba6035..d486ae9d5 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 children = report.childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = report.childNodes();
+    int childCount = tqchildren.length();
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = children.item( j );
+        TQDomNode child = tqchildren.item( j );
 
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
@@ -301,12 +301,12 @@ void Canvas::setDetailFooterAttributes( TQDomNode *node )
 
 void Canvas::addReportItems( TQDomNode *node, Band *section )
 {
-    TQDomNodeList children = node->childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = node->childNodes();
+    int childCount = tqchildren.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = children.item( j );
+        TQDomNode child = tqchildren.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 a9f2faa52..db3765f8b 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" ).arg( i18n( "Detail" ) ).arg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail" ) ).tqarg( 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 b1715920b..14b5e13fb 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" ).arg( i18n( "Detail Footer" ) ).arg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Footer" ) ).tqarg( 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 d43ce942f..071dea72b 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" ).arg( i18n( "Detail Header" ) ).arg( props[ "Level" ].value().toInt() );
+    TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Header" ) ).tqarg( 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 ae9f30d78..32ebe470a 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" ).arg( val.toColor().red() ).arg( val.toColor().green() ).arg( val.toColor().blue() );
+        return TQString( "%1,%2,%3" ).tqarg( val.toColor().red() ).tqarg( val.toColor().green() ).tqarg( 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.at( 0 ).latin1() );
+        return TQVariant( str.tqat( 0 ).latin1() );
     default:
         return TQVariant( str );
     }
diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp
index 01b4289ef..7ad4ac1b0 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)" ).arg( level );
+        name += tqtr( " (level %1)" ).tqarg( 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" ).arg( box->props[ "Text" ].value().toString() );
+            name = tqtr( "Label: %1" ).tqarg( box->props[ "Text" ].value().toString() );
             break;
         case Kudesigner::Rtti_Field:
-            name = tqtr( "Field: %1" ).arg( box->props[ "Field" ].value().toString() );
+            name = tqtr( "Field: %1" ).tqarg( box->props[ "Field" ].value().toString() );
             break;
         case Kudesigner::Rtti_Calculated:
-            name = tqtr( "Calculated Field: %1" ).arg( box->props[ "Field" ].value().toString() );
+            name = tqtr( "Calculated Field: %1" ).tqarg( 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" ).arg( box->props[ "Type" ].listData()->keys[ idx ].toString() );
+            name = tqtr( "Special Field: %1" ).tqarg( 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->repaint();
+            item->tqrepaint();
             m_selected.append( item );
         }
     }
@@ -211,7 +211,7 @@ void StructureWidget::selectionClear()
         if ( ( *it ) == 0 )
             continue;
         ( *it ) ->setBold( false );
-        ( *it ) ->repaint();
+        ( *it ) ->tqrepaint();
     }
     m_selected.clear();
 }
diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp
index 850b7a73a..923323cb8 100644
--- a/kugar/lib/inputmask.cpp
+++ b/kugar/lib/inputmask.cpp
@@ -210,13 +210,13 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const
 TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const
 {
     if ( pos >= ( uint ) m_maxLength )
-        return TQString::fromLatin1( "" );
+        return TQString::tqfromLatin1( "" );
 
     TQString fill;
     fill = clear ? clearString( 0, m_maxLength ) : m_text;
 
     uint strIndex = 0;
-    TQString s = TQString::fromLatin1( "" );
+    TQString s = TQString::tqfromLatin1( "" );
     int i = pos;
     while ( i < m_maxLength )
     {
diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp
index fecbd560e..6a0db9748 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 alignment
+    // Set the default tqalignment
     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 alignment */
+/** Sets the label's horizontal tqalignment */
 void MLabelObject::setHorizontalAlignment( int a )
 {
     hAlignment = a;
 }
 
-/** Sets the label's vertical alignment */
+/** Sets the label's vertical tqalignment */
 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 alignment flags
+    // Set the text tqalignment 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 alignment data
+    // Copy the label's tqalignment data
     vAlignment = mLabelObject->vAlignment;
     hAlignment = mLabelObject->hAlignment;
     wordWrap = mLabelObject->wordWrap;
diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h
index 3526552e3..2b35f2339 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 alignment constants */
+    /**Qt::Horizontal tqalignment constants */
     enum HAlignment { Left = 0, Center, Right };
-    /** Vertial alignment constants */
+    /** Vertial tqalignment 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 alignment */
+    /** Lable text horizontal tqalignment */
     int hAlignment;
-    /** Label text vertical alignment  */
+    /** Label text vertical tqalignment  */
     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 alignment -default is Left */
+    /** Sets the label's horizontal tqalignment -default is Left */
     void setHorizontalAlignment( int a );
-    /** Sets the label's vertical alignment - default is Top */
+    /** Sets the label's vertical tqalignment - 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 abd7927cf..2a4a0bc92 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 geometry
+    // Set the object's default tqgeometry
     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 geometry
+    // Copy the object's tqgeometry
     xpos1 = mLineObject->xpos1;
     ypos1 = mLineObject->ypos1;
     xpos2 = mLineObject->xpos2;
diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp
index 4f4b1869c..12eac741e 100644
--- a/kugar/lib/mpagedisplay.cpp
+++ b/kugar/lib/mpagedisplay.cpp
@@ -45,7 +45,7 @@ void MPageDisplay::setPageDimensions( TQSize size )
 
 // Return the preferred size of the display.
 
-TQSize MPageDisplay::sizeHint() const
+TQSize MPageDisplay::tqsizeHint() const
 {
     return buffer.size();
 }
diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h
index 919d8a361..65a419d57 100644
--- a/kugar/lib/mpagedisplay.h
+++ b/kugar/lib/mpagedisplay.h
@@ -42,7 +42,7 @@ public:
     /** Sets the page display dimensions */
     void setPageDimensions( TQSize size );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     TQSizePolicy sizePolicy() const;
 
 protected:
diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp
index ca747b3e3..4e1544d30 100644
--- a/kugar/lib/mreportengine.cpp
+++ b/kugar/lib/mreportengine.cpp
@@ -289,7 +289,7 @@ MPageCollection* MReportEngine::renderReport()
     // Initialize the basic page data
     currHeight = pageHeight - ( topMargin + bottomMargin + pFooter.getHeight() );
     currPage = 0;
-    currDate = TQDate::currentDate();
+    currDate = TQDate::tqcurrentDate();
 
     // Initialise global report variables
     unsigned int rowCount = records.length();
@@ -336,7 +336,7 @@ MPageCollection* MReportEngine::renderReport()
         {
             // Update status event
             if ( ( chkRow = ( j / 2 ) % 20 ) == 0 )
-                emit signalRenderStatus( j / 2 );
+                emit signalRendertqStatus( j / 2 );
 
             // Check for cancel action
             if ( cancelRender )
@@ -481,7 +481,7 @@ MPageCollection* MReportEngine::renderReport()
     pages->setPageOrientation( pageOrientation );
 
     // Send final status
-    emit signalRenderStatus( rowCount / 2 );
+    emit signalRendertqStatus( rowCount / 2 );
     m_needRegeneration = false;
     m_pageCollection = pages;
     return pages;
@@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions()
     recalcAttribute( "LeftMargin", rattributes );
     recalcAttribute( "RightMargin", rattributes );
 
-    TQDomNodeList children = report.childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = report.childNodes();
+    int childCount = tqchildren.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        child = children.item( j );
+        child = tqchildren.item( j );
         TQDomNamedNodeMap attributes = child.attributes();
 
-        TQDomNodeList children2 = child.childNodes();
-        int childCount2 = children2.length();
+        TQDomNodeList tqchildren2 = child.childNodes();
+        int childCount2 = tqchildren2.length();
         recalcAttribute( "Height", attributes );
 
         for ( int k = 0; k < childCount2; k++ )
         {
-            TQDomNode child2 = children2.item( k );
+            TQDomNode child2 = tqchildren2.item( k );
             TQDomNamedNodeMap attributes = child2.attributes();
             recalcAttribute( "X", attributes );
             recalcAttribute( "Y", attributes );
@@ -685,11 +685,11 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att
 {
     if ( !attributes.namedItem( name ).isNull() )
     {
-        attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
+        attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
     }
 }
 
-/** Walks the document tree, setting the report layout */
+/** Walks the document tree, setting the report tqlayout */
 void MReportEngine::initTemplate()
 {
     heightOfDetails = 0;
@@ -712,12 +712,12 @@ void MReportEngine::initTemplate()
     setReportAttributes( &report );
 
     // Get all the child report elements
-    TQDomNodeList children = report.childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = report.childNodes();
+    int childCount = tqchildren.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        child = children.item( j );
+        child = tqchildren.item( j );
 
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
@@ -748,7 +748,7 @@ void MReportEngine::initTemplate()
     }
 }
 
-/** Sets the main layout attributes for the report */
+/** Sets the main tqlayout attributes for the report */
 void MReportEngine::setReportAttributes( TQDomNode* report )
 {
     // Get the attributes for the report
@@ -792,7 +792,7 @@ int MReportEngine::scaleDeltaHeight( int height ) const
     return f > 1 ? int( f + 0.5 ) : ceil( f );
 }
 
-/** Sets the layout attributes for the given report section */
+/** Sets the tqlayout attributes for the given report section */
 void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* report )
 {
     // Get the attributes for the section
@@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re
     section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() );
 
     // Process the sections labels
-    TQDomNodeList children = report->childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = report->childNodes();
+    int childCount = tqchildren.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 = children.item( j );
+        TQDomNode child = tqchildren.item( j );
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
             if ( child.nodeName() == "Line" )
@@ -852,7 +852,7 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re
     }
 }
 
-/** Sets the layout attributes for the detail headers and footers */
+/** Sets the tqlayout attributes for the detail headers and footers */
 void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* report )
 {
     // Get the attributes for the section
@@ -866,7 +866,7 @@ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* re
 }
 
 
-/** Sets the layout attributes for the detail section */
+/** Sets the tqlayout attributes for the detail section */
 void MReportEngine::setDetailAttributes( TQDomNode* report )
 {
     // Get the attributes for the detail section
@@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report )
     detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" );
 
     // Process the report detail labels
-    TQDomNodeList children = report->childNodes();
-    int childCount = children.length();
+    TQDomNodeList tqchildren = report->childNodes();
+    int childCount = tqchildren.length();
 
     for ( int j = 0; j < childCount; j++ )
     {
-        TQDomNode child = children.item( j );
+        TQDomNode child = tqchildren.item( j );
         if ( child.nodeType() == TQDomNode::ElementNode )
         {
             if ( child.nodeName() == "Line" )
@@ -923,7 +923,7 @@ void MReportEngine::setDetailAttributes( TQDomNode* report )
     details.append( detail );
 }
 
-/** Sets a line's layout attributes */
+/** Sets a line's tqlayout attributes */
 void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr )
 {
     line->setLine( scaleDeltaWidth( attr->namedItem( "X1" ).nodeValue().toInt() ),
@@ -941,7 +941,7 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att
     line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() );
 }
 
-/** Sets a label's layout attributes */
+/** Sets a label's tqlayout attributes */
 void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr )
 {
     TQString tmp;
@@ -986,7 +986,7 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap*
     label->setWordWrap( attr->namedItem( "WordWrap" ).nodeValue().toInt() == 0 ? false : true );
 }
 
-/** Sets a special field's layout attributes */
+/** Sets a special field's tqlayout attributes */
 void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr )
 {
     field->setType( attr->namedItem( "Type" ).nodeValue().toInt() );
@@ -995,7 +995,7 @@ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeM
     setLabelAttributes( ( MLabelObject * ) field, attr );
 }
 
-/** Sets a field's layout attributes */
+/** Sets a field's tqlayout attributes */
 void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr )
 {
     field->setFieldName( attr->namedItem( "Field" ).nodeValue() );
@@ -1015,7 +1015,7 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap*
     setLabelAttributes( ( MLabelObject * ) field, attr );
 }
 
-/** Sets a calculated field's layout attributes */
+/** Sets a calculated field's tqlayout attributes */
 void MReportEngine::setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr )
 {
     field->setCalculationType( attr->namedItem( "CalculationType" ).nodeValue().toInt() );
diff --git a/kugar/lib/mreportengine.h b/kugar/lib/mreportengine.h
index 846d0a3a5..33b651cc0 100644
--- a/kugar/lib/mreportengine.h
+++ b/kugar/lib/mreportengine.h
@@ -71,7 +71,7 @@ public slots:
     void slotCancelRendering();
 
 signals:
-    void signalRenderStatus( int );
+    void signalRendertqStatus( int );
     void preferedTemplate( const TQString & );
 
 protected:
@@ -170,27 +170,27 @@ private:
     void initData();
     void initTemplate();
 
-    /** Sets the main layout attributes for the report */
+    /** Sets the main tqlayout attributes for the report */
     void setReportAttributes( TQDomNode* report );
 
     int scaleDeltaWidth( int width ) const;
     int scaleDeltaHeight( int width ) const;
 
-    /** Sets the layout attributes for the given report section */
+    /** Sets the tqlayout attributes for the given report section */
     void setSectionAttributes( MReportSection* section, TQDomNode* report );
-    /** Sets the layout attributes for the detail headers and footers */
+    /** Sets the tqlayout attributes for the detail headers and footers */
     void setDetMiscAttributes( MReportSection* section, TQDomNode* report );
-    /** Sets the layout attributes for the detail section */
+    /** Sets the tqlayout attributes for the detail section */
     void setDetailAttributes( TQDomNode* report );
-    /** Sets a line's layout attributes */
+    /** Sets a line's tqlayout attributes */
     void setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr );
-    /** Sets a label's layout attributes */
+    /** Sets a label's tqlayout attributes */
     void setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr );
-    /** Sets a special field's layout attributes */
+    /** Sets a special field's tqlayout attributes */
     void setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr );
-    /** Sets a field's layout attributes */
+    /** Sets a field's tqlayout attributes */
     void setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr );
-    /** Sets a calculated field's layout attributes */
+    /** Sets a calculated field's tqlayout attributes */
     void setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr );
 
     /** Copies member data from one object to another.
diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp
index 7a9366f6a..7fec9dd90 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 geometry
+    // Set the object's default tqgeometry
     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 geometry
+    // Copy the object's tqgeometry
     xpos = mReportObject->xpos;
     ypos = mReportObject->ypos;
     width = mReportObject->width;
diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp
index b412d3326..1184d7739 100644
--- a/kugar/lib/mreportsection.cpp
+++ b/kugar/lib/mreportsection.cpp
@@ -17,14 +17,14 @@ namespace Kugar
 /** Constructor */
 MReportSection::MReportSection()
 {
-    // Set geometry
+    // Set tqgeometry
     height = 50;
 
     // Set print frequency
     frequency = MReportSection::EveryPage;
 
     // Set special field data
-    reportDate = TQDate::currentDate();
+    reportDate = TQDate::tqcurrentDate();
     pageNumber = 0;
 
     // Set the line list to AutoDelete
@@ -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 geometry
+    // Copy the section's tqgeometry
     height = mReportSection->height;
 
     // Copy the print frequency
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index 5cbacf580..a3fd9ab5d 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -38,7 +38,7 @@ void MReportViewer::init()
     scroller = new TQScrollView( this );
 
     // Connect the rendering update signal and slot
-    connect( rptEngine, TQT_SIGNAL( signalRenderStatus( int ) ),
+    connect( rptEngine, TQT_SIGNAL( signalRendertqStatus( int ) ),
              TQT_SLOT( slotRenderProgress( int ) ) );
 
     connect( rptEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ),
@@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage()
     if ( ( page = report->getFirstPage() ) != 0 )
     {
         display->setPage( page );
-        display->repaint();
+        display->tqrepaint();
     }
 }
 
@@ -192,7 +192,7 @@ void MReportViewer::slotNextPage()
     if ( ( page = report->getNextPage() ) != 0 )
     {
         display->setPage( page );
-        display->repaint();
+        display->tqrepaint();
     }
     else
         report->setCurrentPage( index );
@@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage()
     if ( ( page = report->getPreviousPage() ) != 0 )
     {
         display->setPage( page );
-        display->repaint();
+        display->tqrepaint();
     }
     else
         report->setCurrentPage( index );
@@ -228,7 +228,7 @@ void MReportViewer::slotLastPage()
     if ( ( page = report->getLastPage() ) != 0 )
     {
         display->setPage( page );
-        display->repaint();
+        display->tqrepaint();
     }
 }
 
@@ -273,9 +273,9 @@ void MReportViewer::slotRenderProgress( int p )
 
 // Return the preferred size.
 
-TQSize MReportViewer::sizeHint() const
+TQSize MReportViewer::tqsizeHint() const
 {
-    return scroller -> sizeHint();
+    return scroller -> tqsizeHint();
 }
 
 void MReportViewer::printReport( KPrinter &printer )
diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h
index ca47b12b2..599e22dbf 100644
--- a/kugar/lib/mreportviewer.h
+++ b/kugar/lib/mreportviewer.h
@@ -59,7 +59,7 @@ public:
     void setupPrinter( KPrinter &printer );
     void printReportSilent( int printFrom = -1, int printTo = -1, int printCopies = -1, TQString printerName = TQString() );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
     void slotFirstPage();
diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp
index e53c1ef24..f70b67bfe 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" ).arg( value.month() ).arg( value.day() ).arg( year );
+        string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
         break;
     case MUtil::MDY_DASH:
-        string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year );
+        string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
         break;
     case MUtil::MMDDY_SLASH:
-        string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year );
+        string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year );
         break;
     case MUtil::MMDDY_DASH:
-        string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year );
+        string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year );
         break;
     case MUtil::MDYYYY_SLASH:
-        string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
+        string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
         break;
     case MUtil::MDYYYY_DASH:
-        string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
+        string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
         break;
     case MUtil::MMDDYYYY_SLASH:
-        string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() );
+        string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
         break;
     case MUtil::MMDDYYYY_DASH:
-        string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() );
+        string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
         break;
     case MUtil::YYYYMD_SLASH:
-        string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
+        string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
         break;
     case MUtil::YYYYMD_DASH:
-        string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
+        string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
         break;
     case MUtil::DDMMYY_PERIOD:
-        string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year );
+        string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year );
         break;
     case MUtil::DDMMYYYY_PERIOD:
-        string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() );
+        string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() );
         break;
     default:
         string = value.toString();
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 894dd1eb0..38ac5257e 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" ).arg( m_file ) );
+                KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) );
         }
         else
         {
             ok = false;
-            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) );
+            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) );
         }
 
     }
     else
     {
         ok = false;
-        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) );
+        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) );
+            KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( 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." ).arg( localtpl ) );
+                            KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) );
                         else
                             m_templateOk = true;
                         tmpStore->close();
                     }
                     else
-                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( 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" ).arg( localtpl ) );
+                KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) );
             }
 
         }
         else
-            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) );
+            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) );
 
         if ( isTemp )
             KIO::NetAccess::removeTempFile( localtpl );
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 631bbe1db..ddd8dfe1c 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -15,7 +15,7 @@
 #include <tqfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
@@ -90,12 +90,12 @@ bool KugarPart::openFile()
                 ok = true;
         }
         else
-            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) );
+            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) );
 
         f.close();
     }
     else
-        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) );
+        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) );
 
     return ok;
 }
diff --git a/kword/DESIGN b/kword/DESIGN
index 6a01ae288..a920c8dbe 100644
--- a/kword/DESIGN
+++ b/kword/DESIGN
@@ -38,7 +38,7 @@ cell, we contain the cells in their own KWTextFrameset.
 is defined by m_zOrder in KWFrame. This number is relative to the other
 frames *on the same page*.
 
-Frame layout and pages
+Frame tqlayout and pages
 ======================
 Generally, the user is free to position frames where he/she wants to.
 
@@ -63,10 +63,10 @@ In WP mode, removing pages is automatically done by KWDocument::tryRemovingPages
 In DTP mode pages are user-controlled (insert and delete page actions),
 but overflowing text can still create a new page as well.
 
-The difficulty with frame layout is that in most cases the frame size and
-number depends on the text inside, and the text layout depends on the frames
-(frame width, frames on top, etc.). This is why text layout (formatMore())
-and frame layout (e.g. KWFrameLayout) often call each other, resulting in
+The difficulty with frame tqlayout is that in most cases the frame size and
+number depends on the text inside, and the text tqlayout depends on the frames
+(frame width, frames on top, etc.). This is why text tqlayout (formatMore())
+and frame tqlayout (e.g. KWFrameLayout) often call each other, resulting in
 infinite loops when some code goes wrong.
 
 Editing
diff --git a/kword/HACKING b/kword/HACKING
index 440da6bdc..c808ac27b 100644
--- a/kword/HACKING
+++ b/kword/HACKING
@@ -59,7 +59,7 @@ DIRECTORIES:
             various QTSQL interface implementation files
             to handle table selection and mailmerge data
   templates:
-    various page layout templates
+    various page tqlayout templates
         make_template.pl    - Perl script to create XML templates
                             - from KWord-saved XML files
     subdirectories
@@ -89,7 +89,7 @@ FILES:
     main.cc                     - the main
     kwaboutdata.h               - the appname, authors...
                                 - shared between main.cc and kwfactory.cc
-    kword.rc                    - xml-gui layout
+    kword.rc                    - xml-gui tqlayout
     kword.desktop               - application .desktop file
 
   main document data structures:
@@ -154,7 +154,7 @@ FILES:
         framedia.h/cc           - frame dialog
         kwframe.h/cc            - frame, framesets (picture/formula/...),
                                 - framesetedit objects for editing framesets
-        kwframelayout.h/cc      - the frame layout engine for headers/main
+        kwframetqlayout.h/cc      - the frame tqlayout engine for headers/main
                                   frames/footers/footnotes.
                                   (this is a helper for KWDoc::recalcFrames)
         kwtextframeset.h/cc        - text frameset
diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp
index a291999e1..11136e3d8 100644
--- a/kword/KWAnchor.cpp
+++ b/kword/KWAnchor.cpp
@@ -70,7 +70,7 @@ void KWAnchor::finalize()
 void KWAnchor::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected )
 {
     // (x,y) is the position of the inline item (in Layout Units)
-    // (cx,cy,cw,ch) is the rectangle to be painted, in layout units too
+    // (cx,cy,cw,ch) is the rectangle to be painted, in tqlayout units too
 
     if ( m_deleted )
         return;
@@ -234,7 +234,7 @@ void KWAnchor::resize()
         if ( parag )
         {
             kdDebug(32001) << "KWAnchor::resize invalidating parag " << parag->paragId() << endl;
-            parag->invalidate( 0 );
+            parag->tqinvalidate( 0 );
         }
     }
 }
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 5b15914bb..fdd6eb6ba 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -40,7 +40,7 @@
 
 #include <tqbuffer.h>
 #include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqprogressdialog.h>
 #include <tqobjectlist.h>
 #include <tqapplication.h>
@@ -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()->repaint( erase );
+    viewport()->tqrepaint( erase );
 }
 
 void KWCanvas::viewportResizeEvent( TQResizeEvent * )
@@ -305,7 +305,7 @@ void KWCanvas::drawFrameSet( KWFrameSet * frameset, TQPainter * painter,
     if ( painter->device()->devType() == TQInternal::Printer )
         focus = false;
 
-    TQColorGroup gb = TQApplication::palette().active();
+    TQColorGroup gb = TQApplication::tqpalette().active();
     if ( focus && m_currentFrameSetEdit && frameset == m_currentFrameSetEdit->frameSet() )
         // Currently edited frameset
         m_currentFrameSetEdit->drawContents( painter, crect, gb, onlyChanged, resetChanged, viewMode, m_frameViewManager );
@@ -543,9 +543,9 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e )
     if ( e->button() == Qt::MidButton ) {
         if ( m_doc->isReadWrite() && m_currentFrameSetEdit && m_mouseMode == MM_EDIT )
         {
-            TQApplication::clipboard()->setSelectionMode( true );
+            TQApplication::tqclipboard()->setSelectionMode( true );
             m_currentFrameSetEdit->paste();
-            TQApplication::clipboard()->setSelectionMode( false );
+            TQApplication::tqclipboard()->setSelectionMode( false );
         }
     }
     else if ( e->button() == Qt::RightButton ) {
@@ -1032,7 +1032,7 @@ void KWCanvas::mrCreateTable()
             emit docStructChanged(Tables);
         }
         m_doc->updateAllFrames();
-        m_doc->layout();
+        m_doc->tqlayout();
         repaintAll();
 
     }
@@ -1751,7 +1751,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e )
                             break;
                         case TQt::Key_M: // 'M' -> mark debug output
                             {
-                                const TQDateTime dtMark ( TQDateTime::currentDateTime() );
+                                const TQDateTime dtMark ( TQDateTime::tqcurrentDateTime() );
                                 kdDebug(32002) << "Developer mark: " << dtMark.toString("yyyy-MM-dd hh:mm:ss,zzz") << endl;
                                 keyev->accept();
                                 break;
@@ -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 reshaped from the original size stored in the
+    // each frame in m_frames should be retqshaped 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 5283db0a8..955ea605f 100644
--- a/kword/KWCanvas.h
+++ b/kword/KWCanvas.h
@@ -25,7 +25,7 @@
 #include <kprinter.h>
 #include <KoRect.h>
 #include <tqscrollview.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <KoRichText.h>
 #include <KoQueryTrader.h>
 #include <KoPicture.h>
@@ -76,13 +76,13 @@ public:
 
     void repaintAll( bool erase = false );
     /**
-     * Only repaint the frameset @p fs.
+     * Only tqrepaint 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 repaint if the window is resized. */
+    /** We need to tqrepaint 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 20a4c9182..47fda3e6e 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -145,14 +145,14 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
             break;
         }
         TQDomElement paragElem = *it;
-        // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag layout
+        // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag tqlayout
         if ( item == 0 && m_idx > 0 )
         {
             // First load the default format, but only apply it to our new chars
-            TQDomElement layout = paragElem.namedItem( "LAYOUT" ).toElement();
-            if ( !layout.isNull() )
+            TQDomElement tqlayout = paragElem.namedItem( "LAYOUT" ).toElement();
+            if ( !tqlayout.isNull() )
             {
-                TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement();
+                TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement();
                 if ( !formatElem.isNull() )
                 {
                     KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), KGlobal::locale()->language(),false );
@@ -167,7 +167,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
         }
         else
         {
-            if ( item == 0 ) // This paragraph existed, store its parag layout
+            if ( item == 0 ) // This paragraph existed, store its parag tqlayout
             {
                 delete m_oldParagLayout;
                 m_oldParagLayout = new KoParagLayout( parag->paragLayout() );
@@ -179,7 +179,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c )
             parag->setFormat( 0, len, parag->paragFormat(), TRUE );
             parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) );
         }
-        parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo)
+        parag->tqinvalidate(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;
@@ -913,7 +913,7 @@ KWFrameMoveCommand::KWFrameMoveCommand( const TQString &name,
 
 void KWFrameMoveCommand::execute()
 {
-    bool needRelayout = false;
+    bool needRetqlayout = false;
     KWDocument * doc = 0L;
     TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
     TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
@@ -925,13 +925,13 @@ void KWFrameMoveCommand::execute()
         frame->moveTopLeft( (*moveIt).newPos );
 
         frame->updateRulerHandles();
-        needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO );
+        needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO );
     }
     if ( doc )
     {
         doc->updateAllFrames();
-        if ( needRelayout )
-            doc->layout();
+        if ( needRetqlayout )
+            doc->tqlayout();
 
         doc->updateRulerFrameStartEnd();
         doc->repaintAllViews();
@@ -940,7 +940,7 @@ void KWFrameMoveCommand::execute()
 
 void KWFrameMoveCommand::unexecute()
 {
-    bool needRelayout = false;
+    bool needRetqlayout = false;
     KWDocument * doc = 0L;
     TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin();
     TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin();
@@ -952,14 +952,14 @@ void KWFrameMoveCommand::unexecute()
         frame->moveTopLeft( (*moveIt).oldPos );
 
         frame->updateRulerHandles();
-        needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO );
+        needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO );
     }
 
     if ( doc )
     {
         doc->updateAllFrames();
-        if ( needRelayout )
-            doc->layout();
+        if ( needRetqlayout )
+            doc->tqlayout();
         doc->updateRulerFrameStartEnd();
         doc->repaintAllViews();
     }
@@ -995,7 +995,7 @@ void KWFramePropertiesCommand::execute()
     {
         doc->frameChanged( frame );
         doc->updateAllFrames();
-        doc->layout();
+        doc->tqlayout();
         doc->repaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
@@ -1016,7 +1016,7 @@ void KWFramePropertiesCommand::unexecute()
     {
         doc->frameChanged( frame );
         doc->updateAllFrames();
-        doc->layout();
+        doc->tqlayout();
         doc->repaintAllViews();
         doc->updateRulerFrameStartEnd();
     }
@@ -1226,7 +1226,7 @@ void KWDeleteTableCommand::execute()
     doc->refreshDocStructure((int)Tables);
     doc->updateAllFrames();
     m_pTable->updateFrames(); // not in the doc list anymore, so the above call didn't do it!
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
     doc->updateRulerFrameStartEnd();
 
@@ -1240,7 +1240,7 @@ void KWDeleteTableCommand::unexecute()
     doc->addFrameSet(m_pTable);
     doc->refreshDocStructure((int)Tables);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
     doc->updateRulerFrameStartEnd();
 }
@@ -1284,7 +1284,7 @@ void KWInsertColumnCommand::execute()
     }
     Q_ASSERT(m_pTable->boundingRect().right() <= m_maxRight);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
 }
 
@@ -1300,7 +1300,7 @@ void KWInsertColumnCommand::unexecute()
         m_pTable->resizeWidth(m_oldWidth);
     }
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
 }
 
@@ -1332,7 +1332,7 @@ void KWInsertRowCommand::execute()
         m_pTable->insertNewRow(m_rowPos);  //only happens the first time
     }
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
 }
 
@@ -1345,7 +1345,7 @@ void KWInsertRowCommand::unexecute()
     m_pTable->deleteRow( m_rowPos, *m_rr);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
@@ -1372,7 +1372,7 @@ void KWRemoveRowCommand::execute()
     m_pTable->deleteRow( m_rowPos, *m_rr);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWRemoveRowCommand::unexecute()
@@ -1381,7 +1381,7 @@ void KWRemoveRowCommand::unexecute()
     KWDocument * doc = m_pTable->kWordDocument();
     m_pTable->reInsertRow(*m_rr);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
 }
 
@@ -1407,7 +1407,7 @@ void KWRemoveColumnCommand::execute()
 
     m_pTable->deleteColumn( m_colPos, *m_rc);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWRemoveColumnCommand::unexecute()
@@ -1416,7 +1416,7 @@ void KWRemoveColumnCommand::unexecute()
     KWDocument * doc = m_pTable->kWordDocument();
     m_pTable->reInsertColumn(*m_rc);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
     doc->repaintAllViews();
 }
 
@@ -1441,7 +1441,7 @@ void KWSplitCellCommand::execute()
     //kdDebug()<<"split Cell m_colBegin :"<<m_colBegin<<" m_colEnd :"<<m_colEnd<<" m_rowBegin :"<<m_rowBegin<<" m_colEnd :"<<m_colEnd<<endl;
     m_pTable->splitCell(m_rowEnd, m_colEnd,m_colBegin,m_rowBegin,m_ListFrameSet);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWSplitCellCommand::unexecute()
@@ -1478,7 +1478,7 @@ void KWSplitCellCommand::unexecute()
         m_rowBegin+m_rowEnd-1+cell->rowSpan()-1);
 
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
@@ -1507,7 +1507,7 @@ void KWJoinCellCommand::execute()
     doc->terminateEditing(m_pTable);
     m_pTable->joinCells(m_colBegin,m_rowBegin,m_colEnd,m_rowEnd);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 void KWJoinCellCommand::unexecute()
@@ -1517,7 +1517,7 @@ void KWJoinCellCommand::unexecute()
     doc->terminateEditing(m_pTable);
     m_pTable->splitCell(m_rowEnd-m_rowBegin+1, m_colEnd-m_colBegin+1,m_colBegin,m_rowBegin,m_ListFrameSet,m_copyFrame);
     doc->updateAllFrames();
-    doc->layout();
+    doc->tqlayout();
 }
 
 
@@ -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").arg(m_pgNum);
+                  : i18n("Delete Page %1").tqarg(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()->invalidate(0);
+        m_var->paragraph()->tqinvalidate(0);
         m_var->paragraph()->setChanged( true );
     }
 
@@ -1986,7 +1986,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet
     if ( frameset)
         frameset->renumberFootNotes();
 
-    // Re-layout the footnote/endnote frame
+    // Re-tqlayout the footnote/endnote frame
     KWFrame* footNoteFrame = m_var->frameSet()->frame( 0 );
     int framePage = footNoteFrame->pageNumber();
     m_doc->recalcFrames( framePage, -1 );
@@ -2061,14 +2061,14 @@ KWResizeColumnCommand::KWResizeColumnCommand( KWTableFrameSet *table, int col, d
 void KWResizeColumnCommand::execute()
 {
   m_table->resizeColumn(m_col, m_newSize);
-  m_table->kWordDocument()->layout();
+  m_table->kWordDocument()->tqlayout();
   m_table->kWordDocument()->repaintAllViews();
 }
 
 void KWResizeColumnCommand::unexecute()
 {
   m_table->resizeColumn(m_col, m_oldSize);
-  m_table->kWordDocument()->layout();
+  m_table->kWordDocument()->tqlayout();
   m_table->kWordDocument()->repaintAllViews();
 }
 
diff --git a/kword/KWCommand.h b/kword/KWCommand.h
index 71d13f1f3..7c905fb39 100644
--- a/kword/KWCommand.h
+++ b/kword/KWCommand.h
@@ -380,7 +380,7 @@ protected:
     bool m_oldValue;
 };
 
-///////////////////////////////layout command///////////////////////////
+///////////////////////////////tqlayout command///////////////////////////
 struct KWPageLayoutStruct {
     KWPageLayoutStruct( const KoPageLayout& pgLayout, const KoColumns& cl, const KoKWHeaderFooter& hf )
         : _pgLayout(pgLayout), _cl(cl), _hf(hf) {
@@ -391,7 +391,7 @@ struct KWPageLayoutStruct {
 };
 
 /**
- * Command created when changing the page layout
+ * Command created when changing the page tqlayout
  */
 class KWPageLayoutCommand : public KNamedCommand
 {
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 82db66e88..977ff3222 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "KWConfig.h"
 #include "KWView.h"
@@ -75,7 +75,7 @@ using namespace KSpell2;
 // (Note: KDialogBase should have version of the methods that take a TQString for the icon name)
 static inline TQPixmap loadIcon( const char * name ) {
   return KGlobal::instance()->iconLoader()
-    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
 KWConfig::KWConfig( KWView* parent )
@@ -217,7 +217,7 @@ ConfigureSpellPage::ConfigureSpellPage( KWView *view, TQVBox *box, char *name )
     config = KWFactory::instance()->config();
     m_spellConfigWidget = new ConfigWidget( view->broker(), box );
     m_spellConfigWidget->setBackgroundCheckingButtonShown( true );
-    m_spellConfigWidget->layout()->setMargin( 0 );
+    m_spellConfigWidget->tqlayout()->setMargin( 0 );
 }
 
 void ConfigureSpellPage::apply()
@@ -655,7 +655,7 @@ KCommand *ConfigureMiscPage::apply()
     }
     if ( needRepaint )
     {
-        doc->layout();
+        doc->tqlayout();
         doc->repaintAllViews();
     }
     return macroCmd;
@@ -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):").arg(doc->unitName()), hbTabStop);
+    tabStop = new TQLabel(i18n("Tab stop (%1):").tqarg(doc->unitName()), hbTabStop);
     m_tabStopWidth = new KoUnitDoubleSpinBox( hbTabStop,
                                               MM_TO_POINT(2),
                                               doc->pageManager()->page(doc->startPage())->width(),
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index e0bf26de3..8cfa8975a 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -35,7 +35,7 @@
 #include <tqvbuttongroup.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 
 
@@ -81,8 +81,8 @@ void KWConfigFootNoteDia::setupTab3()
         "of the three alignments.");
     TQWhatsThis::add(positionGroupBox, comment);
     positionGroupBox->setColumnLayout(0, Qt::Vertical );
-    TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->layout() );
-    positionLayout->setAlignment( TQt::AlignTop );
+    TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() );
+    positionLayout->tqsetAlignment( TQt::AlignTop );
 
     // i18n context information necessary for gender considerations (e.g. in Polish)
     rbPosLeft = new TQRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" );
@@ -106,35 +106,35 @@ void KWConfigFootNoteDia::setupTab3()
             break;
     }
 
-    TQGridLayout *layout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint());
+    TQGridLayout *tqlayout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint());
 
     spWidth = new KoUnitDoubleSpinBox(page, 0, 5, 0.5, m_doc->footNoteSeparatorLineWidth(), m_doc->unit(), 1);
 
-    layout->addWidget( spWidth, 1, 1 );
+    tqlayout->addWidget( spWidth, 1, 1 );
 
     spLength = new KIntNumInput( page, "spLength" );
     spLength->setRange( 1, 100, 1,false );
     spLength->setValue( m_doc->footNoteSeparatorLineLength());
     spLength->setSuffix(i18n(" %"));
-    layout->addWidget( spLength, 0, 1 );
+    tqlayout->addWidget( spLength, 0, 1 );
 
     TQLabel *lSize = new TQLabel( i18n( "&Width:"), page );
     lSize->setBuddy( spWidth );
     comment= i18n ("The width is the thickness of the separator line, set to 0 for no separator line.");
     TQWhatsThis::add(lSize, comment);
     TQWhatsThis::add(spWidth, comment);
-    layout->addWidget( lSize, 1, 0 );
+    tqlayout->addWidget( lSize, 1, 0 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout->addMultiCell( spacer, 0, 1, 2, 2 );
+    tqlayout->addMultiCell( spacer, 0, 1, 2, 2 );
 
     TQLabel *lWidth = new TQLabel( i18n("&Size on page:"), page, "lWidth" );
     lWidth->setBuddy( spLength );
     comment= i18n ("The size of the separator line can be defined as a percentage of the width of the page.");
     TQWhatsThis::add(spLength, comment);
     TQWhatsThis::add(lWidth, comment);
-    layout->addWidget( lWidth, 0, 0 );
-    pageLayout->addLayout( layout );
+    tqlayout->addWidget( lWidth, 0, 0 );
+    pageLayout->addLayout( tqlayout );
 
     TQHBoxLayout *styleLayout = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "styleLayout");
 
diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp
index 1c802156c..131192e9b 100644
--- a/kword/KWCreateBookmarkDia.cpp
+++ b/kword/KWCreateBookmarkDia.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include "KWDocument.h"
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
diff --git a/kword/KWCreateBookmarkDiaBase.ui b/kword/KWCreateBookmarkDiaBase.ui
index e789ac282..0d164ed47 100644
--- a/kword/KWCreateBookmarkDiaBase.ui
+++ b/kword/KWCreateBookmarkDiaBase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index aec0eebf8..12f7b3b59 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove)
     : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, parent, "Delete Table items dialog", true )
@@ -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.arg( m_toRemove.first() + 1 ); // +1 because humans count from 1
+        message = message.tqarg( m_toRemove.first() + 1 ); // +1 because humans count from 1
     }
     else {
         message = m_type == deleteRow ? i18n( "Delete rows: %1 ?" ) : i18n( "Delete columns: %1 ?" );
@@ -70,12 +70,12 @@ void KWDeleteDia::setupTab1() {
                 rows += ", ";
             rows += TQString().setNum((*items) +1);
         }
-        message = message.arg( rows );
+        message = message.tqarg( rows );
     }
 
     TQLabel *rc = new TQLabel( message , tab1 );
-    rc->resize( rc->sizeHint() );
-    rc->setAlignment( AlignLeft | AlignBottom );
+    rc->resize( rc->tqsizeHint() );
+    rc->tqsetAlignment( AlignLeft | AlignBottom );
     grid1->addWidget( rc, 1, 0 );
 }
 
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index bf39df9f5..5fe52cf6a 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -44,7 +44,7 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 /******************************************************************/
 /* Class: KWOrderedFrameSet                                       */
@@ -385,12 +385,12 @@ void KWDocStructTextFrameSetItem::setupTextFrames()
         if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP )
         {
             if ( dok->numColumns() == 1 )
-                name=i18n( "Page %1" ).arg(TQString::number(j + 1));
+                name=i18n( "Page %1" ).tqarg(TQString::number(j + 1));
             else
-                name=i18n( "Column %1" ).arg(TQString::number(j + 1));
+                name=i18n( "Column %1" ).tqarg(TQString::number(j + 1));
         }
         else
-            name=i18n( "Text Frame %1" ).arg(TQString::number(j + 1));
+            name=i18n( "Text Frame %1" ).tqarg(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").arg(TQString::number(i+1));
+            _name=i18n("Formula Frame %1").tqarg(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").arg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).arg(++j);
+            _name=i18n("Picture (%1) %2").tqarg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).tqarg(++j);
             child = new KWDocStructPictureItem(this, _name, dynamic_cast<KWPictureFrameSet*>( frameset ));
         }
     }
diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h
index 87ac0f6f1..2eb4eb9d5 100644
--- a/kword/KWDocStruct.h
+++ b/kword/KWDocStruct.h
@@ -290,7 +290,7 @@ public:
 
     void setup();
     void refreshTree(int _type);
-    TQSize minimumSizeHint() const {
+    TQSize tqminimumSizeHint() const {
         return TQSize( 0, 0 );
     }
     void selectItem();
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 55f5f351a..9420f0481 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -483,8 +483,8 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint )
 
     // First recalc all frames (including the kotextdocument width)
     updateAllFrames();
-    // Then relayout the text inside the frames
-    layout();
+    // Then retqlayout the text inside the frames
+    tqlayout();
     if ( updateViews )
     {
         emit newContentsSize();
@@ -617,9 +617,9 @@ KoPageLayout KWDocument::pageLayout(int pageNumber /* = 0 */) const
     return pageManager()->pageLayout(pageNumber);
 }
 
-void KWDocument::setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews )
+void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews )
 {
-    m_pageLayout = layout;
+    m_pageLayout = tqlayout;
     if ( m_processingType == WP ) {
         m_pageColumns = cl;
     }
@@ -643,8 +643,8 @@ void KWDocument::setPageLayout( const KoPageLayout& layout, const KoColumns& cl,
 
     if ( updateViews )
     {
-        // Invalidate document layout, for proper repaint
-        this->layout();
+        // Invalidate document tqlayout, for proper tqrepaint
+        this->tqlayout();
         emit pageLayoutChanged( m_pageLayout );
         updateContentsSize();
     }
@@ -953,10 +953,10 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla
         if ( fromPage > toPage ) // this can happen with "endnotes only" pages :) // ### really?
             fromPage = toPage; // ie. start at the last real page
         KWFrameLayout frameLayout( this, headerFooterList, footnotesHFList, endnotesHFList );
-        frameLayout.layout( frameset, m_pageColumns.columns, fromPage, toPage, flags );
+        frameLayout.tqlayout( frameset, m_pageColumns.columns, fromPage, toPage, flags );
 
         // If the number of pages changed, update views and variables etc.
-        // (now that the frame layout has been done)
+        // (now that the frame tqlayout has been done)
         if ( pageCount() != oldPages && !m_bGeneratingPreview )
         {
             // Very much like the end of appendPage, but we don't want to call recalcFrames ;)
@@ -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( children() );
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     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." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
         return false;
     }
 
@@ -1072,7 +1072,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles
 
     // In theory the page format is the style:master-page-name of the first paragraph...
     // But, hmm, in a doc with only a table there was no reference to the master page at all...
-    // So we load the standard page layout to start with, and in KWTextParag
+    // So we load the standard page tqlayout to start with, and in KWTextParag
     // we might overwrite it with another one.
     m_loadingInfo->m_currentMasterPage = "Standard";
     if ( !loadOasisPageLayout( m_loadingInfo->m_currentMasterPage, context ) )
@@ -1133,15 +1133,15 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles
 
         // load padding, background and borders for the main frame
         const TQDomElement* masterPage = context.oasisStyles().masterPages()[ m_loadingInfo->m_currentMasterPage ];
-        const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
+        const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
         if ( masterPageStyle )
         {
           KoStyleStack styleStack;
           styleStack.push(  *masterPageStyle );
-          styleStack.setTypeProperties( "page-layout" );
+          styleStack.setTypeProperties( "page-tqlayout" );
           frame->loadBorderProperties( styleStack );
         }
-        fs->renumberFootNotes( false /*no repaint*/ );
+        fs->renumberFootNotes( false /*no tqrepaint*/ );
 
     } else {
         // DTP mode: the items in the body are page-sequence and then frames
@@ -1152,7 +1152,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles
             const TQString localName = tag.localName();
             if ( localName == "page-sequence" && tag.namespaceURI() == KoXmlNS::text )
             {
-                // We don't have support for changing the page layout yet, so just take the
+                // We don't have support for changing the page tqlayout yet, so just take the
                 // number of pages
                 int pages=1;
                 TQDomElement page;
@@ -1205,14 +1205,14 @@ bool KWDocument::loadOasisPageLayout( const TQString& masterPageName, KoOasisCon
     const KoOasisStyles& oasisStyles = context.oasisStyles();
     const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ];
     Q_ASSERT( masterPage );
-    const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
+    const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
     Q_ASSERT( masterPageStyle );
     if ( masterPageStyle )
     {
         m_pageLayout.loadOasis( *masterPageStyle );
         pageManager()->setDefaultPage(m_pageLayout);
 
-        const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) );
+        const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) );
         const TQDomElement footnoteSep = KoDom::namedItemNS( properties, KoXmlNS::style, "footnote-sep" );
         if ( !footnoteSep.isNull() ) {
             // style:width="0.018cm" style:distance-before-sep="0.101cm"
@@ -1292,24 +1292,24 @@ bool KWDocument::loadMasterPageStyle( const TQString& masterPageName, KoOasisCon
     const KoOasisStyles& oasisStyles = context.oasisStyles();
     const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ];
     Q_ASSERT( masterPage );
-    const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
+    const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
     Q_ASSERT( masterPageStyle );
 
     // This check is done here and not in loadOasisPageLayout in case the Standard master-page
     // has no page information but the first paragraph points to a master-page that does (#129585)
     if ( m_pageLayout.ptWidth <= 1e-13 || m_pageLayout.ptHeight <= 1e-13 )
     {
-        // Loading page layout failed, try to see why.
-        TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) );
+        // Loading page tqlayout failed, try to see why.
+        TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) );
         //if ( properties.isNull() )
-        //    setErrorMessage( i18n( "Invalid document. No page layout properties were found. The application which produced this document isn't OASIS-compliant." ) );
+        //    setErrorMessage( i18n( "Invalid document. No page tqlayout properties were found. The application which produced this document isn't OASIS-compliant." ) );
         //else if ( properties.hasAttributeNS( KoXmlNS::fo, "page-width" ) )
-        //    setErrorMessage( i18n( "Invalid document. Page layout has no page width. The application which produced this document isn't OASIS-compliant." ) );
+        //    setErrorMessage( i18n( "Invalid document. Page tqlayout has no page width. The application which produced this document isn't OASIS-compliant." ) );
         //else
         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" ).arg( m_pageLayout.ptWidth ).arg( m_pageLayout.ptHeight ) );
+            setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).tqarg( m_pageLayout.ptWidth ).tqarg( 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" ).arg( value ) );
+        setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).tqarg( 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.").arg(m_syntaxVersion),
+                    "Opening it in this version of KWord will lose some information.").tqarg(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" )
-                    .arg( pgLayout.ptWidth ).arg( pgLayout.ptHeight ) );
+                    .tqarg( pgLayout.ptWidth ).tqarg( 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 repaint*/ );
+        frameset->renumberFootNotes( false /*no tqrepaint*/ );
 
     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 repaint yet*/ );
+            fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't tqrepaint 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 repaint*/ );
+            static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no tqrepaint*/ );
     }
     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").arg("\\d*").arg("){0,1}") );
+        TQString searchString( "^(" + i18n("Copy%1-%2").tqarg("\\d*").tqarg("){0,1}") );
         searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-'
         TQRegExp searcher(searchString);
         int count=0;
         do {
             newName=oldName;
-            newName.replace(searcher,i18n("Copy%1-%2").arg(count > 0? TQString("%1").arg(count):"").arg(""));
+            newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg(""));
             count++;
         } while ( frameSetByName( newName ) );
     }
@@ -2705,7 +2705,7 @@ void KWDocument::completePasting()
     processAnchorRequests();
     if ( processFootNoteRequests() )
     {
-        // We pasted footnotes. Relayout frames.
+        // We pasted footnotes. Retqlayout frames.
         recalcFrames();
     }
 
@@ -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->geometry();
+                        TQRect r = ch->tqgeometry();
                         r.moveBy( (int)offset, (int)offset );
                         ch->setGeometry( r );
                     }
@@ -2804,7 +2804,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S
     if ( saveFlag == SaveAll )
         pictureList = savePictureList();
 
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME ); // for "current time"
     recalcVariables( VT_STATISTIC );
@@ -2837,7 +2837,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S
         }
 
         // Header and footers save their content into master-styles/master-page, and their
-        // styles into the page-layout automatic-style.
+        // styles into the page-tqlayout automatic-style.
         // However the paragraph styles used by header/footers need to be known before
         // hand, to promote them to styles.xml. So we collect them first, which means
         // storing the content into a buffer.
@@ -3235,7 +3235,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
         buffer.close();
 
         if ( m_pageColumns.columns > 1 ) {
-            buffer.setBuffer(TQByteArray()); // clear data
+            buffer.tqsetBufferFromCopy(TQByteArray()); // clear data
             buffer.open( IO_WriteOnly );
             KoXmlWriter columnsTmpWriter( TQT_TQIODEVICE(&buffer) );  // TODO pass indentation level
             columnsTmpWriter.startElement( "style:columns" );
@@ -3251,8 +3251,8 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
         // if there's more than one pagemaster we need to rethink all this
 
         pageLayoutName = mainStyles.lookup( pageLayout, "pm" );
-        pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-layout", pageLayoutName,
-                               "style:page-layout-properties", false /*don't close*/ );
+        pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", pageLayoutName,
+                               "style:page-tqlayout-properties", false /*don't close*/ );
 
         // Ouch another problem: there is only one header style in oasis
         // ##### can't have different borders for even/odd headers...
@@ -3301,7 +3301,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
                 stylesWriter->endElement(); // header-style
             }
         }
-        stylesWriter->endElement(); // style:page-layout
+        stylesWriter->endElement(); // style:page-tqlayout
 
         // Headers and footers might have created new automatic parag/text styles -> save those
         KWOasisSaver::writeAutomaticStyles( *stylesWriter, mainStyles, true );
@@ -3313,7 +3313,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
     stylesWriter->startElement( "office:master-styles" );
     stylesWriter->startElement( "style:master-page" );
     stylesWriter->addAttribute( "style:name", "Standard" );
-    stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName );
+    stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName );
 
     if ( isHeaderVisible() || isFooterVisible() ) { // ### TODO save them even when hidden (and not empty)?
         stylesWriter->addCompleteElement( headerFooterContent.data() );
@@ -3405,7 +3405,7 @@ void KWDocument::saveOasisBody( KoXmlWriter& writer, KoSavingContext& context )
 
 TQDomDocument KWDocument::saveXML()
 {
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME ); // for "current time"
     recalcVariables( VT_STATISTIC );
@@ -3601,7 +3601,7 @@ TQDomDocument KWDocument::saveXML()
     }
 
     // Save embedded objects
-    saveEmbeddedObjects( kwdoc, children() );
+    saveEmbeddedObjects( kwdoc, tqchildren() );
     return doc;
 }
 
@@ -3779,7 +3779,7 @@ void KWDocument::paintContent( TQPainter& painter, const TQRect& rectangle, bool
     viewMode->setDrawFrameBackground( !transparent );
     viewMode->setDrawSelections( false );
 
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
 
     if (!transparent)
     {
@@ -3810,8 +3810,8 @@ TQPixmap KWDocument::generatePreview( const TQSize& size )
     double oldZoomX = zoomedResolutionX();
     double oldZoomY = zoomedResolutionY();
 
-    // Sometimes (due to the different resolution?) the layout creates a new page
-    // while saving the preview. If this happens, we don't want to repaint the real views
+    // 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
     // (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 ); // repaint etc.
+    frameChanged( frame ); // tqrepaint etc.
 
     return frameset;
 }
@@ -4210,7 +4210,7 @@ TQString KWDocument::generateFramesetName( const TQString & templateName )
     int num = 1;
     bool exists;
     do {
-        name = templateName.arg( num );
+        name = templateName.tqarg( num );
         exists = frameSetByName( name );
         ++num;
     } while ( exists );
@@ -4364,7 +4364,7 @@ void KWDocument::setHeaderVisible( bool h )
     m_headerVisible = h;
     recalcFrames();
     updateAllFrames();
-    layout();
+    tqlayout();
     setModified(true);
     repaintAllViews( true );
 }
@@ -4374,7 +4374,7 @@ void KWDocument::setFooterVisible( bool f )
     m_footerVisible = f;
     recalcFrames();
     updateAllFrames();
-    layout();
+    tqlayout();
     setModified(true);
     repaintAllViews( true );
 }
@@ -4457,9 +4457,9 @@ void KWDocument::setMailMergeRecord( int r )
     slRecordNum = r;
 }
 
-void KWDocument::getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf )
+void KWDocument::getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf )
 {
-    layout = m_pageLayout;
+    tqlayout = m_pageLayout;
     cl = m_pageColumns;
     hf = m_pageHeaderFooter;
 }
@@ -4560,20 +4560,20 @@ void KWDocument::printDebug()
 }
 #endif
 
-void KWDocument::layout()
+void KWDocument::tqlayout()
 {
     TQPtrListIterator<KWFrameSet> it = framesetsIterator();
     for (; it.current(); ++it )
         if ( it.current()->isVisible() )
-            it.current()->layout();
+            it.current()->tqlayout();
 }
 
-void KWDocument::invalidate(const KWFrameSet *skipThisFrameSet)
+void KWDocument::tqinvalidate(const KWFrameSet *skipThisFrameSet)
 {
     TQPtrListIterator<KWFrameSet> it = framesetsIterator();
     for (; it.current(); ++it )
         if(it.current()!=skipThisFrameSet)
-            it.current()->invalidate();
+            it.current()->tqinvalidate();
 }
 
 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 invalidate the previous page, from where the paragraph disappeared.
+    // we also need to tqinvalidate 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->invalidate( 0 );
+                parag->tqinvalidate( 0 );
                 parag->setChanged( true );
             }
         }
@@ -5058,7 +5058,7 @@ void KWDocument::changeFootNoteConfig()
             KoTextParag * parag = footNoteVar->paragraph();
             if ( parag )
             {
-                parag->invalidate( 0 );
+                parag->tqinvalidate( 0 );
                 parag->setChanged( true );
             }
             KoTextDocument* textdoc = parag->textDocument();
@@ -5083,7 +5083,7 @@ void KWDocument::setTabStopValue ( double tabStop )
     KWTextFrameSet *frm;
     for ( frm=textFramesets.first(); frm != 0; frm=textFramesets.next() ){
         frm->textDocument()->setTabStops( ptToLayoutUnitPixX( tabStop ));
-        frm->layout();
+        frm->tqlayout();
     }
     repaintAllViews();
 }
@@ -5120,11 +5120,11 @@ void KWDocument::switchViewMode( const TQString& newViewModeType )
         (*it)->switchModeView();
     emit newContentsSize();
 
-    // Since the text layout depends on the view mode, we need to redo it
+    // Since the text tqlayout depends on the view mode, we need to redo it
     // But after telling the canvas about the new viewmode, otherwise stuff like
     // slotNewContentsSize will crash.
     updateAllFrames();
-    layout();
+    tqlayout();
 
     repaintAllViews( true );
     for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it )
@@ -5395,7 +5395,7 @@ void KWDocument::setEmpty()
 {
     KoDocument::setEmpty();
     // Whether loaded from template or from empty doc: this is a new one -> set creation date
-    m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE ); // , VST_CREATION_DATE ...
     // If we then load a document, it will override that date.
 }
@@ -5466,15 +5466,15 @@ void KWDocument::FramesChangedHandler::execute() {
             KWFrameSet *fs = *iter;
             fs->updateFrames();
             if(!m_needLayout)
-                fs->layout();
+                fs->tqlayout();
         }
 
         KWFrameList::recalcAllFrames(m_parent);
     }
 
-    // If frame with text flowing around it -> re-layout all frames
+    // If frame with text flowing around it -> re-tqlayout all frames
     if ( m_needLayout)
-        m_parent->layout();
+        m_parent->tqlayout();
     //m_parent->repaintAllViewsExcept( 0 );
     m_parent->repaintAllViews();
     m_parent->updateRulerFrameStartEnd();
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index 1a9aa16e3..fcda863fa 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -214,9 +214,9 @@ public:
     /// because KoDocument:insertChild is protected.
     KWDocumentChild* createChildDoc( const KoRect& rect, KoDocument* childDoc );
 
-    void setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true );
+    void setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true );
 
-    void getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf );
+    void getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf );
 
     KWTextFrameSet * textFrameSet ( unsigned int num ) const;
     /// Return the frameset number @p num
@@ -268,12 +268,12 @@ public:
 
 
     /**
-     * schedule a repaint of all views but don't execute immediately
+     * schedule a tqrepaint of all views but don't execute immediately
      */
     void delayedRepaintAllViews();
 
     /**
-     * schedule a frame layout (e.g. for footnotes) but don't execute immediately
+     * schedule a frame tqlayout (e.g. for footnotes) but don't execute immediately
      */
     void delayedRecalcFrames( int fromPage );
 
@@ -437,7 +437,7 @@ public:
     //int applyStyleChangeMask() { return styleMask; }
     //void setApplyStyleChangeMask( int f ) { styleMask = f; }
 
-    // paragLayoutChanged is a set of flags for the parag layout - see the enum in KWParagLayout
+    // paragLayoutChanged is a set of flags for the parag tqlayout - see the enum in KWParagLayout
     // formatChanged is a set of flags from KoTextFormat
     // If both are -1, it means the style has been deleted.
     void applyStyleChange( KoStyleChangeDefMap changed );
@@ -519,7 +519,7 @@ public:
     void newZoomAndResolution( bool updateViews, bool forPrint );
 
     /**
-     * Due to the way the text formatter works (it caches layout information in
+     * Due to the way the text formatter works (it caches tqlayout information in
      * the paragraphs and characters), we currently can't have one viewmode per view.
      * It has to be the same for all views.
      */
@@ -565,8 +565,8 @@ public:
     void printDebug();
 #endif
 
-    /** calls layout() on all framesets  */
-    void layout();
+    /** calls tqlayout() on all framesets  */
+    void tqlayout();
 
     // This settings has to be here [instead of KWView] because we need to
     // format paragraphs slightly differently (to add room for the CR char)
@@ -764,7 +764,7 @@ public:
 
     KWBgSpellCheck* backSpeller() const { return m_bgSpellCheck; }
 
-    /// Load the given page layout; public for KWTextParag
+    /// Load the given page tqlayout; public for KWTextParag
     bool loadOasisPageLayout( const TQString& masterPageName, KoOasisContext& context );
 
     // end of public methods
@@ -773,7 +773,7 @@ signals:
     /// This is emitted by setPageLayout if updateViews=true
     void pageLayoutChanged( const KoPageLayout& );
 
-    /// Emitted when the scrollview contents must be resized (e.g. new page, new layout...)
+    /// Emitted when the scrollview contents must be resized (e.g. new page, new tqlayout...)
     void newContentsSize();
 
     /** This is emitted when the height of the text in the main frameset changes
@@ -796,8 +796,8 @@ public slots:
     void slotRepaintChanged( KWFrameSet * frameset );
     void framesChanged( const TQValueList<KWFrame*> &frames);
 
-    /** calls invalidate() on all framesets  */
-    void invalidate(const KWFrameSet *skipThisFrameSet=0);
+    /** calls tqinvalidate() on all framesets  */
+    void tqinvalidate(const KWFrameSet *skipThisFrameSet=0);
 
     virtual void initEmpty();
 
diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 501705e09..3638301db 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -30,7 +30,7 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const char *name )
     : KDialogBase( parent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true )
@@ -40,62 +40,62 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch
     setMainWidget(page);
     TQGridLayout* form1Layout = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint(), "form1Layout");
 
-    TQHBoxLayout *horlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout1");
+    TQHBoxLayout *hortqlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout1");
 
     TQLabel *groupnameLabel = new TQLabel(i18n("Group name:"), page, "groupnameLabel" );
-    horlayout1->addWidget( groupnameLabel );
+    hortqlayout1->addWidget( groupnameLabel );
 
     m_groupLineEdit = new TQLineEdit( page, "groupLineEdit" );
-    horlayout1->addWidget( m_groupLineEdit );
+    hortqlayout1->addWidget( m_groupLineEdit );
 
-    form1Layout->addLayout( horlayout1, 0, 1 );
+    form1Layout->addLayout( hortqlayout1, 0, 1 );
 
     TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" );
-    expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) );
+    expressionGroupBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) );
     expressionGroupBox->setTitle( i18n( "Expressions" ) );
     expressionGroupBox->setColumnLayout(0, Qt::Vertical );
-    expressionGroupBox->layout()->setSpacing( KDialog::spacingHint() );
-    expressionGroupBox->layout()->setMargin( KDialog::marginHint() );
-    TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->layout() );
-    expressionGroupBoxLayout->setAlignment( TQt::AlignTop );
+    expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+    expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() );
+    TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() );
+    expressionGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
 
     m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" );
-    m_ExpressionsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) );
+    m_ExpressionsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) );
     expressionGroupBoxLayout->addWidget( m_ExpressionsList );
 
     m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" );
     expressionGroupBoxLayout->addWidget( m_expressionLineEdit );
 
-    TQHBoxLayout *horlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout2");
+    TQHBoxLayout *hortqlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout2");
     TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    horlayout2->addItem( spacer );
+    hortqlayout2->addItem( spacer );
 
     m_addExpression = new TQPushButton( i18n("&New"), expressionGroupBox, "m_addExpression" );
-    horlayout2->addWidget( m_addExpression );
+    hortqlayout2->addWidget( m_addExpression );
 
     m_delExpression = new TQPushButton( i18n("&Delete"), expressionGroupBox, "m_delExpression" );
-    horlayout2->addWidget( m_delExpression );
-    expressionGroupBoxLayout->addLayout( horlayout2 );
+    hortqlayout2->addWidget( m_delExpression );
+    expressionGroupBoxLayout->addLayout( hortqlayout2 );
 
     form1Layout->addWidget( expressionGroupBox, 1, 1 );
 
-    TQVBoxLayout *vertlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "vertlayout");
+    TQVBoxLayout *verttqlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "verttqlayout");
 
     m_groupList = new TQListBox( page, "groupList" );
     m_groupList->insertItem( "group1"  );
     m_groupList->setMaximumSize( TQSize( 200, 32767 ) );
-    vertlayout->addWidget( m_groupList );
+    verttqlayout->addWidget( m_groupList );
 
-    TQHBoxLayout *horlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout3");
+    TQHBoxLayout *hortqlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout3");
 
     m_addGroup = new TQPushButton( i18n("New"), page, "m_addGroup" );
-    horlayout3->addWidget( m_addGroup );
+    hortqlayout3->addWidget( m_addGroup );
 
     m_delGroup = new TQPushButton(i18n("Delete"), page, "m_delGroup" );
-    horlayout3->addWidget( m_delGroup );
-    vertlayout->addLayout( horlayout3 );
+    hortqlayout3->addWidget( m_delGroup );
+    verttqlayout->addLayout( hortqlayout3 );
 
-    form1Layout->addMultiCellLayout( vertlayout, 0, 1, 0, 0 );
+    form1Layout->addMultiCellLayout( verttqlayout, 0, 1, 0, 0 );
 
     loadFile();
     if(listExpression.count() == 0)
diff --git a/kword/KWFindReplace.cpp b/kword/KWFindReplace.cpp
index 6b9ce223f..f1168ba31 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 repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
-    textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, repaint, dialog );
+    bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
+    textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog );
 }
 
 #include "KWFindReplace.moc"
diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp
index 5822c299d..24060cf23 100644
--- a/kword/KWFootNoteDia.cpp
+++ b/kword/KWFootNoteDia.cpp
@@ -25,7 +25,7 @@
 #include <tqradiobutton.h>
 
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include "KWConfigFootNoteDia.h"
 
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index f54942a45..f8d597e8c 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -219,7 +219,7 @@ void KWFormulaFrameSet::slotFormulaChanged( double width, double height )
     m_frames.first()->setHeight( height );
 
     updateFrames();
-    kWordDocument()->layout();
+    kWordDocument()->tqlayout();
     if ( ( oldWidth != width ) || ( oldHeight != height ) ) {
         kWordDocument()->repaintAllViews( false );
         kWordDocument()->updateRulerFrameStartEnd();
diff --git a/kword/KWFrame.cpp b/kword/KWFrame.cpp
index e1cdb9d8d..a559b8920 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()->invalidate();
+        frameSet()->anchorFrameset()->tqinvalidate();
 }
 
 
diff --git a/kword/KWFrame.h b/kword/KWFrame.h
index fbd53572b..88552259d 100644
--- a/kword/KWFrame.h
+++ b/kword/KWFrame.h
@@ -24,7 +24,7 @@
 
 #include "defs.h"
 #include <KoRect.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include "KoBorder.h"
 #include <tqptrlist.h>
 
@@ -221,7 +221,7 @@ public:
     /** The "internal Y" is the offset (in pt) of the real frame showed in this one
      * ("real" means "the last that isn't a copy")
      * This offset in pt is the sum of the height of the frames before that one.
-     * For text frames, this is equivalent to the layout units (after multiplication). */
+     * For text frames, this is equivalent to the tqlayout units (after multiplication). */
     void setInternalY( double y ) { m_internalY = y; }
     double internalY() const { return m_internalY; }
 
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index ec5578ee8..2d9cb4235 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -50,7 +50,7 @@
 #include <tqbuttongroup.h>
 #include <tqhbox.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -67,7 +67,7 @@ void KWBrushStylePreview::drawContents( TQPainter* painter )
 {
     painter->save();
     painter->translate( contentsRect().x(), contentsRect().y() );
-    painter->fillRect( contentsRect(), colorGroup().base() ); // in case of a transparent brush
+    painter->fillRect( contentsRect(), tqcolorGroup().base() ); // in case of a transparent brush
     painter->fillRect( contentsRect(), brush );
     painter->restore();
 }
@@ -102,7 +102,7 @@ KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame)
         kdDebug() << "ERROR: KWFrameDia::constructor no frame.."<<endl;
         return;
     }
-    setCaption( i18n( "Frame Properties for %1" ).arg( m_frame->frameSet()->name() ) );
+    setCaption( i18n( "Frame Properties for %1" ).tqarg( 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" ).arg( f->frameSet()->name() ) );
+        setCaption( i18n( "Frame Settings for %1" ).tqarg( f->frameSet()->name() ) );
 
     KWFrameSet *fs = f->frameSet()->groupmanager();
     if(fs==0L) fs=f->frameSet();
@@ -518,14 +518,14 @@ 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):").arg(m_doc->unitName()),m_sideHeads);
-        sideTitle1->resize(sideTitle1->sizeHint());
+        sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
+        sideTitle1->resize(sideTitle1->tqsizeHint());
         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):").arg(m_doc->unitName()),m_sideHeads);
-        sideTitle2->resize(sideTitle2->sizeHint());
+        sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
+        sideTitle2->resize(sideTitle2->tqsizeHint());
         m_sideGrid->addWidget(sideTitle2,2,0);
         m_sideGap = new TQLineEdit(m_sideHeads,"");
         m_sideGap->setMaxLength(6);
@@ -536,7 +536,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         m_sideAlign->insertItem ( i18n("Right"));
         m_sideAlign->insertItem ( i18n("Closest to Binding"));
         m_sideAlign->insertItem ( i18n("Closest to Page Edge"));
-        m_sideAlign->resize(m_sideAlign->sizeHint());
+        m_sideAlign->resize(m_sideAlign->tqsizeHint());
         m_sideGrid->addMultiCellWidget(m_sideAlign,3,3,0,1);
         m_sideGrid->addRowSpacing( 0, KDialog::marginHint() + 5 );
 
@@ -614,9 +614,9 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround
     // First groupbox
     m_runGroup = new TQButtonGroup(  i18n( "Layout of Text in Other Frames" ), m_tab2);
     m_runGroup->setColumnLayout( 0, Qt::Vertical );
-    m_runGroup->layout()->setSpacing( KDialog::spacingHint() );
-    TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->layout() );
-    groupBox1Layout->setAlignment( TQt::AlignTop );
+    m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+    TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() );
+    groupBox1Layout->tqsetAlignment( TQt::AlignTop );
 
     m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup );
     groupBox1Layout->addWidget( m_rRunNo, 0, 1 );
@@ -650,10 +650,10 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround
     // Second groupbox
     m_runSideGroup = new TQButtonGroup(  i18n( "Run Around Side" ), m_tab2);
     m_runSideGroup->setColumnLayout( 0, Qt::Vertical );
-    m_runSideGroup->layout()->setSpacing( KDialog::spacingHint() );
-    m_runSideGroup->layout()->setMargin( KDialog::marginHint() );
-    TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->layout() );
-    runSideLayout->setAlignment( TQt::AlignTop );
+    m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+    m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() );
+    TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() );
+    runSideLayout->tqsetAlignment( TQt::AlignTop );
 
     m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup );
     runSideLayout->addWidget( m_rRunLeft, 0, 0 /*1*/ );
@@ -803,9 +803,9 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     myGroup->insert(m_rExistingFrameset,1);
     connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected()));
 
-    TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6);
+    TQHBoxLayout *tqlayout2 = new TQHBoxLayout( 0, 0, 6);
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout2->addItem( spacer );
+    tqlayout2->addItem( spacer );
 
     m_lFrameSList = new TQListView( m_tab3, "m_lFrameSList" );
     m_lFrameSList->addColumn( i18n("No.") );
@@ -815,8 +815,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) );
     connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected()));
 
-    layout2->addWidget( m_lFrameSList );
-    tabLayout->addLayout( layout2 );
+    tqlayout2->addWidget( m_lFrameSList );
+    tabLayout->addLayout( tqlayout2 );
 
     m_rNewFrameset = new TQRadioButton( m_tab3);
     m_rNewFrameset->setText( i18n( "Create a new frameset" ) );
@@ -829,14 +829,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     line1->setFrameShape( TQFrame::HLine );
     tabLayout->addWidget( line1 );
 
-    TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 );
+    TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 );
     TQLabel *textLabel1 = new TQLabel( m_tab3 );
     textLabel1->setText( i18n( "Name of frameset:" ) );
-    layout1->addWidget( textLabel1 );
+    tqlayout1->addWidget( textLabel1 );
 
     m_eFrameSetName = new TQLineEdit( m_tab3 );
-    layout1->addWidget( m_eFrameSetName );
-    tabLayout->addLayout( layout1 );
+    tqlayout1->addWidget( m_eFrameSetName );
+    tabLayout->addLayout( tqlayout1 );
 
     int amount=0;
     // now fill the gui.
@@ -853,7 +853,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
         if ( fs->isDeleted() )
             continue;
         TQListViewItem *item = new TQListViewItem( m_lFrameSList );
-        item->setText( 0, TQString( "%1" ).arg( i + 1 ) );
+        item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
         item->setText( 1, fs->name() );
         amount++;
         if( m_frame && m_frame->frameSet() == fs ) {
@@ -961,43 +961,43 @@ void KWFrameDia::setupTab4() { // TAB Geometry
     TQGridLayout* pGrid = new TQGridLayout( m_grp1, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
     m_lx = new TQLabel( i18n( "Left:" ), m_grp1 );
-    m_lx->resize( m_lx->sizeHint() );
+    m_lx->resize( m_lx->tqsizeHint() );
     pGrid->addWidget( m_lx, 1, 0 );
 
     m_sx = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    m_sx->resize( m_sx->sizeHint() );
+    m_sx->resize( m_sx->tqsizeHint() );
     pGrid->addWidget( m_sx, 1, 1 );
 
     m_ly = new TQLabel( i18n( "Top:" ), m_grp1 );
-    m_ly->resize( m_ly->sizeHint() );
+    m_ly->resize( m_ly->tqsizeHint() );
     pGrid->addWidget( m_ly, 1, 2 );
 
     m_sy = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
-    m_sy->resize( m_sy->sizeHint() );
+    m_sy->resize( m_sy->tqsizeHint() );
     pGrid->addWidget( m_sy, 1, 3 );
 
     m_lw = new TQLabel( i18n( "Width:" ), m_grp1 );
-    m_lw->resize( m_lw->sizeHint() );
+    m_lw->resize( m_lw->tqsizeHint() );
     pGrid->addWidget( m_lw, 2, 0 );
 
     m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    m_sw->resize( m_sw->sizeHint() );
+    m_sw->resize( m_sw->tqsizeHint() );
     connect( m_sw, TQT_SIGNAL(valueChanged(double)),
              this, TQT_SLOT(slotUpdateHeightForWidth(double)) );
 
     pGrid->addWidget( m_sw, 2, 1 );
 
     m_lh = new TQLabel( i18n( "Height:" ), m_grp1 );
-    m_lh->resize( m_lh->sizeHint() );
+    m_lh->resize( m_lh->tqsizeHint() );
     pGrid->addWidget( m_lh, 2, 2 );
 
     m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
     connect( m_sh, TQT_SIGNAL(valueChanged(double)),
              this, TQT_SLOT(slotUpdateWidthForHeight(double)) );
 
-    m_sh->resize( m_sh->sizeHint() );
+    m_sh->resize( m_sh->tqsizeHint() );
 
     pGrid->addWidget( m_sh, 2, 3 );
 
@@ -1290,10 +1290,10 @@ void KWFrameDia::setupTab6() // Border style
 
     TQGroupBox *grp=new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" );
     grid->addMultiCellWidget( grp , 0, 7, 1, 1 );
-    grp->layout()->setSpacing(KDialog::spacingHint());
-    grp->layout()->setMargin(KDialog::marginHint());
+    grp->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp->tqlayout()->setMargin(KDialog::marginHint());
     m_prev3 = new KoBorderPreview( grp );
-    TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() );
+    TQVBoxLayout *lay1 = new TQVBoxLayout( grp->tqlayout() );
     lay1->addWidget(m_prev3);
 
     connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ),
@@ -1627,7 +1627,7 @@ void KWFrameDia::updateBrushPreview()
     } else {
         brushPreview->show();
         brushPreview->setBrush(frameBrushStyle());
-        brushPreview->repaint(true);
+        brushPreview->tqrepaint(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.").arg(name));
+                                                  "an existing frameset from the list.").tqarg(name));
                     else
                         KMessageBox::sorry( this,
                                             i18n( "A frameset with the name '%1' "
-                                                  "already exists. Please enter another name." ).arg(name) );
+                                                  "already exists. Please enter another name." ).tqarg(name) );
                     m_eFrameSetName->setText(m_oldFrameSetName);
                     return false;
                 }
@@ -2330,7 +2330,7 @@ bool KWFrameDia::applyChanges()
 void KWFrameDia::updateFrames()
 {
     m_doc->updateAllFrames();
-    m_doc->layout();
+    m_doc->tqlayout();
     m_doc->repaintAllViews();
 }
 
@@ -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?").arg(fs->name()),
+           "Are you sure you want to do that?").tqarg(fs->name()),
            i18n("Reconnect Frame"), i18n("&Reconnect"));
         if (result != KMessageBox::Continue)
             return false;
@@ -2397,7 +2397,7 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString&
     mGrid->addMultiCellWidget( m_synchronize, 1, 1, 0, 1 );
 
     TQLabel* lml = new TQLabel( i18n( "Left:" ), grp2 );
-    //lml->resize( lml->sizeHint() );
+    //lml->resize( lml->tqsizeHint() );
     mGrid->addWidget( lml, 2, 0 );
 
     m_inputLeft = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
@@ -2405,31 +2405,31 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString&
     mGrid->addWidget( m_inputLeft, 2, 1 );
 
     TQLabel* lmt = new TQLabel( i18n( "Top:" ), grp2 );
-    //lmt->resize( lmt->sizeHint() );
+    //lmt->resize( lmt->tqsizeHint() );
     mGrid->addWidget( lmt, 2, 2 );
 
     m_inputTop = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputTop->resize( m_inputTop->sizeHint() );
+    //m_inputTop->resize( m_inputTop->tqsizeHint() );
 
     mGrid->addWidget( m_inputTop, 2, 3 );
 
     TQLabel* lmr = new TQLabel( i18n( "Right:" ), grp2 );
-    //lmr->resize( lmr->sizeHint() );
+    //lmr->resize( lmr->tqsizeHint() );
     mGrid->addWidget( lmr, 3, 0 );
 
     m_inputRight = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputRight->resize( m_inputRight->sizeHint() );
+    //m_inputRight->resize( m_inputRight->tqsizeHint() );
     mGrid->addWidget( m_inputRight, 3, 1 );
 
     TQLabel* lmb = new TQLabel( i18n( "Bottom:" ), grp2 );
-    //lmb->resize( lmb->sizeHint() );
+    //lmb->resize( lmb->tqsizeHint() );
     mGrid->addWidget( lmb, 3, 2 );
 
     m_inputBottom = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputBottom->resize( m_inputBottom->sizeHint() );
+    //m_inputBottom->resize( m_inputBottom->tqsizeHint() );
     mGrid->addWidget( m_inputBottom, 3, 3 );
     mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 );
 
diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp
index 8db6227ac..5a484198a 100644
--- a/kword/KWFrameLayout.cpp
+++ b/kword/KWFrameLayout.cpp
@@ -38,7 +38,7 @@ KWFrameLayout::HeaderFooterFrameset::HeaderFooterFrameset( KWTextFrameSet* fs, i
     if ( fs->frameCount() > 0 )
         m_height = fs->frame(0)->height();
     else
-        m_height = 20; // whatever. The text layout will resize it.
+        m_height = 20; // whatever. The text tqlayout will resize it.
     Q_ASSERT( m_height > 0 );
 }
 
@@ -129,13 +129,13 @@ int KWFrameLayout::HeaderFooterFrameset::frameNumberForPage( int page ) const
 
 /////
 
-void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns,
+void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
                             int fromPage, int toPage, uint flags )
 {
-    //kdDebug(32002) << "KWFrameLayout::layout " << kdBacktrace() << endl;
+    //kdDebug(32002) << "KWFrameLayout::tqlayout " << kdBacktrace() << endl;
     // Just debug stuff
 #ifdef DEBUG_FRAMELAYOUT
-    kdDebug(32002) << "KWFrameLayout::layout " << fromPage << " to " << toPage << endl;
+    kdDebug(32002) << "KWFrameLayout::tqlayout " << fromPage << " to " << toPage << endl;
     Q_ASSERT( toPage >= fromPage );
     TQPtrListIterator<HeaderFooterFrameset> itdbg( m_headersFooters );
     for ( ; itdbg.current() ; ++itdbg )
@@ -492,10 +492,10 @@ void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns,
         KWTextFrameSet* fs = static_cast<KWTextFrameSet *>(mainTextFrameSet);
 
         // Not right now, this could be called during formatting...
-        //m_doc->invalidate();
-        // ### This means the layout will be done during painting. Not good.
-        // What about mainTextFrameSet->invalidate() or even layout()?
-        //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) );
+        //m_doc->tqinvalidate();
+        // ### 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() ) );
 
         // Invalidate main textframeset only, and from top of page only.
         // Otherwise loading a long document (with headers/footers) takes ages,
@@ -549,8 +549,8 @@ void KWFrameLayout::resizeOrCreateHeaderFooter( KWTextFrameSet* headerFooter, ui
     m_framesetsToUpdate.insert( headerFooter, true );
 }
 
-// Called at beginning and end of the layout for a given page,
-// to determine if the main-text-frame layout really changed or not.
+// Called at beginning and end of the tqlayout for a given page,
+// to determine if the main-text-frame tqlayout really changed or not.
 // Testing in resizeMainTextFrame doesn't work, we call it several times,
 // once for each footnote, so it can't detect the "no change" case.
 KoRect KWFrameLayout::firstColumnRect( KWFrameSet* mainTextFrameSet, int pageNum, int numColumns ) const
diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h
index c4b3f7eb1..18089ee5b 100644
--- a/kword/KWFrameLayout.h
+++ b/kword/KWFrameLayout.h
@@ -68,7 +68,7 @@ public:
         // frame number for the given page.... -1 if no frame on that page
         // The first frame is number 0.
         int frameNumberForPage( int page ) const;
-        // The last frame we need (0-based), layout() will delete any frame after that
+        // The last frame we need (0-based), tqlayout() will delete any frame after that
         int lastFrameNumber( int lastPage ) const;
 
         void debug();
@@ -89,14 +89,14 @@ public:
 
     enum { DontRemovePages = 1 };
     /**
-     * The main method of this file. Do the frame layout.
+     * The main method of this file. Do the frame tqlayout.
      * @param mainTextFrameSet if set, its frames will be resized. Usually: set in WP mode, not set in DTP mode.
      * @param numColumns number of columns to create for the main textframeset. Only relevant if mainTextFrameSet!=0.
-     * @param fromPage first page to layout ( 0-based )
-     * @param toPage last page to layout ( 0-based )
+     * @param fromPage first page to tqlayout ( 0-based )
+     * @param toPage last page to tqlayout ( 0-based )
      * @param flags see enum above
      */
-    void layout( KWFrameSet* mainTextFrameSet, int numColumns,
+    void tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
                  int fromPage, int toPage, uint flags );
 
 protected:
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index 515b0df0c..d1129b1fa 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -292,7 +292,7 @@ void KWFrameSet::setFloating()
         frameSet->findPosition( dPoint, parag, index );
         // Create anchor. TODO: refcount the anchors!
         setAnchored( frameSet, parag, index );
-        frameSet->layout();
+        frameSet->tqlayout();
         m_doc->frameChanged( m_frames.first() );
         return;
     }
@@ -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 repaint )
+void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool tqrepaint )
 {
     KWTextParag * parag = static_cast<KWTextParag *>( textfs->textDocument()->paragAt( paragId ) );
     Q_ASSERT( parag );
     if ( parag )
-        setAnchored( textfs, parag, index, placeHolderExists, repaint );
+        setAnchored( textfs, parag, index, placeHolderExists, tqrepaint );
 }
 
-void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool repaint )
+void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool tqrepaint )
 {
     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, repaint );
+        createAnchors( parag, index, placeHolderExists, tqrepaint );
 
     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 repaint )
+                                bool tqrepaint )
 {
     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 ( repaint )
+    if ( tqrepaint )
         emit repaintChanged( m_anchorTextFs );
 }
 
@@ -460,7 +460,7 @@ void KWFrameSet::moveFloatingFrame( int frameNum, const KoPoint &position )
         if( frame->frameStack() )
             frame->frameStack()->updateAfterMove( oldPageNum );
     }
-    invalidate();
+    tqinvalidate();
 }
 
 KoRect KWFrameSet::floatingFrameRect( int frameNum )
@@ -789,7 +789,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc
                 doubleBufPainter->begin( pix );
                 // Initialize the pixmap to the page background color
                 // (if the frame is over the page margins, no underlying frame will paint anything there)
-                doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::palette().active().brush( TQColorGroup::Base ) );
+                doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::tqpalette().active().brush( TQColorGroup::Base ) );
 
                 // The double-buffer pixmap has (0,0) at outerCRect.topLeft(), so we need to
                 // translate the double-buffer painter; drawFrameAndBorders will draw using view coordinates.
@@ -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 "repaint changed parags only" if we just drew the underlying frames, hence the "false"
+            // We can't "tqrepaint 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 67cad0da5..7218abe76 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 repaint anything.
+     * otherwise the other views wouldn't tqrepaint 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.
      *
@@ -310,9 +310,9 @@ public:
     /** Allows to detect that updateFrames() hasn't been called yet (e.g. on loading) */
     bool hasFramesInPageArray() const { return !m_framesInPage.isEmpty(); }
 
-    /** relayout text in frames, so that it flows correctly around other frames */
-    virtual void layout() {}
-    virtual void invalidate() {}
+    /** retqlayout text in frames, so that it flows correctly around other frames */
+    virtual void tqlayout() {}
+    virtual void tqinvalidate() {}
 
     /// 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 repaint = true );
+    void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool tqrepaint = 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 repaint = true );
+    void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool tqrepaint = 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 repaint it. KWDocument connects to it,
+    /// so that all views tqrepaint 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 repaint = true );
+    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true );
 
 
     KWDocument *m_doc;            // Document
diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp
index 65ae6fbb0..816afa9b8 100644
--- a/kword/KWFrameStyle.cpp
+++ b/kword/KWFrameStyle.cpp
@@ -32,7 +32,7 @@
 #include <tqdom.h>
 
 KWFrameStyleCollection::KWFrameStyleCollection()
-    : KoUserStyleCollection( TQString::fromLatin1( "frame" ) )
+    : KoUserStyleCollection( TQString::tqfromLatin1( "frame" ) )
 {
 }
 
diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h
index 210b9b17f..3336daa2d 100644
--- a/kword/KWFrameStyle.h
+++ b/kword/KWFrameStyle.h
@@ -25,7 +25,7 @@
 #include <KoUserStyleCollection.h>
 
 #include "KoBorder.h"
-#include <brush.h>
+#include <tqbrush.h>
 
 class TQDomElement;
 class KoOasisContext;
@@ -98,7 +98,7 @@ class KWFrameStyleCollection : public KoUserStyleCollection
 public:
     KWFrameStyleCollection();
 
-    static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); }
+    static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); }
 
     /**
      * Find style based on the untranslated name @p name.
diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp
index 3d148f69e..781e9e8ff 100644
--- a/kword/KWFrameStyleManager.cpp
+++ b/kword/KWFrameStyleManager.cpp
@@ -33,10 +33,10 @@
 #include <tqtabwidget.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqgroupbox.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 /******************************************************************/
 /* Class: KWTableStylePreview                                     */
@@ -90,7 +90,7 @@ void KWFrameStylePreview::setFrameStyle( KWFrameStyle *_frameStyle )
 
     frameStyle = _frameStyle;
 
-    repaint( true );
+    tqrepaint( true );
 }
 
 /******************************************************************/
@@ -235,27 +235,27 @@ void KWFrameStyleManager::addGeneralTab()
     tabLayout->setMargin( KDialog::marginHint() );
 
     previewBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), tab );
-    previewBox->layout()->setSpacing(KDialog::spacingHint());
-    previewBox->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *previewLayout = new TQGridLayout( previewBox->layout() );
+    previewBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    previewBox->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *previewLayout = new TQGridLayout( previewBox->tqlayout() );
 
     preview = new KWFrameStylePreview( previewBox );
-    preview->resize(preview->sizeHint());
+    preview->resize(preview->tqsizeHint());
 
     previewLayout->addWidget( preview, 0, 0 );
 
     tabLayout->addMultiCellWidget( previewBox, 1, 1, 0, 1 );
 
     m_nameString = new TQLineEdit( tab );
-    m_nameString->resize(m_nameString->sizeHint() );
+    m_nameString->resize(m_nameString->tqsizeHint() );
     connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) );
 
     tabLayout->addWidget( m_nameString, 0, 1 );
 
     TQLabel *nameLabel = new TQLabel( tab );
     nameLabel->setText( i18n( "Name:" ) );
-    nameLabel->resize(nameLabel->sizeHint());
-    nameLabel->setAlignment( AlignRight | AlignVCenter );
+    nameLabel->resize(nameLabel->tqsizeHint());
+    nameLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( nameLabel, 0, 0 );
 
@@ -383,7 +383,7 @@ void KWFrameStyleManager::addStyle()
 {
     save();
 
-    TQString str = i18n( "New Framestyle Template (%1)" ).arg(numFrameStyles++);
+    TQString str = i18n( "New Framestyle Template (%1)" ).tqarg(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->repaint(true);
+    brushPreview->tqrepaint(true);
 }
 
 TQString KWFrameStyleBackgroundTab::tabName()
diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h
index 32420f318..f261b2cdb 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 ); 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 ); }
+    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 ); }
 
     KWFrameStyle *frameStyle;
 };
diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp
index a00705847..c4349ae84 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 shape
+        return TQCursor(); // default arrow tqshape
 
     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 shape
+            return TQCursor(); // default arrow tqshape
         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 shape
+    return TQCursor(); // default arrow tqshape
 }
 
 MouseMeaning KWFrameViewManager::mouseMeaning( const KoPoint &point, int keyState) const {
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp
index 2eefb164f..725c932e1 100644
--- a/kword/KWImportStyleDia.cpp
+++ b/kword/KWImportStyleDia.cpp
@@ -21,7 +21,7 @@
 #include "KWDocument.h"
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
@@ -99,7 +99,7 @@ void KWImportStyleDia::loadFile()
                     TQDomElement styleElem = listStyles.item( item ).toElement();
 
                     KoParagStyle *sty = new KoParagStyle( TQString() );
-                    // Load the paraglayout from the <STYLE> element
+                    // Load the paragtqlayout from the <STYLE> element
                     sty->loadStyle( styleElem, m_doc->syntaxVersion() ); //#### wrong syntaxVersion!
 
                     TQString name = sty->displayName();
@@ -196,7 +196,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat
     int num = 1;
     bool exists;
     do {
-        name = templateName.arg( num );
+        name = templateName.tqarg( num );
         exists = (m_list.findIndex( name )!=-1);
         ++num;
     } while ( exists );
diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp
index 23c7654a2..097646084 100644
--- a/kword/KWInsertDia.cpp
+++ b/kword/KWInsertDia.cpp
@@ -28,7 +28,7 @@
 #include <tqspinbox.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KWInsertDia::KWInsertDia( KWView *parent, KWTableFrameSet *table, InsertType type, int insertHint)
     : KDialogBase( Plain, (type==insertRow?i18n("Insert Row") : i18n("Insert Column")), Ok | Cancel, Ok, parent, "Insert Table items dialog", true )
diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp
index 95aed5c0e..28d0cd348 100644
--- a/kword/KWInsertPageDia.cpp
+++ b/kword/KWInsertPageDia.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqvbox.h>
 
@@ -34,7 +34,7 @@ KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Insert Page" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->layout();
+    grp->tqlayout();
     m_after = new TQRadioButton( i18n("After"), grp );
     m_before = new TQRadioButton( i18n("Before"), grp );
 
diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp
index 4477068e3..4b5f3daa0 100644
--- a/kword/KWInsertPicDia.cpp
+++ b/kword/KWInsertPicDia.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqbitmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqscrollview.h>
 
@@ -62,7 +62,7 @@ public:
             m_size = picture.getOriginalSize();
             m_picture = picture;
             resizeContents( m_size.width(), m_size.height() );
-            repaint( false );
+            tqrepaint( false );
             return true;
         }
         else
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index ebf6c480b..6c9851fe2 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -80,7 +80,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c )
     prevTOCParag->setPageBreaking( prevTOCParag->pageBreaking() | KWParagLayout::HardFrameBreakAfter );
 
     // Format paragraphs, to take this page break into account and update page numbers
-    fs->layout();
+    fs->tqlayout();
     fs->updateFrames();
 
     //kdDebug() << "KWInsertTOCCommand::execute layouting done, setting page numbers" << endl;
@@ -199,7 +199,7 @@ KoTextCursor * KWInsertTOCCommand::removeTOC( KWTextFrameSet *fs, KoTextCursor *
         }
         p = p->prev();
     }
-    textdoc->invalidate();
+    textdoc->tqinvalidate();
     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" ).arg( depth+1 );
-        displayName = i18n( "Contents Head %1" ).arg( depth+1 );
+        name = TQString( "Contents_Head_%1" ).tqarg( depth+1 );
+        displayName = i18n( "Contents Head %1" ).tqarg( 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().alignment = TQt::AlignHCenter;
+            style->paragLayout().tqalignment = TQt::AlignHCenter;
         }
         else
         {
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index acca99223..e477f5021 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqvbox.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ )
 TQStringList KWMailMergeDataBase::availablePlugins()
 {
     TQStringList tmp;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString());
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString());
     for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
     {
         tmp.append((*it)->property("X-KDE-InternalName").toString());
@@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman
     if (rejectdcopcall)return false;
     TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'");
     kdDebug()<<constrain<<endl;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain);
     KService::Ptr it=pluginOffers.first();
 
     TQVariant verProp=it->property("X-KDE-PluginVersion");
@@ -116,9 +116,9 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
 {
     version=0;
     KWMailMergeDataSource *ret=0;
-    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
+    TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
     kdDebug()<<constrain<<endl;
-    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
+    KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain);
 
     //Only for debugging
     for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
@@ -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").arg(name);
+          TQString factory=TQString("create_%1").tqarg(name);
           void *create = lib->symbol(TQFile::encodeName(factory));
 
           if (create)
@@ -280,7 +280,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
     if (plugin)
     {
         kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl;
-        TQDomElement el=doc.createElement(TQString::fromLatin1("PLUGIN"));
+        TQDomElement el=doc.createElement(TQString::tqfromLatin1("PLUGIN"));
 
         TQDataStream ds(plugin->info,IO_ReadOnly);
         TQString libname;
@@ -288,7 +288,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
         el.setAttribute("library",libname);
         parentElem.appendChild(el);
         kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl;
-        TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE"));
+        TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE"));
         plugin->save(doc,el2);
         parentElem.appendChild(el2);
 
@@ -329,35 +329,35 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList
       /*parent*/ 0, "", true ), pluginOffers( offers )
 {
   TQWidget *back = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( back, 0, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "&Available sources:" ), back );
   chooser = new TQComboBox( false, back );
   label->setBuddy( chooser );
   descriptionLabel = new TQLabel( back );
   descriptionLabel->hide();
-  descriptionLabel->setAlignment( WordBreak );
+  descriptionLabel->tqsetAlignment( WordBreak );
   descriptionLabel->setFrameShape( TQFrame::Box );
   descriptionLabel->setFrameShadow( TQFrame::Sunken );
 
-  TQSize old_sizeHint;
+  TQSize old_tqsizeHint;
   for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it )
   {
     chooser->insertItem( (*it)->name() );
-    old_sizeHint = descriptionLabel->sizeHint();
+    old_tqsizeHint = descriptionLabel->tqsizeHint();
     descriptionLabel->setText( (*it)->comment() );
-    if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height())
-        descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() );
+    if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height())
+        descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() );
   }
   descriptionLabel->show();
 
   connect( chooser, TQT_SIGNAL( activated( int ) ),
            this, TQT_SLOT( pluginChanged( int ) ) );
 
-  layout->addWidget( label );
-  layout->addWidget( chooser );
-  layout->addWidget( descriptionLabel );
-  layout->addStretch( 1 );
+  tqlayout->addWidget( label );
+  tqlayout->addWidget( chooser );
+  tqlayout->addWidget( descriptionLabel );
+  tqlayout->addStretch( 1 );
 
   pluginChanged( 0 );
 }
@@ -387,41 +387,41 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat
 {
     db_=db;
     TQWidget *back = plainPage();
-    TQVBoxLayout *layout=new TQVBoxLayout(back);
+    TQVBoxLayout *tqlayout=new TQVBoxLayout(back);
 //    TQVBox *back = new TQVBox( page );
-    layout->setSpacing( KDialog::spacingHint() );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
 //    TQVBox *row1 = new TQVBox( back );
 //    row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Datasource:" ),back );
-//    l->setMaximumHeight( l->sizeHint().height() );
-    layout->addWidget(l);
+//    l->setMaximumHeight( l->tqsizeHint().height() );
+    tqlayout->addWidget(l);
 
     TQHBox *row1=new TQHBox(back);
-    layout->addWidget(row1);
+    tqlayout->addWidget(row1);
     row1->setSpacing( KDialog::spacingHint() );
     edit=new TQPushButton(i18n("Edit Current..."),row1);
     create=new TQPushButton(i18n("Create New..."),row1);
     open=new TQPushButton(i18n("Open Existing..."),row1);
 
     KSeparator *separator1 = new KSeparator(back);
-    layout->addWidget(separator1);
+    tqlayout->addWidget(separator1);
 
     l = new TQLabel( i18n( "Merging:" ),back );
-    layout->addWidget(l);
-//  l->setMaximumHeight( l->sizeHint().height() );
+    tqlayout->addWidget(l);
+//  l->setMaximumHeight( l->tqsizeHint().height() );
     TQHBox *row2=new TQHBox(back);
-    layout->addWidget(row2);
+    tqlayout->addWidget(row2);
     row2->setSpacing( KDialog::spacingHint() );
     preview=new TQPushButton(i18n("Print Preview..."),row2);
     document=new TQPushButton(i18n("Create New Document"),row2);
     document->hide();
     (void) new TQWidget(row2);
-    layout->addStretch();
+    tqlayout->addStretch();
 
     KSeparator *separator2 = new KSeparator(back);
-    layout->addWidget(separator2);
+    tqlayout->addWidget(separator2);
 
     enableDisableEdit();
 
@@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked()
 void KWMailMergeConfigDialog::slotPreviewClicked()
 {
     db_->action=KWSLMergePreview;
-    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget());
+    KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget());
     if (mw)
     {
         KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview));
@@ -516,11 +516,11 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW
   m_db=db;
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
-  layout->setAutoAdd( true );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  tqlayout->setAutoAdd( true );
 
   TQLabel *l = new TQLabel( i18n( "Name:" ), page );
-  l->setMaximumHeight( l->sizeHint().height() );
+  l->setMaximumHeight( l->tqsizeHint().height() );
   names = new TQListBox( page );
 
   TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin();
diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h
index 36aff6778..70f75f9ec 100644
--- a/kword/KWMailMergeDataBase.h
+++ b/kword/KWMailMergeDataBase.h
@@ -30,7 +30,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "KWMailMergeDataSource.h"
 #include "KWordMailMergeDatabaseIface.h"
diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index facb6e9d8..f3d70cb67 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -63,7 +63,7 @@ protected:
     {
         validDrag = false;
     }
-    TQSize sizeHint() const
+    TQSize tqsizeHint() const
     {
         int w = fontMetrics().width( text() );
         int h = fontMetrics().height();
@@ -72,10 +72,10 @@ protected:
     void drawButton( TQPainter * p )
     {
         // Draw the background
-        tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(),
+        tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), tqcolorGroup(),
                                     TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
         // Draw the label
-        tqstyle().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(),
+        tqstyle().tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), tqcolorGroup(),
                              TQStyle::Style_Enabled );
     }
     void enterEvent( TQEvent* ) {};
diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp
index daaa85020..42d72b5ee 100644
--- a/kword/KWOasisLoader.cpp
+++ b/kword/KWOasisLoader.cpp
@@ -182,7 +182,7 @@ static KWFrameSet::Info headerTypeToFrameInfo( const TQString& localName, bool /
         return KWFrameSet::FI_EVEN_FOOTER;
 
     // ######## KWord extension, because I'm too lazy.
-    // TODO: the real solution is a separate page layout for the first page.
+    // TODO: the real solution is a separate page tqlayout for the first page.
     if ( localName == "header-first" ) // NOT OASIS COMPLIANT
         return KWFrameSet::FI_FIRST_HEADER;
     if ( localName == "footer-first" ) // NOT OASIS COMPLIANT
diff --git a/kword/KWPageManager.cpp b/kword/KWPageManager.cpp
index e13d40999..9dc797a60 100644
--- a/kword/KWPageManager.cpp
+++ b/kword/KWPageManager.cpp
@@ -196,8 +196,8 @@ void KWPageManager::removePage(KWPage *page) {
     m_pageList.remove(page);
 }
 
-void KWPageManager::setDefaultPage(const KoPageLayout &layout) {
-    m_defaultPageLayout = layout;
+void KWPageManager::setDefaultPage(const KoPageLayout &tqlayout) {
+    m_defaultPageLayout = tqlayout;
     // make sure we have 1 default, either pageBound or left/right bound.
     if(m_defaultPageLayout.ptLeft < 0 || m_defaultPageLayout.ptRight < 0) {
         m_defaultPageLayout.ptLeft = -1;
diff --git a/kword/KWPageManager.h b/kword/KWPageManager.h
index 8f09b577a..869a68f3b 100644
--- a/kword/KWPageManager.h
+++ b/kword/KWPageManager.h
@@ -111,7 +111,7 @@ public:
     /// return the effective pageLayout of @p pageNumber combining the default and the page specific ones
     const KoPageLayout pageLayout(int pageNumber) const;
 
-    void setDefaultPage(const KoPageLayout &layout);
+    void setDefaultPage(const KoPageLayout &tqlayout);
 
     /**
      * Returns the argument point, with altered coordinats if the point happens to be
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 33203d0b6..fc2577093 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()->geometry() ) );
+        frame->setRect( KoRect::fromTQRect( getChild()->tqgeometry() ) );
 
-        //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's geometry " << getChild()->geometry()
+        //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's tqgeometry " << getChild()->tqgeometry()
         //               << " 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()->geometry().x() << "," << getChild()->geometry().y() << " " << getChild()->geometry().width() << "x" << getChild()->geometry().height() << endl;
+        kdDebug() << "     Rectangle : " << getChild()->tqgeometry().x() << "," << getChild()->tqgeometry().y() << " " << getChild()->tqgeometry().width() << "x" << getChild()->tqgeometry().height() << endl;
     } else
         kdWarning() << "NO CHILD" << endl;
 }
@@ -335,12 +335,12 @@ KWDocumentChild::~KWDocumentChild()
 {
 }
 
-void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry )
+void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
 {
     // 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, geometry );
+    KoDocumentChild::setDocument( doc, tqgeometry );
 }
 
 KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix )
diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h
index d486b2988..25609c1a7 100644
--- a/kword/KWPartFrameSet.h
+++ b/kword/KWPartFrameSet.h
@@ -53,7 +53,7 @@ public:
     void setChild( KWDocumentChild* child );
 
     /**
-     * Update the geometry of m_child based on the geometry of the frame.
+     * Update the tqgeometry of m_child based on the tqgeometry of the frame.
      */
     void updateChildGeometry();
 
@@ -157,7 +157,7 @@ public:
     KWDocument* parent()const
     { return m_pKWordDoc; }
 
-    virtual void setDocument( KoDocument *doc, const TQRect &geometry );
+    virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
 
     void setPartFrameSet( KWPartFrameSet* fs ) { m_partFrameSet = fs; }
     KWPartFrameSet * partFrameSet() const { return m_partFrameSet; }
diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp
index 2cc8443b1..3d04fda03 100644
--- a/kword/KWPictureFrameSet.cpp
+++ b/kword/KWPictureFrameSet.cpp
@@ -184,7 +184,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement
     {
         TQCString data = binaryData.toElement().text().latin1();
         m_picture.loadFromBase64( data );
-        key = KoPictureKey("nofile", TQDateTime::currentDateTime(Qt::UTC));
+        key = KoPictureKey("nofile", TQDateTime::tqcurrentDateTime(Qt::UTC));
         m_picture.setKey(key);
     }
     else
@@ -199,7 +199,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement
                 strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
             }
             TQString filename(href/*.mid(1)*/);
-            key = KoPictureKey(filename, TQDateTime::currentDateTime(Qt::UTC));
+            key = KoPictureKey(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
             m_picture.setKey(key);
 
             KoStore* store = context.store();
diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp
index 08c2ada25..3502701be 100644
--- a/kword/KWResizeTableDia.cpp
+++ b/kword/KWResizeTableDia.cpp
@@ -43,10 +43,10 @@ KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KW
 void KWResizeTableDia::setupTab1(int resizeColumn) {
     TQVBox *page = makeVBoxMainWidget();
     TQLabel *rc = new TQLabel( i18n( "Column:" ), page );
-    rc->resize( rc->sizeHint() );
-    rc->setAlignment( AlignLeft | AlignBottom );
+    rc->resize( rc->tqsizeHint() );
+    rc->tqsetAlignment( AlignLeft | AlignBottom );
     m_value = new TQSpinBox( 1, m_table->getColumns(), 1, page );
-    m_value->resize( m_value->sizeHint() );
+    m_value->resize( m_value->tqsizeHint() );
     m_value->setValue( resizeColumn );
 
     rc = new TQLabel( i18n( "Width:" ), page );
diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui
index 55da7d965..474498f4c 100644
--- a/kword/KWSelectBookmarkDiaBase.ui
+++ b/kword/KWSelectBookmarkDiaBase.ui
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp
index ff6d1d735..047dcf935 100644
--- a/kword/KWSortDia.cpp
+++ b/kword/KWSortDia.cpp
@@ -20,7 +20,7 @@
 
 
 #include "KWSortDia.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
@@ -34,7 +34,7 @@ KWSortDia::KWSortDia( TQWidget *parent, const char* name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Sort" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->layout();
+    grp->tqlayout();
     m_increase = new TQRadioButton( i18n("Increase"), grp );
     m_decrease = new TQRadioButton( i18n("Decrease"), grp );
 
diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp
index c67e46c9c..5e988ea3f 100644
--- a/kword/KWSplitCellDia.cpp
+++ b/kword/KWSplitCellDia.cpp
@@ -21,7 +21,7 @@
 #include "KWSplitCellDia.moc"
 #include "KWTableDia.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 
diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp
index 3f941aae3..60dab02bf 100644
--- a/kword/KWStartupWidget.cpp
+++ b/kword/KWStartupWidget.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns)
     : KWStartupWidgetBase(parent) {
@@ -55,9 +55,9 @@ KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColu
     connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_columnsWidget, TQT_SLOT(setEnableColumns(bool)));
 }
 
-void KWStartupWidget::sizeUpdated(KoPageLayout &layout) {
-    m_layout = layout;
-    m_columnsWidget->setLayout(layout);
+void KWStartupWidget::sizeUpdated(KoPageLayout &tqlayout) {
+    m_layout = tqlayout;
+    m_columnsWidget->setLayout(tqlayout);
 }
 
 void KWStartupWidget::columnsUpdated(KoColumns &columns) {
diff --git a/kword/KWStartupWidget.h b/kword/KWStartupWidget.h
index 22460eed4..8202488c1 100644
--- a/kword/KWStartupWidget.h
+++ b/kword/KWStartupWidget.h
@@ -43,7 +43,7 @@ public:
     KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns);
 
 private slots:
-    void sizeUpdated(KoPageLayout &layout);
+    void sizeUpdated(KoPageLayout &tqlayout);
     void columnsUpdated(KoColumns &columns);
     void buttonClicked();
 
diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui
index cac182d2d..57d7ce2f8 100644
--- a/kword/KWStartupWidgetBase.ui
+++ b/kword/KWStartupWidgetBase.ui
@@ -65,7 +65,7 @@ For letters and notes with one main text, possibly on several pages, you should
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -90,7 +90,7 @@ For letters and notes with one main text, possibly on several pages, you should
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp
index be1fa14ee..e8cd0e92d 100644
--- a/kword/KWStatisticsDialog.cpp
+++ b/kword/KWStatisticsDialog.cpp
@@ -23,7 +23,7 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqprogressdialog.h>
 #include <tqcheckbox.h>
 
@@ -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").arg( flesch );
+        flesch = i18n("approximately %1").tqarg( 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").arg( "00000000" );
+    TQString init = i18n("approximately %1").tqarg( "00000000" );
 
     // insert labels
     TQLabel *label1 = new TQLabel( i18n( "Characters including spaces:" ), box );
diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp
index 21b0670c8..013a2be61 100644
--- a/kword/KWTableDia.cpp
+++ b/kword/KWTableDia.cpp
@@ -32,7 +32,7 @@
 #include <kcommand.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h
index bf0f835f0..09dff25ad 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; repaint( true ); }
-    void setCols( int _cols ) { cols = _cols; repaint( true ); }
+    void setRows( int _rows ) { rows = _rows; tqrepaint( true ); }
+    void setCols( int _cols ) { cols = _cols; tqrepaint( true ); }
 
 protected:
     void paintEvent( TQPaintEvent *e );
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 34765348a..f108573b5 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -52,7 +52,7 @@ DESCRIPTION
 #include <dcopobject.h>
 #include <tqapplication.h>
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 
 KWTableFrameSet::KWTableFrameSet( KWDocument *doc, const TQString & name ) :
@@ -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 repaint )
+                                     bool tqrepaint )
 {
     //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 ( repaint )
+    if ( tqrepaint )
         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 ").arg( (unsigned long)cells.current(), 0, 16 );
+                      TQString str = TQString("| 0x%1 ").tqarg( (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()
@@ -2183,16 +2183,16 @@ void KWTableFrameSet::finalize( ) {
     KWFrameSet::finalize();
 }
 
-void KWTableFrameSet::layout()
+void KWTableFrameSet::tqlayout()
 {
     for (TableIter cells(this) ; cells ; ++cells)
-        cells->layout();
+        cells->tqlayout();
 }
 
-void KWTableFrameSet::invalidate()
+void KWTableFrameSet::tqinvalidate()
 {
     for (TableIter cells(this) ; cells ; ++cells)
-        cells->invalidate();
+        cells->tqinvalidate();
 }
 
 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: " ).arg( row );
+        TQString str = TQString( " | Row %1: " ).tqarg( row );
         for ( unsigned int col = 0; col < getColumns(); ++col )
-            str += TQString("| 0x%1 ").arg( (unsigned long)(*m_rowArray[row])[col], 0, 16 );
+            str += TQString("| 0x%1 ").tqarg( (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")
-                    .arg( table->name() ).arg(row).arg(col) )
+                    .tqarg( table->name() ).tqarg(row).tqarg(col) )
 {
     m_row = row;
     m_col = col;
@@ -2829,7 +2829,7 @@ KWTableFrameSet::MarkedIterator::MarkedIterator(KWTableFrameSet *table) :
 
     if ( current() ) {
 //      kdDebug() << "MarkedIterator: visit: "
-//          << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl;
+//          << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl;
         current()->setMark();
     }
 }
@@ -2844,7 +2844,7 @@ KWTableFrameSet::MarkedIterator::operator++()
     }
     if ( current() ) {
 //      kdDebug() << "MarkedIterator: visit: "
-//          << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl;
+//          << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl;
         current()->setMark();
     }
     return ret;
diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h
index d5fdea1a4..e379f3b6e 100644
--- a/kword/KWTableFrameSet.h
+++ b/kword/KWTableFrameSet.h
@@ -472,8 +472,8 @@ public:
         ulong & sentences, ulong & syllables,ulong & lines, bool selected );
 
     virtual void finalize();
-    virtual void invalidate();
-    virtual void layout();
+    virtual void tqinvalidate();
+    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 repaint = true );
+    virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true );
 
 private:
     void addCellToArray( Cell* cell );
diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp
index 20016d496..47f9029b4 100644
--- a/kword/KWTableStyle.cpp
+++ b/kword/KWTableStyle.cpp
@@ -31,7 +31,7 @@
 #include <tqdom.h>
 
 KWTableStyleCollection::KWTableStyleCollection()
-    : KoUserStyleCollection( TQString::fromLatin1( "table" ) )
+    : KoUserStyleCollection( TQString::tqfromLatin1( "table" ) )
 {
 }
 
diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h
index aa987589d..0452312e0 100644
--- a/kword/KWTableStyle.h
+++ b/kword/KWTableStyle.h
@@ -26,7 +26,7 @@
 
 #include <tqdom.h>
 #include <tqptrlist.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class KWFrameStyleCollection;
 class KoStyleCollection;
@@ -89,7 +89,7 @@ class KWTableStyleCollection : public KoUserStyleCollection
 public:
     KWTableStyleCollection();
 
-    static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); }
+    static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); }
 
     /**
      * Find style based on the untranslated name @p name.
diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 4682c2cfb..c7cd547a2 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqframe.h>
 
@@ -118,19 +118,19 @@ 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->invalidate(0);
+        parag->tqinvalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag alignment working,
+    // Center vertically, but not horizontally, to keep the parag tqalignment working,
     textRect.moveTopLeft( TQPoint( fr.x(), fr.y() + ( fr.height() - textRect.height() ) / 2 ) );
 
     p->setClipRect( textRect.intersect( fr ) );
     p->translate( textRect.x(), textRect.y() );
 
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     cg.setBrush( TQColorGroup::Base, tableStyle->frameStyle()->backgroundColor() );
 
     m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler );
@@ -145,7 +145,7 @@ void KWTableStylePreview::setTableStyle( KWTableStyle *_tableStyle )
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( tableStyle->paragraphStyle() );
 
-    repaint(true);
+    tqrepaint(true);
 }
 
 /******************************************************************/
@@ -275,35 +275,35 @@ void KWTableStyleManager::setupMain()
     mainLayout->setSpacing( KDialog::spacingHint() );
 
     preview = new KWTableStylePreview( i18n("Preview"), i18n("Tablestyles preview"), main );
-    preview->resize(preview->sizeHint());
+    preview->resize(preview->tqsizeHint());
 
     mainLayout->addMultiCellWidget( preview, 1, 1, 0, 1 );
 
     m_nameString = new TQLineEdit( main );
-    m_nameString->resize(m_nameString->sizeHint() );
+    m_nameString->resize(m_nameString->tqsizeHint() );
     connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) );
 
     mainLayout->addWidget( m_nameString, 0, 1 );
 
     TQLabel *nameLabel = new TQLabel( main );
     nameLabel->setText( i18n( "Name:" ) );
-    nameLabel->resize(nameLabel->sizeHint());
-    nameLabel->setAlignment( AlignRight | AlignVCenter );
+    nameLabel->resize(nameLabel->tqsizeHint());
+    nameLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     mainLayout->addWidget( nameLabel, 0, 0 );
 
     TQGroupBox *adjustBox = new TQGroupBox( 0, Qt::Vertical, i18n("Adjust"), main);
-    adjustBox->layout()->setSpacing(KDialog::spacingHint());
-    adjustBox->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->layout() );
+    adjustBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    adjustBox->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->tqlayout() );
 
     TQLabel *frameStyleLabel = new TQLabel( adjustBox );
     frameStyleLabel->setText( i18n( "Framestyle:" ) );
-    frameStyleLabel->setAlignment( AlignRight | AlignVCenter );
+    frameStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     TQLabel *styleLabel = new TQLabel( adjustBox );
     styleLabel->setText( i18n( "Textstyle:" ) );
-    styleLabel->setAlignment( AlignRight | AlignVCenter );
+    styleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     m_frameStyle = new TQComboBox( adjustBox );
     m_style = new TQComboBox( adjustBox );
@@ -412,7 +412,7 @@ void KWTableStyleManager::addStyle()
     save();
     KWTableStyleCollection* collection = m_doc->tableStyleCollection();
 
-    TQString str = i18n( "New Tablestyle Template (%1)" ).arg(numTableStyles++);
+    TQString str = i18n( "New Tablestyle Template (%1)" ).tqarg(numTableStyles++);
     if ( m_currentTableStyle )
     {
         m_currentTableStyle = new KWTableStyle( *m_currentTableStyle );
diff --git a/kword/KWTableTemplate.h b/kword/KWTableTemplate.h
index 6d62dc56f..b0e608d72 100644
--- a/kword/KWTableTemplate.h
+++ b/kword/KWTableTemplate.h
@@ -24,7 +24,7 @@
 
 #include <tqdom.h>
 #include <tqptrlist.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class KWTableTemplate;
 class KWDocument;
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index 98e5e8fb9..c36743df4 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -41,7 +41,7 @@
 #include <tqdom.h>
 #include <tqrect.h>
 #include <tqptrlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <stdlib.h>
 #include <math.h>
@@ -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->invalidate(0);
+        parag->tqinvalidate(0);
     }
     double x_add = ( (rb < ts->frameStyle()->rightBorder().width()) ?
         ts->frameStyle()->rightBorder().width() : rb ) +1;
@@ -207,7 +207,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con
     p->setClipRect( textRect.intersect( globalRect ) );
     p->translate( textRect.x(), textRect.y() );
 
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     cg.setBrush( TQColorGroup::Base, ts->frameStyle()->backgroundColor() );
 
     m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler );
@@ -403,7 +403,7 @@ void KWTableTemplatePreview::setTableTemplate( KWTableTemplate *_tableTemplate )
 
     setSpecialCells(_tableTemplate);
 
-    repaint( true );
+    tqrepaint( 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 )
-        repaint( true );
+        tqrepaint( true );
 }
 
 void KWTableTemplatePreview::cbFirstColChanged( bool enable )
@@ -470,7 +470,7 @@ void KWTableTemplatePreview::cbFirstColChanged( bool enable )
         tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        repaint( true );
+        tqrepaint( true );
 }
 
 void KWTableTemplatePreview::cbLastRowChanged( bool enable )
@@ -493,7 +493,7 @@ void KWTableTemplatePreview::cbLastRowChanged( bool enable )
         tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        repaint( true );
+        tqrepaint( true );
 }
 
 void KWTableTemplatePreview::cbLastColChanged( bool enable )
@@ -516,7 +516,7 @@ void KWTableTemplatePreview::cbLastColChanged( bool enable )
         tableTemplate->setBottomRightCorner( tableTemplate->pBodyCell() );
 
     if ( !m_disableRepaint )
-        repaint( true );
+        tqrepaint( true );
 }
 
 void KWTableTemplatePreview::cbBodyChanged( bool enable )
@@ -533,7 +533,7 @@ void KWTableTemplatePreview::cbBodyChanged( bool enable )
     delete oldTemplate;
 
     if ( !m_disableRepaint )
-        repaint( true );
+        tqrepaint( true );
 
 }
 
@@ -648,7 +648,7 @@ void KWTableTemplateSelector::initPreview()
     preview->cbLastColChanged( cbLastCol->isChecked() );
     preview->cbBodyChanged( cbBody->isChecked() );
     preview->disableRepaint(false);
-    preview->repaint();
+    preview->tqrepaint();
 }
 
 int KWTableTemplateSelector::getFormatType() const
diff --git a/kword/KWTableTemplateSelector.h b/kword/KWTableTemplateSelector.h
index 9933b57ad..1bae479bf 100644
--- a/kword/KWTableTemplateSelector.h
+++ b/kword/KWTableTemplateSelector.h
@@ -26,9 +26,9 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-/*#include <layout.h>
+/*#include <tqlayout.h>
 #include <tqfont.h>
-#include <brush.h>
+#include <tqbrush.h>
 */
 
 class TQListBox;
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index cf0d89430..43a1de5a7 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -59,7 +59,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdragobject.h>
 #include <tqcursor.h>
 #include <tqfile.h>
@@ -396,7 +396,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
         kdDebug() << "ITD: r=" << r << " iPoint=" << iPoint.x() << "," << iPoint.y() << endl;
 #endif
         // r is the frame in qrt coords
-        if ( r.contains( iPoint ) ) // both r and p are in layout units (aka internal)
+        if ( r.contains( iPoint ) ) // both r and p are in tqlayout units (aka internal)
         {
             dPoint = internalToDocumentKnowingFrame( iPoint, theFrame );
 #ifdef DEBUG_ITD
@@ -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()->invalidate( 0 ); // size has changed -> need reformatting !
+                    var->paragraph()->tqinvalidate( 0 ); // size has changed -> need reformatting !
                 var->paragraph()->setChanged( true );
             }
         }
@@ -757,7 +757,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
 #endif
 
             p->save();
-            TQColorGroup cg = TQApplication::palette().active();
+            TQColorGroup cg = TQApplication::tqpalette().active();
 
             if ( hasFrames )
             {
@@ -824,18 +824,18 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
     m_currentDrawnFrame = 0L;
 }
 
-void KWTextFrameSet::layout()
+void KWTextFrameSet::tqlayout()
 {
-    invalidate();
+    tqinvalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KWTextFrameSet::invalidate()
+void KWTextFrameSet::tqinvalidate()
 {
-    //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl;
+    //kdDebug() << "KWTextFrameSet::tqinvalidate " << name() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
-    textDocument()->invalidate(); // lazy layout, real update follows upon next repaint
+    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
 }
 
 void KWTextFrameSet::slotRepaintChanged()
@@ -960,7 +960,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth,
     if ( validHeight )
         *validHeight = h; // TODO
 
-    // Everything from there is in layout units
+    // Everything from there is in tqlayout units
     // Note: it is very important that this method works in internal coordinates.
     // Otherwise, parags broken at the line-level (e.g. between two columns) are seen
     // as still in one piece, and we miss the frames in the 2nd column.
@@ -1984,7 +1984,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
             frmBehavior = KWFrame::Ignore;
     }
 
-    int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels
+    int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels
 #ifdef DEBUG_FORMAT_MORE
     kdDebug(32002) << "AutoExtendFrame bottom=" << bottom << " availHeight=" << availHeight
                    << " => difference = " << difference << endl;
@@ -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->invalidate();
+    ////m_doc->tqinvalidate();
 
     // 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->invalidate( 0 );
+        lastFormatted->tqinvalidate( 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 );
@@ -2484,12 +2484,12 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
         m_doc->recalcFrames( theFrame->pageNumber(), -1 ); // warning this can delete theFrame!
 
     // m_doc->frameChanged( theFrame );
-    // Warning, can't call layout() (frameChanged calls it)
+    // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
     if ( invalidateLayout )
-        m_doc->invalidate(this);
+        m_doc->tqinvalidate(this);
 
-    // Can't repaint directly, we might be in a paint event already
+    // Can't tqrepaint directly, we might be in a paint event already
     m_doc->delayedRepaintAllViews();
 }
 
@@ -2770,7 +2770,7 @@ bool KWTextFrameSet::minMaxInternalOnPage( int pageNum, int& topLU, int& bottomL
         topPt = TQMIN( topPt, y );
         bottomPt = TQMAX( bottomPt, y + frameIt.current()->height() );
     }
-    // Convert to layout units
+    // Convert to tqlayout units
     topLU = m_doc->ptToLayoutUnitPixY( topPt );
     bottomLU = m_doc->ptToLayoutUnitPixY( bottomPt );
     return true;
@@ -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 repaint, KDialogBase* dialog )
+void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint, KDialogBase* dialog )
 {
     Q_ASSERT( isVisible() );
     Q_ASSERT( m_textobj->isVisible() );
-    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " repaint=" << repaint << endl;
-    m_textobj->highlightPortion( parag, index, length, repaint );
-    if ( repaint ) {
+    //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " tqrepaint=" << tqrepaint << endl;
+    m_textobj->highlightPortion( parag, index, length, tqrepaint );
+    if ( tqrepaint ) {
         // 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 repaint )
+void KWTextFrameSet::removeHighlight( bool tqrepaint )
 {
-    m_textobj->removeHighlight( repaint );
+    m_textobj->removeHighlight( tqrepaint );
 }
 
 void KWTextFrameSet::clearUndoRedoInfo()
@@ -2920,7 +2920,7 @@ protected:
     }
 };
 
-void KWTextFrameSet::renumberFootNotes( bool repaint )
+void KWTextFrameSet::renumberFootNotes( bool tqrepaint )
 {
     KWFootNoteVarList lst;
     TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() );
@@ -2986,17 +2986,17 @@ void KWTextFrameSet::renumberFootNotes( bool repaint )
                 if ( var->numberingType()== KWFootNoteVariable::Manual)
                     var->frameSet()->setName( m_doc->generateFramesetName(fsName));
                 else
-                    var->frameSet()->setName( fsName.arg( var->text() ) );
+                    var->frameSet()->setName( fsName.tqarg( var->text() ) );
                 var->frameSet()->setCounterText( var->text() );
             }
             var->resize();
-            var->paragraph()->invalidate(0);
+            var->paragraph()->tqinvalidate(0);
             var->paragraph()->setChanged( true );
             needRepaint = true;
         }
         ++vit;
     }
-    if ( needRepaint && repaint )
+    if ( needRepaint && tqrepaint )
         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 'repaint' or 'recalc' code here
+// so don't add any 'tqrepaint' or 'recalc' code here
 KWFootNoteFrameSet * KWTextFrameSet::insertFootNote( NoteType noteType, KWFootNoteVariable::Numbering numType, const TQString &manualString )
 {
      kdDebug() << "KWTextFrameSetEdit::insertFootNote " << endl;
@@ -3146,7 +3146,7 @@ void KWTextFrameSetEdit::slotFrameDeleted( KWFrame *frm )
 
 void KWTextFrameSetEdit::paste()
 {
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     int provides = KWView::checkClipboard( data );
     pasteData( data, provides, false );
 }
@@ -3161,9 +3161,9 @@ void KWTextFrameSetEdit::pasteData( TQMimeSource* data, int provides, bool drop
     }
     else if ( provides & KWView::ProvidesPlainText )
     {
-        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype).
-        const TQString text = TQApplication::clipboard()->text();
+        const TQString text = TQApplication::tqclipboard()->text();
         const bool removeSelected = !drop;
         if ( !text.isEmpty() )
             textObject()->pasteText( cursor(), text, currentFormat(), removeSelected );
@@ -3188,7 +3188,7 @@ KCommand* KWTextFrameSetEdit::pasteOasisCommand( TQMimeSource* data )
     TQCString returnedTypeMime = KoTextObject::providesOasis( data );
     if ( !returnedTypeMime.isEmpty() )
     {
-        TQByteArray arr = data->encodedData( returnedTypeMime );
+        TQByteArray arr = data->tqencodedData( returnedTypeMime );
         Q_ASSERT( !arr.isEmpty() );
         if ( arr.size() )
             return textFrameSet()->pasteOasis( cursor(), arr, true );
@@ -3208,7 +3208,7 @@ void KWTextFrameSetEdit::copy()
 {
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) {
         TQDragObject *drag = newDrag( 0 );
-        TQApplication::clipboard()->setData( drag );
+        TQApplication::tqclipboard()->setData( drag );
     }
 }
 
@@ -3652,9 +3652,9 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con
                 cmd = pasteOasisCommand( e );
                 if ( cmd )
                     macroCmd->addCommand(cmd);
-                //relayout textframeset after a dnd otherwise autoextend
+                //retqlayout textframeset after a dnd otherwise autoextend
                 //frameset is not re-layouted
-                textFrameSet()->layout();
+                textFrameSet()->tqlayout();
                 frameSet()->kWordDocument()->addCommand( macroCmd );
             }
             return;
@@ -3984,9 +3984,9 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force )
     // Paragraph settings
     KWTextParag * parag = static_cast<KWTextParag *>(cursor()->parag());
 
-    if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.alignment = parag->resolveAlignment();
-        m_canvas->gui()->getView()->showAlign( m_paragLayout.alignment );
+    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.tqalignment = parag->resolveAlignment();
+        m_canvas->gui()->getView()->showAlign( m_paragLayout.tqalignment );
     }
 
     // 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()->invalidate();
-            parag->setChanged( true ); // repaint
+            parag->counter()->tqinvalidate();
+            parag->setChanged( true ); // tqrepaint
         }
         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 aee28007e..ef83a3c8e 100644
--- a/kword/KWTextFrameSet.h
+++ b/kword/KWTextFrameSet.h
@@ -93,14 +93,14 @@ public:
     void clearUndoRedoInfo();
 
     /** Convert the @p dPoint in the normal coordinate system (and in pt)
-     * into a point (@p iPoint) in the internal qtextdoc coordinates (in layout units). */
+     * into a point (@p iPoint) in the internal qtextdoc coordinates (in tqlayout units). */
     KWFrame * documentToInternal( const KoPoint &dPoint, TQPoint &iPoint ) const;
 
     /// used by documentToInternalMouseSelection()
     enum RelativePosition { InsideFrame, LeftOfFrame, TopOfFrame, AtEnd };
     KWFrame * documentToInternalMouseSelection( const KoPoint &dPoint, TQPoint &iPoint, RelativePosition& relPos, KWViewMode *viewMode ) const;
 
-    /** Convert the @p in the internal qtextdoc coordinates (in layout units)
+    /** Convert the @p in the internal qtextdoc coordinates (in tqlayout units)
      * into a point in the document coordinate system (in pt).
      * Also returns the frame in which this point is. */
     KWFrame * internalToDocument( const KoPoint &relPoint, KoPoint &dPoint ) const;
@@ -125,7 +125,7 @@ public:
     KoPoint internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const;
 
     /** Implementation of Ctrl+PageUp/PageDown
-     * Returns a point in layout units (for placing the cursor) */
+     * Returns a point in tqlayout units (for placing the cursor) */
     TQPoint moveToPage( int currentPgNum, short int direction ) const;
 
     /** Return the available height in pixels (sum of all frames' height, with zoom applied)
@@ -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 repaint = true, KDialogBase* dialog = 0 );
-    void removeHighlight( bool repaint = true );
+    void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint = true, KDialogBase* dialog = 0 );
+    void removeHighlight( bool tqrepaint = true );
 
     virtual void addTextFrameSets( TQPtrList<KWTextFrameSet> &lst, bool onlyReadWrite=false );
 
@@ -237,9 +237,9 @@ public:
 #endif
 
     /** Invalidate all paragraphs and start re-formatting */
-    virtual void layout();
+    virtual void tqlayout();
     /** Invalidate all paragraphs (causes a re-flow of the text upon next redraw) */
-    virtual void invalidate();
+    virtual void tqinvalidate();
 
     virtual int paragraphs();
     virtual int paragraphsSelected();
@@ -275,19 +275,19 @@ public:
     /** Let KoTextFormatInterface set the modified format */
     virtual KCommand *setFormatCommand( const KoTextFormat * newFormat, int flags, bool zoomFont = false );
 
-    /** Let KoTextFormatInterface access the current parag layout */
+    /** Let KoTextFormatInterface access the current parag tqlayout */
     virtual const KoParagLayout * currentParagLayoutFormat() const;
 
     virtual bool rtl() const ;
 
 
-    /** Let KoTextFormatInterface set a modified current parag layout */
+    /** Let KoTextFormatInterface set a modified current parag tqlayout */
     virtual KCommand *setParagLayoutFormatCommand( KoParagLayout *newLayout, int flags, int marginIndex=-1);
 
     virtual KCommand *setChangeCaseOfTextCommand(KoChangeCaseDia::TypeOfCase _type);
 
     /** (Assuming this==main frameset), recalc the foot note numbers */
-    void renumberFootNotes( bool repaint = true );
+    void renumberFootNotes( bool tqrepaint = true );
 
     /**
      * Iteration over text objects - used by KWBgSpellCheck
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index 41d1749a0..d50e98a06 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;
-    invalidate(0);
+    tqinvalidate(0);
     if ( next() && ( pb & KoParagLayout::HardFrameBreakAfter ) )
-        next()->invalidate(0);
+        next()->tqinvalidate(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 alignment (left or right, not auto)
+    // save with the real tqalignment (left or right, not auto)
     m_layout.saveParagLayout( layoutElem, resolveAlignment() );
 
     // Paragraph's format
@@ -552,16 +552,16 @@ KoTextFormat KWTextParag::loadFormat( TQDomElement &formatElem, KoTextFormat * r
 
 void KWTextParag::loadLayout( TQDomElement & attributes )
 {
-    TQDomElement layout = attributes.namedItem( "LAYOUT" ).toElement();
-    if ( !layout.isNull() )
+    TQDomElement tqlayout = attributes.namedItem( "LAYOUT" ).toElement();
+    if ( !tqlayout.isNull() )
     {
         KWDocument * doc = kwTextDocument()->textFrameSet()->kWordDocument();
-        KoParagLayout paragLayout = loadParagLayout( layout, doc, true );
+        KoParagLayout paragLayout = loadParagLayout( tqlayout, doc, true );
         setParagLayout( paragLayout );
 
         // Load default format from style.
         KoTextFormat *defaultFormat = style() ? &style()->format() : 0L;
-        TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement();
+        TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement();
         if ( !formatElem.isNull() )
         {
             // Load paragraph format
@@ -577,7 +577,7 @@ void KWTextParag::loadLayout( TQDomElement & attributes )
     else
     {
         // Even the simplest import filter should do <LAYOUT><NAME value="Standard"/></LAYOUT>
-        kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what layout to apply" << endl;
+        kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what tqlayout to apply" << endl;
     }
 }
 
@@ -601,7 +601,7 @@ void KWTextParag::load( TQDomElement &attributes )
     loadFormatting( attributes );
 
     setChanged( true );
-    invalidate( 0 );
+    tqinvalidate( 0 );
 }
 
 void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loadFootNote )
@@ -639,7 +639,7 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa
                     // However, as it is an invalid XML character, we must replace it
                     // or it will be written out while save the file.
                     KoTextStringChar& ch = string()->at(index);
-                    if (ch.c.unicode()==1)
+                    if (ch.c.tqunicode()==1)
                     {
                         kdDebug() << "Replacing TQChar(1) (in KWTextParag::loadFormatting)" << endl;
                         ch.c='#';
@@ -740,12 +740,12 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa
     }
 }
 
-void KWTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex )
+void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex )
 {
-    KoTextParag::setParagLayout( layout, flags, marginIndex );
+    KoTextParag::setParagLayout( tqlayout, flags, marginIndex );
 
     if ( flags & KoParagLayout::PageBreaking )
-        setPageBreaking( layout.pageBreaking );
+        setPageBreaking( tqlayout.pageBreaking );
 }
 
 //////////
@@ -753,7 +753,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & layout, int flags, int m
 // Create a KoParagLayout from XML.
 KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle )
 {
-    KoParagLayout layout;
+    KoParagLayout tqlayout;
 
     // Only when loading paragraphs, not when loading styles
     if ( findStyle )
@@ -779,12 +779,12 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocumen
             style = doc->styleCollection()->findStyle( "Standard" );
         }
         Q_ASSERT(style);
-        layout.style = style;
+        tqlayout.style = style;
     }
 
-    KoParagLayout::loadParagLayout( layout, parentElem, doc->syntaxVersion() );
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() );
 
-    return layout;
+    return tqlayout;
 }
 
 void KWTextParag::join( KoTextParag *parag )
@@ -808,10 +808,10 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c
             const TQDomElement* paragraphStyle = context.oasisStyles().findStyle( styleName, "paragraph" );
             TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( KoXmlNS::style, "master-page-name", TQString() ) : TQString();
 
-            // In KWord we don't support sections so the first paragraph is the one that determines the page layout.
+            // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout.
             if ( prev() == 0 ) {
                 if ( masterPageName.isEmpty() )
-                    masterPageName = "Standard"; // Seems to be a builtin name for the default layout...
+                    masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout...
                 currentMasterPageRef = masterPageName; // do this first to avoid recursion
                 context.styleStack().save();
                 context.styleStack().setTypeProperties( "paragraph" );
@@ -822,18 +822,18 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c
                     doc->variableCollection()->variableSetting()->setStartingPageNumber( pageNumber.toInt() );
                 context.styleStack().restore();
 
-                doc->loadOasisPageLayout( masterPageName, context ); // page layout
+                doc->loadOasisPageLayout( masterPageName, context ); // page tqlayout
             }
             else if ( !masterPageName.isEmpty() // empty means no change
                       && masterPageName != currentMasterPageRef )
             {
-                // Detected a change in the master page -> this means we have to use a new page layout
+                // Detected a change in the master page -> this means we have to use a new page tqlayout
                 // and insert a frame break if not on the first paragraph.
                 kdDebug(32001) << "KWTextParag::loadOasis: change of master page detected: from " << currentMasterPageRef << " to " << masterPageName << " -> inserting page break" << endl;
                 currentMasterPageRef = masterPageName;
                 // [see also KoParagLayout for the 'normal' way to insert page breaks]
                 m_layout.pageBreaking |= KoParagLayout::HardFrameBreakBefore;
-                // We have no way to load/use the new page layout, KWord doesn't have "sections".
+                // We have no way to load/use the new page tqlayout, KWord doesn't have "sections".
             }
         }
     }
diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h
index de484a485..b0a9d044e 100644
--- a/kword/KWTextParag.h
+++ b/kword/KWTextParag.h
@@ -46,7 +46,7 @@ public:
 
     KWTextDocument * kwTextDocument() const;
 
-    virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, int marginIndex = -1 );
+    virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, int marginIndex = -1 );
 
     /** The type of page-breaking behaviour */
     void setPageBreaking( int pb ); // warning this sets all the flags!
@@ -73,7 +73,7 @@ public:
     /** Load (from KWord-1.3 XML) and apply \<FORMAT\> tags (used by KWTextParag::load and by KWPasteCommand) */
     void loadFormatting( TQDomElement &attributes, int offset = 0, bool loadFootNote=true );
 
-    /** Load (from KWord-1.3 XML) and apply paragraph layout */
+    /** Load (from KWord-1.3 XML) and apply paragraph tqlayout */
     void loadLayout( TQDomElement & attributes );
 
     /** Load (from KWord-1.3 XML), optionally using styles from document. */
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 80666965b..5b82b220e 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" ).arg( m_numDisplay ) );
+        writer.addTextNode( TQString( "%1" ).tqarg( 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 'invalidate so that renumberFootNotes recalcs'
+    if ( val != -1 ) // -1 is used to 'tqinvalidate so that renumberFootNotes recalcs'
         formatedNote();
 }
 
@@ -532,7 +532,7 @@ void KWFootNoteVariable::finalize()
         fs->textObject()->abortFormatting();
 
         // abortFormatting is a bool in kotextobject. So we need to return there before
-        // starting text layout again.
+        // starting text tqlayout again.
         m_doc->delayedRecalcFrames( TQMIN( pageNum, framePage ) );
         m_doc->delayedRepaintAllViews();
     }
@@ -596,7 +596,7 @@ void KWFootNoteVariable::setDeleted( bool del )
     m_doc->recalcFrames();
 
     if (!del)
-        m_frameset->layout(); // format its text, so that it resizes the frame
+        m_frameset->tqlayout(); // format its text, so that it resizes the frame
     KoVariable::setDeleted( del );
     // Does this compress? Probably not.
     m_doc->delayedRepaintAllViews();
@@ -617,7 +617,7 @@ double KWFootNoteVariable::varY() const
     if ( !fs->hasFramesInPageArray() ) // we need it for internalToDocument
     {
         kdDebug(32001) << "KWFootNoteVariable::varY too early, no updateFrames yet" << endl;
-        return 0; // this happens on loading - frame layout is done before text layout
+        return 0; // this happens on loading - frame tqlayout is done before text tqlayout
     }
     // What we need is "has never been formatted". Not "has just been invalidated"...
     //if ( !paragraph()->isValid() )
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 785a57dee..4ec739eb7 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -119,10 +119,10 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqapplication.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqprogressdialog.h>
 #include <tqregexp.h>
@@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
     if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror
     {
         m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbPageLabel, 0 );
 
         m_sbModifiedLabel = new KStatusBarLabel( "   ", 0, sb );
-        m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbModifiedLabel, 0 );
 
         m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbFramesLabel, 1 );
 
         m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb );
-        m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbOverwriteLabel, 0 );
 
         m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb );
-        m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbZoomLabel, 0 );
 
         m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb );
-        m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbUnitLabel, 0 );
     }
 
@@ -339,7 +339,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
     connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()),
              TQT_TQOBJECT(this), TQT_SLOT( updateFrameStatusBarItem()));
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
              TQT_TQOBJECT(this), TQT_SLOT( clipboardDataChanged() ) );
 
     connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()),
@@ -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 repaint).
+    // (and e.g. the statusbar can tqrepaint).
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) );
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) );
 }
@@ -640,7 +640,7 @@ void KWView::setupActions()
                                                   TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ),
                                                   actionCollection(), "view_textmode" );
         m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) );
-        m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) );
+        m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or tqlayout. KWord will display only the text for editing." ) );
 
         m_actionViewTextMode->setExclusiveGroup( "viewmodes" );
         m_actionViewPageMode = new KToggleAction( i18n( "&Page Mode" ), 0,
@@ -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").arg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").tqarg( 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").arg(i).latin1() );
+                                                         TQString("expression-action_%1").tqarg(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" ).arg( *it ) );
+            act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *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").arg(i).latin1();
+                 TQCString name = TQString("custom-action_%1").tqarg(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").arg(i).latin1());
+    act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(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" ).arg(m_currentPage->pageNumber())
-                .arg(m_doc->pageCount()) + ' ';
+            newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber())
+                .tqarg(m_doc->pageCount()) + ' ';
 
         if ( newText != oldText )
         {
             m_sbPageLabel->setText( newText );
-            // Need to repaint immediately. Otherwise when deleting 100 pages
+            // Need to tqrepaint immediately. Otherwise when deleting 100 pages
             // at once, there's no feedback.
-            m_sbPageLabel->repaint();
+            m_sbPageLabel->tqrepaint();
         }
     }
     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)" )
-                    .arg( frame->frameSet()->name() )
-                    .arg( KoUnit::toUserStringValue( frame->left(), unit ) )
-                    .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
+                    .tqarg( frame->frameSet()->name() )
+                    .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
                                 m_doc->pageManager()->pageNumber(frame->rect()) ), 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 ) ) );
+                    .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) );
         } else
-            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) );
+            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) );
     }
     else if ( sb && m_sbFramesLabel )
         m_sbFramesLabel->setText( TQString() );
@@ -1718,12 +1718,12 @@ void KWView::clipboardDataChanged()
     }
     KWFrameSetEdit * edit = m_gui->canvasWidget()->currentFrameSetEdit();
     // Is there plain text in the clipboard ?
-    if ( edit && !TQApplication::clipboard()->text().isEmpty() )
+    if ( edit && !TQApplication::tqclipboard()->text().isEmpty() )
     {
         m_actionEditPaste->setEnabled(true);
         return;
     }
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     const int provides = checkClipboard( data );
     if ( provides & ( ProvidesImage | ProvidesOasis | ProvidesFormula ) )
         m_actionEditPaste->setEnabled( true );
@@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt )
         m_doc->recalcVariables(  VT_ALL );
     }
 
-// Don't repaint behind the print dialog until we're done zooming/unzooming the doc
+// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc
     m_gui->canvasWidget()->setUpdatesEnabled(false);
     m_gui->canvasWidget()->viewport()->setCursor( waitCursor );
 
@@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt )
         m_doc->variableCollection()->recalcVariables(VT_MAILMERGE);
 
     painter.end(); // this is what triggers the printing
-    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
+    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime());
     m_doc->recalcVariables( VT_DATE );
 }
 
@@ -2365,7 +2365,7 @@ void KWView::editCut()
         edit->cut();
     else {
         TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() );
-        TQApplication::clipboard()->setData( drag );
+        TQApplication::tqclipboard()->setData( drag );
         deleteFrame(false);
     }
 }
@@ -2377,13 +2377,13 @@ void KWView::editCopy()
         edit->copy();
     else {
         TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() );
-        TQApplication::clipboard()->setData( drag );
+        TQApplication::tqclipboard()->setData( drag );
     }
 }
 
 void KWView::editPaste()
 {
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     pasteData( data, false );
 }
 
@@ -2423,7 +2423,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
                 provides = ProvidesPlainText;
             }
             if ( !drop ) // get it again, to avoid crashes
-                data = TQApplication::clipboard()->data();
+                data = TQApplication::tqclipboard()->data();
         }
         KWTextFrameSetEdit * edit = currentTextEdit();
         if ( edit && ( provides & ProvidesPlainText ) ) {
@@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
             TQCString returnedTypeMime = KoTextObject::providesOasis( data );
             if ( !returnedTypeMime.isEmpty() )
             {
-                const TQByteArray arr = data->encodedData( returnedTypeMime );
+                const TQByteArray arr = data->tqencodedData( returnedTypeMime );
                 if( !arr.isEmpty() )
                 {
                     TQBuffer buffer( arr );
@@ -2629,7 +2629,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) {
         // Calling updateFrames() on the selected frames' framesets isn't enough,
         // we also need other framesets to notice the new frames on top.
         m_doc->updateAllFrames();
-        m_doc->layout();
+        m_doc->tqlayout();
         m_doc->repaintAllViews();
     }
 
@@ -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?").arg(fs->name()),
+                          "Are you sure you want to do that?").tqarg(fs->name()),
                     i18n("Delete Frame"), KStdGuiItem::del());
 
                 if (result != KMessageBox::Continue)
@@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame()
     if (selectedFrames.count() != 1)
         return; // action is disabled in such a case
     KWFrame* frame = selectedFrames[0]->frame();
-    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() );
+    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() );
     newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top
     newFrame->setCopy(true);
     newFrame->setNewFrameBehavior( KWFrame::Copy );
@@ -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%").arg(*it) );
+            lst.append( i18n("%1%").tqarg(*it) );
     }
     else
     {
-        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");
+        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");
     }
     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%").arg( zoom ) );
+    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
     m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr)  );
 }
 
@@ -3110,7 +3110,7 @@ void KWView::showZoom( const TQString& zoom )
 void KWView::slotViewFormattingChars()
 {
     m_doc->setViewFormattingChars(m_actionViewFormattingChars->isChecked());
-    m_doc->layout(); // Due to the different formatting when this option is activated
+    m_doc->tqlayout(); // Due to the different formatting when this option is activated
     m_doc->repaintAllViews();
 }
 
@@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source )
         KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() );
         m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo
         if ( source ) {
-            TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() );
+            TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() );
             TQDomDocument formula;
             formula.setContent( data );
             TQDomElement formulaElem = formula.namedItem("math").toElement();
@@ -4370,7 +4370,7 @@ void KWView::tableJoinCells()
         return;
     }
     m_doc->addCommand(cmd);
-    m_doc->layout();
+    m_doc->tqlayout();
 }
 
 void KWView::tableSplitCells() {
@@ -4405,7 +4405,7 @@ void KWView::tableSplitCells(int cols, int rows)
     }
     m_doc->addCommand(cmd);
     m_doc->updateAllFrames();
-    m_doc->layout();
+    m_doc->tqlayout();
     frameViewManager()->view(cell->frame(0))->setSelected(true);
 }
 
@@ -4980,10 +4980,10 @@ void KWView::setSpacing( KoParagLayout::SpacingType spacing, const TQString& com
   KMacroCommand* macroCmd = 0L;
   for ( ; it.current() ; ++it )
   {
-    KoParagLayout layout( *it.current()->currentParagLayoutFormat() );
-    layout.lineSpacingType = spacing;
+    KoParagLayout tqlayout( *it.current()->currentParagLayoutFormat() );
+    tqlayout.lineSpacingType = spacing;
 
-    KCommand *cmd = it.current()->setParagLayoutFormatCommand( &layout, KoParagLayout::LineSpacing );
+    KCommand *cmd = it.current()->setParagLayoutFormatCommand( &tqlayout, KoParagLayout::LineSpacing );
     if (cmd)
     {
       if ( !macroCmd )
@@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble()
 
 void KWView::slotCounterStyleSelected()
 {
-    TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+    TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
     TQString styleStr = actionName.mid(13);
     //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl;
     KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt());
@@ -5167,8 +5167,8 @@ void KWView::textIncreaseIndent()
         m_doc->addCommand(macroCmd);
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 #if 0
 
@@ -5216,8 +5216,8 @@ void KWView::textDecreaseIndent()
         m_doc->addCommand(macroCmd);
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 
 
@@ -5445,7 +5445,7 @@ void KWView::tabListChanged( const KoTabulatorList & tabList )
         m_doc->addCommand(macroCmd);
 }
 
-void KWView::newPageLayout( const KoPageLayout &layout )
+void KWView::newPageLayout( const KoPageLayout &tqlayout )
 {
     TQString mode = viewMode()->type();
     bool state = (mode!="ModeText");
@@ -5457,14 +5457,14 @@ void KWView::newPageLayout( const KoPageLayout &layout )
     KoKWHeaderFooter hf;
     m_doc->getPageLayout( pgLayout, cl, hf );
 
-    if(layout==pgLayout)
+    if(tqlayout==pgLayout)
         return;
 
     KWPageLayoutStruct oldLayout( pgLayout, cl, hf );
 
-    m_doc->setPageLayout( layout, cl, hf );
+    m_doc->setPageLayout( tqlayout, cl, hf );
 
-    KWPageLayoutStruct newLayout( layout, cl, hf );
+    KWPageLayoutStruct newLayout( tqlayout, cl, hf );
 
     KWTextFrameSetEdit *edit = currentTextEdit();
     if (edit)
@@ -5473,12 +5473,12 @@ void KWView::newPageLayout( const KoPageLayout &layout )
     m_doc->addCommand(cmd);
 }
 
-void KWView::slotPageLayoutChanged( const KoPageLayout& layout )
+void KWView::slotPageLayoutChanged( const KoPageLayout& tqlayout )
 {
     // This is connected to a signal of KWDocument, so that when the
-    // above method, or any other way of changing the page layout happens,
+    // above method, or any other way of changing the page tqlayout happens,
     // the rulers are updated in all views.
-    viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), layout );
+    viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), tqlayout );
     m_gui->canvasWidget()->repaintAll();
 }
 
@@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged()
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
         showCounter( counter );
-        int align = paragLayout->alignment;
+        int align = paragLayout->tqalignment;
         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 children of the fixed viewport.
+    // to scroll around with it, instead of being tqchildren 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.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
+                                  "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( 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.").arg( strerror( tempFile.status() ) ),
+                            "Error during saving. Could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
             else
-                KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") );
+                KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") );
         }
     }
 }
@@ -6586,7 +6586,7 @@ void KWView::switchModeView()
     updateZoomControls();
 
     updatePageInfo();
-    // set page layout in rulers
+    // set page tqlayout in rulers
     canvas->viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), m_doc->pageLayout() );
 }
 
@@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode()
             hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             hRuler->changeFlags(0);
-        hRuler->repaint();
+        hRuler->tqrepaint();
     }
 }
 
@@ -7263,7 +7263,7 @@ void KWView::convertToTextBox()
         if ( cmd )
             macro->addCommand( cmd );
         // Auto-resize the frame from its contents
-        edit->textFrameSet()->layout();
+        edit->textFrameSet()->tqlayout();
     }
     m_doc->addCommand( macro );
 }
@@ -7618,19 +7618,19 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView )
     l << 90;
     m_panner->setSizes( l );
 
-    KoPageLayout layout = doc->pageLayout();
+    KoPageLayout tqlayout = doc->pageLayout();
 
     m_tabChooser = new KoTabChooser( m_right, KoTabChooser::TAB_ALL );
     m_tabChooser->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_tabChooser, 0, 0 );
 
-    m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, layout,
+    m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, tqlayout,
 			      KoRuler::F_INDENTS | KoRuler::F_TABS,
 			      doc->unit(), m_tabChooser );
     m_horRuler->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_horRuler, 0, 1 );
 
-    m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, layout,
+    m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, tqlayout,
 			       0, doc->unit() );
     m_vertRuler->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_vertRuler, 1, 0 );
@@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e )
 
 void KWGUI::reorganize()
 {
-    int hSpace = m_vertRuler->minimumSizeHint().width();
-    int vSpace = m_horRuler->minimumSizeHint().height();
+    int hSpace = m_vertRuler->tqminimumSizeHint().width();
+    int vSpace = m_horRuler->tqminimumSizeHint().height();
     if(m_view->kWordDocument()->showRuler())
     {
         m_vertRuler->show();
diff --git a/kword/KWView.h b/kword/KWView.h
index 095633bf2..f023e6c6d 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -37,7 +37,7 @@
 #include <kshortcut.h>
 #include <KoZoomMode.h>
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqhbox.h>
 
 class KWPage;
@@ -350,7 +350,7 @@ public slots:
     void configure();
     void configureCompletion();
 
-    void newPageLayout( const KoPageLayout &layout );
+    void newPageLayout( const KoPageLayout &tqlayout );
     void newLeftIndent( double leftIndent);
     void newFirstIndent( double firstIndent);
     void newRightIndent( double rightIndent);
@@ -487,7 +487,7 @@ protected slots:
     void spellAddAutoCorrect (const TQString & originalword, const TQString & newword);
     void slotApplyFont();
     void slotApplyParag();
-    void slotPageLayoutChanged( const KoPageLayout& layout );
+    void slotPageLayoutChanged( const KoPageLayout& tqlayout );
     void slotChangeCaseState(bool b);
     void slotChangeCutState(bool b);
     void slotCorrectWord();
@@ -868,7 +868,7 @@ protected:
     KWDocStruct     *m_docStruct;
 
     // The right side
-    TQWidget         *m_right;	// The layout widget.
+    TQWidget         *m_right;	// The tqlayout widget.
 
     KoTabChooser    *m_tabChooser;
     KoRuler         *m_vertRuler;
diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp
index b82498398..c1c6f16ee 100644
--- a/kword/KWViewMode.cpp
+++ b/kword/KWViewMode.cpp
@@ -63,7 +63,7 @@ void KWViewMode::drawOnePageBorder( TQPainter * painter, const TQRect & crect, c
         TQRegion pageEmptyRegion = emptySpaceRegion.intersect( pagecrect );
         //kdDebug() << "RESULT: pageEmptyRegion: " << pageEmptyRegion << endl;
         if ( !pageEmptyRegion.isEmpty() )
-            m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::palette().active().brush( TQColorGroup::Base ) );
+            m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Base ) );
     }
 }
 
@@ -74,7 +74,7 @@ TQRect KWViewMode::drawRightShadow( TQPainter * painter, const TQRect & crect, c
     if ( !shadowRect.isEmpty() )
     {
         painter->fillRect( shadowRect,
-                           TQApplication::palette().active().brush( TQColorGroup::Shadow ) );
+                           TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) );
     }
     return shadowRect;
 }
@@ -85,7 +85,7 @@ TQRect KWViewMode::drawBottomShadow( TQPainter * painter, const TQRect & crect,
     shadowRect &= crect; // intersect
     if ( !shadowRect.isEmpty() )
         painter->fillRect( shadowRect,
-                           TQApplication::palette().active().brush( TQColorGroup::Shadow ) );
+                           TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) );
     return shadowRect;
 }
 
@@ -144,10 +144,10 @@ TQRect KWViewMode::rulerFrameRect()
     return TQRect();
 }
 
-void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout )
+void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout )
 {
-    hRuler->setPageLayout( layout );
-    vRuler->setPageLayout( layout );
+    hRuler->setPageLayout( tqlayout );
+    vRuler->setPageLayout( tqlayout );
 }
 
 // static
@@ -230,7 +230,7 @@ int KWViewModeNormal::xOffset(KWPage *page, int canvasWidth /* = -1 */) {
 void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion )
 {
     painter->save();
-    painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) );
+    painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) );
     painter->setBrush( TQt::NoBrush );
     TQRect pageRect;
 
@@ -258,7 +258,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec
         leftArea &= crect;
         if ( !leftArea.isEmpty() ) {
             painter->fillRect( leftArea,
-                               TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+                               TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
         }
 
         // The area on the right of the page
@@ -267,7 +267,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec
         if ( !rightArea.isEmpty() )
         {
             painter->fillRect( rightArea,
-                               TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+                               TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
 
             // Draw a shadow
             int topOffset = ( page==0 ) ? s_shadowOffset : 0; // leave a few pixels on top, only for first page
@@ -284,7 +284,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec
         if ( !repaintRect.isEmpty() )
         {
             painter->fillRect( repaintRect,
-                    TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+                    TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
             // Draw a shadow
             drawBottomShadow( painter, crect, pageRect, s_shadowOffset );
         }
@@ -406,7 +406,7 @@ TQPoint KWViewModePreview::viewToNormal( const TQPoint & vPoint )
 void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion )
 {
     painter->save();
-    painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) );
+    painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) );
     painter->setBrush( TQt::NoBrush );
     //kdDebug() << "KWViewModePreview::drawPageBorders crect=" << DEBUGRECT( crect ) << endl;
     TQRegion grayRegion( crect );
@@ -439,7 +439,7 @@ void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & cre
     if ( !grayRegion.isEmpty() )
     {
         //kdDebug() << "KWViewModePreview::drawPageBorders grayRegion's bounding Rect = " << DEBUGRECT( grayRegion.boundingRect() ) << endl;
-        m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+        m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
     }
     painter->restore();
 }
@@ -541,7 +541,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect,
     painter->save();
     TQRegion grayRegion( crect );
     //kdDebug() << "KWViewModeText::drawPageBorders crect=" << grayRegion << endl;
-    painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) );
+    painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) );
     TQSize cSize = contentsSize();
     // Draw a line on the right -- ## or a shadow?
     // +1 to be out of the contents, and +1 for TQRect
@@ -562,7 +562,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect,
     }
     //kdDebug() << "KWViewModeText::drawPageBorders erasing grayRegion " << grayRegion << endl;
     if ( !grayRegion.isEmpty() )
-        m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+        m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
     painter->restore();
 }
 
@@ -571,24 +571,24 @@ TQRect KWViewModeText::rulerFrameRect()
     return TQRect( TQPoint(OFFSET, 0), contentsSize() );
 }
 
-void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*layout*/ )
+void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*tqlayout*/ )
 {
-    // Create a dummy page-layout, as if we had a single page englobing the whole text.
-    KoPageLayout layout;
-    layout.format = PG_CUSTOM;
-    layout.orientation = PG_PORTRAIT;
+    // Create a dummy page-tqlayout, as if we had a single page englobing the whole text.
+    KoPageLayout tqlayout;
+    tqlayout.format = PG_CUSTOM;
+    tqlayout.orientation = PG_PORTRAIT;
     TQSize cSize = contentsSize();
-    layout.ptWidth = m_doc->unzoomItX( cSize.width() );
-    layout.ptHeight = m_doc->unzoomItY( cSize.height() );
-    //kdDebug() << "KWViewModeText::setPageLayout layout size " << layout.ptWidth << "x" << layout.ptHeight << endl;
-    layout.ptLeft = OFFSET;
-    layout.ptRight = 0;
-    layout.ptTop = 0;
-    layout.ptBottom = 0;
-    layout.ptBindingSide = 0;
-    layout.ptPageEdge = 0;
-    hRuler->setPageLayout( layout );
-    vRuler->setPageLayout( layout );
+    tqlayout.ptWidth = m_doc->unzoomItX( cSize.width() );
+    tqlayout.ptHeight = m_doc->unzoomItY( cSize.height() );
+    //kdDebug() << "KWViewModeText::setPageLayout tqlayout size " << tqlayout.ptWidth << "x" << tqlayout.ptHeight << endl;
+    tqlayout.ptLeft = OFFSET;
+    tqlayout.ptRight = 0;
+    tqlayout.ptTop = 0;
+    tqlayout.ptBottom = 0;
+    tqlayout.ptBindingSide = 0;
+    tqlayout.ptPageEdge = 0;
+    hRuler->setPageLayout( tqlayout );
+    vRuler->setPageLayout( tqlayout );
 }
 
 bool KWViewModeText::isTextModeFrameset(KWFrameSet *fs) const {
diff --git a/kword/KWViewMode.h b/kword/KWViewMode.h
index fa0ec1d97..fc78779a4 100644
--- a/kword/KWViewMode.h
+++ b/kword/KWViewMode.h
@@ -85,9 +85,9 @@ public:
     /** The result of this is passed to setFrameStartEnd for both rulers
      * (after adjustement with pageCorner()) */
     virtual TQRect rulerFrameRect();
-    /** Called when the page layout is set, or changes.
+    /** Called when the page tqlayout is set, or changes.
      * Usually this is directly passed to KoRuler (for page-based viewmodes) */
-    virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout );
+    virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout );
 
     virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) = 0;
 
@@ -273,7 +273,7 @@ public:
     // There is no page concept. Keep everything relative to (0,0)
     virtual TQPoint pageCorner() { return TQPoint( 0, 0 ); }
     virtual TQRect rulerFrameRect();
-    virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout );
+    virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout );
 
     virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion );
     virtual const TQString type() const { return "ModeText"; }
diff --git a/kword/KWordFrameSetIface.cpp b/kword/KWordFrameSetIface.cpp
index e284862ea..928cddb5a 100644
--- a/kword/KWordFrameSetIface.cpp
+++ b/kword/KWordFrameSetIface.cpp
@@ -135,25 +135,25 @@ bool KWordFrameSetIface::isCopy()const
 void KWordFrameSetIface::setPtMarginLeft(double val)
 {
     m_frame->frame( 0 )->setPaddingLeft(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
 void KWordFrameSetIface::setPtMarginRight(double val)
 {
     m_frame->frame( 0 )->setPaddingRight(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 
 }
 void KWordFrameSetIface::setPtMarginTop(double val)
 {
     m_frame->frame( 0 )->setPaddingTop(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
 void KWordFrameSetIface::setPtMarginBottom(double val)
 {
     m_frame->frame( 0 )->setPaddingBottom(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
 TQColor KWordFrameSetIface::leftBorderColor() const
diff --git a/kword/KWordFrameSetIface.h b/kword/KWordFrameSetIface.h
index 175d8fc02..9a5c92389 100644
--- a/kword/KWordFrameSetIface.h
+++ b/kword/KWordFrameSetIface.h
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqcolor.h>
-#include <brush.h>
+#include <tqbrush.h>
 class KWFrameSet;
 
 class KWordFrameSetIface : public DCOPObject
diff --git a/kword/KWordViewIface.cpp b/kword/KWordViewIface.cpp
index a259d9e78..246b92e6e 100644
--- a/kword/KWordViewIface.cpp
+++ b/kword/KWordViewIface.cpp
@@ -394,7 +394,7 @@ bool KWordViewIface::pictureKeepRatio() const
     return view->getGUI()->canvasWidget()->pictureKeepRatio();
 }
 
-void KWordViewIface::changeAutoSpellCheckStatus(bool b)
+void KWordViewIface::changeAutoSpellChecktqStatus(bool b)
 {
     view->autoSpellCheck(b);
 }
diff --git a/kword/KWordViewIface.h b/kword/KWordViewIface.h
index 5181359db..ea422ad98 100644
--- a/kword/KWordViewIface.h
+++ b/kword/KWordViewIface.h
@@ -126,7 +126,7 @@ k_dcop:
 
     void setPictureKeepRatio( bool _keep);
     bool pictureKeepRatio() const;
-    void changeAutoSpellCheckStatus(bool b);
+    void changeAutoSpellChecktqStatus(bool b);
     void deselectAllFrames();
     int currentPage();
     void convertTableToText();
diff --git a/kword/OASIS b/kword/OASIS
index b840b92d9..fdbfc0166 100644
--- a/kword/OASIS
+++ b/kword/OASIS
@@ -25,7 +25,7 @@ and the page-based DTP mode (page-sequence element).
 
 * Headers and footers
 OpenDocument supports odd/even headers and footers using "header" and "header-left".
-But for first page header/footer KWord should create a separate page layout,
+But for first page header/footer KWord should create a separate page tqlayout,
 this is not done yet (it uses its own tag instead, as a temporary hack).
 Also OpenDocument doesn't allow a different style for header and header-left,
 so they must have the same min-size, border, margins...
@@ -60,7 +60,7 @@ List of features that KWord has, but OOo doesn't have, and which are in the Open
 
 List of features that KWord doesn't have, and which OpenDocument has:
  (that list would be quite long, but let's list the real-life interoperability problems)
- - lack of section support (changes of page layout, but also changes of column settings
+ - lack of section support (changes of page tqlayout, but also changes of column settings
    in the middle of a page)
    We could at least keep section styles and section markers (begin/end),
     so that load+save preserves it.
diff --git a/kword/defs.h b/kword/defs.h
index a1bc3677d..b4b606655 100644
--- a/kword/defs.h
+++ b/kword/defs.h
@@ -20,7 +20,7 @@
 #ifndef defs_h
 #define defs_h
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <KoGlobal.h>
 #include "KWFactory.h"
diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd
index c9e7fb034..f673d49c0 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, geometry=894x723+0+0] doc = 0x8133470</TEXT>
+    <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>
     <LAYOUT>
      <NAME value="Standard" />
      <FLOW align="left" />
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 57b574a56..1e6c20fee 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -24,7 +24,7 @@
 #include <kinputdialog.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
@@ -107,7 +107,7 @@ void KWClassicSerialDataSource::removeRecord( int i )
     if ( (i < 0) || (i > (int)db.count() - 1) )
         return;
 
-	kdDebug()<<TQString("Removing record %1").arg(i)<<endl;
+	kdDebug()<<TQString("Removing record %1").tqarg(i)<<endl;
 
     Db::Iterator it = db.at( i);
     db.remove( it );
@@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i )
 
 void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
-	TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
 	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
-		TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-		defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+		defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 		def.appendChild(defEnt);
 	}
-	TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
 	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
-		TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
 		cont.appendChild(rec);
 		for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 		{
-			TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-			recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
-			recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
+			TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+			recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+			recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
 			rec.appendChild(recEnt);
 		}
 	}
@@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
-		sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" );
+		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" );
 	}
 	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
@@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 		appendRecord();
 		for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
 		{
-			setValue(recEnt.attribute(TQString::fromLatin1("name")),
-				recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
+			setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
+				recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
 		}
 	}
 }
@@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const
 void KWClassicMailMergeEditorListItem::setup()
 {
     setHeight( TQMAX( listView()->fontMetrics().height(),
-                     editWidget->sizeHint().height() ) );
-    if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() )
-        listView()->setColumnWidth( 1, editWidget->sizeHint().width() );
+                     editWidget->tqsizeHint().height() ) );
+    if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() )
+        listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() );
 }
 
 void KWClassicMailMergeEditorListItem::update()
@@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
 
     first = new TQToolButton( toolbar );
     first->setIconSet( SmallIconSet( "start" ) );
-    first->setFixedSize( first->sizeHint() );
+    first->setFixedSize( first->tqsizeHint() );
     connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord()));
 
     back_ = new TQToolButton( toolbar );
     back_->setIconSet( SmallIconSet( "back" ) );
-    back_->setFixedSize( back_->sizeHint() );
+    back_->setFixedSize( back_->tqsizeHint() );
     connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord()));
 
     records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar );
-    records->setMaximumHeight( records->sizeHint().height() );
+    records->setMaximumHeight( records->tqsizeHint().height() );
     connect( records, TQT_SIGNAL( valueChanged( int ) ),
              this, TQT_SLOT( changeRecord( int ) ) );
 
     forward = new TQToolButton( toolbar );
     forward->setIconSet( SmallIconSet( "forward" ) );
-    forward->setFixedSize( forward->sizeHint() );
+    forward->setFixedSize( forward->tqsizeHint() );
     connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord()));
 
     finish = new TQToolButton( toolbar );
     finish->setIconSet( SmallIconSet( "finish" ) );
-    finish->setFixedSize( finish->sizeHint() );
+    finish->setFixedSize( finish->tqsizeHint() );
     connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord()));
 
     TQWidget *sep = new TQWidget( toolbar );
@@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
 
     newRecord = new TQToolButton( toolbar );
     newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) );
-    newRecord->setFixedSize( newRecord->sizeHint() );
+    newRecord->setFixedSize( newRecord->tqsizeHint() );
     connect( newRecord, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( addRecord() ) );
     TQToolTip::add( newRecord, i18n( "Add record" ) );
 
     newEntry = new TQToolButton( toolbar );
     newEntry->setIconSet( SmallIconSet( "sl_addentry" ) );
-    newEntry->setFixedSize( newEntry->sizeHint() );
+    newEntry->setFixedSize( newEntry->tqsizeHint() );
     connect( newEntry, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( addEntry() ) );
     TQToolTip::add( newEntry, i18n( "Add entry" ) );
 
     deleteRecord = new TQToolButton( toolbar );
     deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) );
-    deleteRecord->setFixedSize( deleteRecord->sizeHint() );
+    deleteRecord->setFixedSize( deleteRecord->tqsizeHint() );
     connect( deleteRecord, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( removeRecord() ) );
     TQToolTip::add( deleteRecord, i18n( "Remove record" ) );
 
     deleteEntry = new TQToolButton( toolbar );
     deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) );
-    deleteEntry->setFixedSize( deleteEntry->sizeHint() );
+    deleteEntry->setFixedSize( deleteEntry->tqsizeHint() );
     connect( deleteEntry, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( removeEntry() ) );
     TQToolTip::add( deleteEntry, i18n( "Remove entry" ) );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 1886207ce..411ee5e57 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." ).arg( *_UIDIterator ) );
+        return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_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") ).arg( -geo.latitude() );
+            lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() );
         else
-            lat = TQString( i18n("%1 North") ).arg( geo.latitude() );
+            lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() );
 
         if(  geo.longitude()<0 )
             // There is something going wrong, because "W" is replaced by "q ".
             // Needs fix.
-            longi = TQString( i18n("%1 West") ).arg( -geo.longitude() );
+            longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() );
         else
-            longi = TQString( i18n("%1 East") ).arg( geo.longitude() );
+            longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() );
 
         return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi );
     }
@@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
             for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
                     recEnt=recEnt.nextSibling().toElement() )
             {
-                addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) );
+                addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) );
             }
         }
         else if( rec.nodeName() == "LIST" )
@@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
             for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
                     recEnt=recEnt.nextSibling().toElement() )
             {
-                addList( recEnt.attribute( TQString::fromLatin1("listid") ) );
+                addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) );
             }
         }
         else
@@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool )
 
 void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
 {
-    TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+    TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
     parent.appendChild(cont);
 
     TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
     for( ; it != _individualUIDs.end(); ++it )
     {
-        TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+        TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
         cont.appendChild(rec);
-        TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-        recEnt.setAttribute(TQString::fromLatin1("uid"),*it);
+        TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+        recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it);
         rec.appendChild(recEnt);
     }
 
     it = _lists.begin();
     for( ; !(it == _lists.end()); ++it )
     {
-        TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST"));
+        TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST"));
         cont.appendChild(rec);
-        TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-        recEnt.setAttribute(TQString::fromLatin1("listid"),*it);
+        TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+        recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it);
         rec.appendChild(recEnt);
     }
 }
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index d3f3a21c4..d1c038099 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -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>" )
-                                  .arg( listName ) );
+                                  .tqarg( 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 af8f5723f..c7276c9b4 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -76,7 +76,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -101,7 +101,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -217,7 +217,7 @@
             <property name="text">
                 <string>&amp;Address Book</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <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="alignment">
+            <property name="tqalignment">
                 <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 025e9a4e1..6801a64a0 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" ).arg( name );
+    return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
 }
 
 void KWMailMergeKSpread::load( TQDomElement& parentElem )
@@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
   if ( element.isNull() )
     return;
 
-  _url = element.attribute( TQString::fromLatin1( "URL" ) );
-  _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt();
+  _url = element.attribute( TQString::tqfromLatin1( "URL" ) );
+  _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt();
 
   initDocument();
 }
 
 void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
 {
-  TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) );
+  TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
   parent.appendChild( content );
 
   content.setAttribute( "URL", _url.url() );
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index 595633d99..f08ae82e2 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -100,20 +100,20 @@ void KWMailMergeKSpreadConfig::initGUI()
 {
   TQFrame *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   _urlRequester = new KURLRequester( page );
-  layout->addWidget( _urlRequester, 0, 1 );
+  tqlayout->addWidget( _urlRequester, 0, 1 );
 
   label = new TQLabel( i18n( "Page number:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   _pageNumber = new KComboBox( page );
   _pageNumber->setEnabled( false );
-  layout->addWidget( _pageNumber, 1, 1 );
+  tqlayout->addWidget( _pageNumber, 1, 1 );
   connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
 }
 
diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h
index 8919cc9a6..4a25323ba 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 /*invalidate*/ = TRUE ) { return FALSE; }
-    int update( bool /*invalidate*/ = TRUE ) { return FALSE; }
-    int del( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
     void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
 };
 
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index b424f2276..3db1d9d6f 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -3,7 +3,7 @@
 #include <tqtable.h>
 #include <tqscrollview.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
@@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
 
 	int h=m_table->rowHeight(0);
 	for (int i=0;i<6;i++) h+=m_table->rowHeight(i);
-	h+=m_table->horizontalHeader()->sizeHint().height();
+	h+=m_table->horizontalHeader()->tqsizeHint().height();
 	m_table->setMinimumHeight(h);
 	
 	int w=0;
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 3e860d76f..d3feca225 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -22,7 +22,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kconfig.h>
 #include <kpushbutton.h>
 #include <klineeditdlg.h>
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index e7671e033..544f79904 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -20,7 +20,7 @@
 #include "KWQtSqlPowerSerialDataSource.h"
 #include "KWQtSqlPowerSerialDataSource.moc"
 #include "KWQtSqlMailMergeOpen.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -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").arg(myquery->size())<<endl;
+	kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
 }
 
 TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const
@@ -79,33 +79,33 @@ 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<<<").arg(name);
+	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
 	return (myquery->value(name)).toString();
 }
 
 void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
-        TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+        TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
         parent.appendChild(def);
         {
-                TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE"));
-                defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname);
-                defEnt.setAttribute(TQString::fromLatin1("port"),port);
-                defEnt.setAttribute(TQString::fromLatin1("driver"),driver);
-                defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename);
-                defEnt.setAttribute(TQString::fromLatin1("username"),username);
+                TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE"));
+                defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname);
+                defEnt.setAttribute(TQString::tqfromLatin1("port"),port);
+                defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver);
+                defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename);
+                defEnt.setAttribute(TQString::tqfromLatin1("username"),username);
                 def.appendChild(defEnt);
 
-		defEnt=doc.createElement(TQString::fromLatin1("QUERY"));
-		defEnt.setAttribute(TQString::fromLatin1("value"),query);
+		defEnt=doc.createElement(TQString::tqfromLatin1("QUERY"));
+		defEnt.setAttribute(TQString::tqfromLatin1("value"),query);
 		def.appendChild(defEnt);
 
-		TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD"));
+		TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD"));
 		parent.appendChild(sampleEnt);
 	        for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
         	{
-                	TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-	                fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+                	TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+	                fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 	                sampleEnt.appendChild(fieldEnt);
 	        }
         }
@@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 		if (!dbNd.isNull())
 		{
 			TQDomElement dbEnt=dbNd.toElement();
-			if (dbEnt.tagName()==TQString::fromLatin1("DATABASE"))
+			if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE"))
 			{
-				hostname=dbEnt.attribute(TQString::fromLatin1("hostname"));
-				port=dbEnt.attribute(TQString::fromLatin1("port"));
-				driver=dbEnt.attribute(TQString::fromLatin1("driver"));
-				databasename=dbEnt.attribute(TQString::fromLatin1("databasename"));
-				username=dbEnt.attribute(TQString::fromLatin1("username"));
+				hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname"));
+				port=dbEnt.attribute(TQString::tqfromLatin1("port"));
+				driver=dbEnt.attribute(TQString::tqfromLatin1("driver"));
+				databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename"));
+				username=dbEnt.attribute(TQString::tqfromLatin1("username"));
 			}
 		}
 		TQDomNode queryNd=def.namedItem("QUERY");
 		if (!queryNd.isNull())
 		{
-			query=queryNd.toElement().attribute(TQString::fromLatin1("value"));
+			query=queryNd.toElement().attribute(TQString::tqfromLatin1("value"));
 		}
         }
 
@@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 		TQDomElement def1=defNd.toElement();
 	        for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	        {
-	               addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name")));
+	               addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name")));
 	        }
 	}
 }
@@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute()
 	cur->setMode(TQSqlCursor::ReadOnly);
 
 	db->clearSampleRecord();
-	kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl;
+	kdDebug()<<TQString("Fieldname count %1").tqarg(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 b956335b3..ec31df358 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -22,7 +22,7 @@
 #include "KWQtSqlEasyFilter.h"
 
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsqlcursor.h>
 #include <tqdatatable.h>
 #include <tqcheckbox.h>
@@ -59,32 +59,32 @@ 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<<<").arg(name);
+        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
         return (myquery->value(name)).toString();
 }
 
 void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/)
 {
 /*
-	TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
 	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
-		TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-		defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+		defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 		def.appendChild(defEnt);
 	}
-	TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
 	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
-		TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
 		cont.appendChild(rec);
 		for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 		{
-			TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-			recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
-			recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
+			TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+			recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+			recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
 			rec.appendChild(recEnt);
 		}
 	}
@@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
-		sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" );
+		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
 	}
 	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
@@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 		appendRecord();
 		for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
 		{
-			setValue(recEnt.attribute(TQString::fromLatin1("name")),
-				recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
+			setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
+				recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
 		}
 	}
 */
@@ -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").arg(myquery->size())<<endl;
+        kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
 
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 0d414cdc0..f31a431a6 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -20,7 +20,7 @@
 #include "KWQtSqlSerialDataSourceBase.h"
 #include "KWQtSqlSerialDataSourceBase.moc"
 #include "KWQtSqlMailMergeOpen.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0;
 KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
 	port=i18n("default");
 }
 
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index afff8c7ff..a68b62dbd 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -54,7 +54,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>120</height>
@@ -73,7 +73,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>120</height>
@@ -168,7 +168,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -196,7 +196,7 @@
                     <property name="name">
                         <cstring>Line2</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui
index c0d2423ad..fc32bded0 100644
--- a/kword/mailmerge/sql/qtsqlopenwidget.ui
+++ b/kword/mailmerge/sql/qtsqlopenwidget.ui
@@ -283,7 +283,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp
index 9b261d90b..641e65344 100644
--- a/kword/tests/KWPageManagerTester.cpp
+++ b/kword/tests/KWPageManagerTester.cpp
@@ -200,11 +200,11 @@ void KWPageManagerTester::removePages() {
 
 void KWPageManagerTester::pageInfo() {
     KWPageManager *pageManager = new KWPageManager();
-    KoPageLayout layout;
-    layout.ptWidth = 300;
-    layout.ptHeight = 600;
-    layout.format = PG_DIN_A4;
-    pageManager->setDefaultPage(layout);
+    KoPageLayout tqlayout;
+    tqlayout.ptWidth = 300;
+    tqlayout.ptHeight = 600;
+    tqlayout.format = PG_DIN_A4;
+    pageManager->setDefaultPage(tqlayout);
     pageManager->setStartPage(1);
     KWPage *page1 = pageManager->appendPage();
     page1->setWidth(100);
@@ -216,19 +216,19 @@ void KWPageManagerTester::pageInfo() {
 
     CHECK(pageManager->topOfPage(3), 300.0);
     CHECK(pageManager->bottomOfPage(3), 900.0);
-    layout.ptHeight = 500;
-    pageManager->setDefaultPage(layout);
+    tqlayout.ptHeight = 500;
+    pageManager->setDefaultPage(tqlayout);
     CHECK(pageManager->bottomOfPage(3), 800.0);
     page2->setHeight(-1);
     CHECK(pageManager->bottomOfPage(3), 1200.0);
 
-    layout.ptTop = 5;
-    layout.ptLeft = 6;
-    layout.ptBottom = 7;
-    layout.ptRight = 8;
-    layout.ptBindingSide = -1;
-    layout.ptPageEdge = -1;
-    pageManager->setDefaultPage(layout);
+    tqlayout.ptTop = 5;
+    tqlayout.ptLeft = 6;
+    tqlayout.ptBottom = 7;
+    tqlayout.ptRight = 8;
+    tqlayout.ptBindingSide = -1;
+    tqlayout.ptPageEdge = -1;
+    pageManager->setDefaultPage(tqlayout);
     page2->setTopMargin(9);
     page2->setLeftMargin(10);
     page2->setBottomMargin(11);
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN
index a6a7eccb3..3402d9ee8 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 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
+- 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
   in this rect. (The position is relative to the parent.)
-//- knows its middle line. (for alignment)
-- knows it's zero point for midline (vertical alignment) and 
+//- knows its middle line. (for tqalignment)
+- knows it's zero point for midline (vertical tqalignment) and 
   keep open the possibility of negative positions (out of bounding rect)
-- draws itself (given a painter); children are drawn, too
+- draws itself (given a painter); tqchildren 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 children must be a SequenceElement. Except for SequenceElement's
-  children that might be of any type.
+- all tqchildren must be a SequenceElement. Except for SequenceElement's
+  tqchildren 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 children. The children are aligned horizontally at
+Manages a list of tqchildren. The tqchildren are aligned horizontally at
 one middle line. No gaps, no overlaps.
 
-Has no own look. It just draws all its children and is done. Except if
+Has no own look. It just draws all its tqchildren 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
-children. These are before, between and after the children.
+tqchildren. These are before, between and after the tqchildren.
 
 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 children. content and index. index is optional.
+contains two tqchildren. content and index. index is optional.
 
 
 IndexElement from BasicElement
 ------------
 
-contains five children. content and four indexes. all indexes are
+contains five tqchildren. 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 children at all.
+contains one char and no tqchildren 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 children: numerator, denominator
+2 tqchildren: 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 children. Above,
+draws all sorts of mathematical symbols with three tqchildren. 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 children.
+A matrix of tqchildren.
 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 children at all. Provides the facility to insert horizontal spaces
+No tqchildren 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 children. The element might not
-own the cursor except when it is owned by one of its children. The
+- 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
 only exception is SequenceElement which has valid cursor positions
-before, between and after its children, too.
+before, between and after its tqchildren, too.
 
 (Therefore the cursor is always owned by a SequenceElement.)
 
-- Each element's children are ordered. If the cursor leaves one child
+- Each element's tqchildren 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
-alignment. So if you type some formulas each on its own line the
+tqalignment. 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/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc
index ec89326c8..c8169f240 100644
--- a/lib/kformula/MatrixDialog.cc
+++ b/lib/kformula/MatrixDialog.cc
@@ -22,7 +22,7 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 
 KFORMULA_NAMESPACE_BEGIN
diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cc
index e1dce9371..d4ef8ec42 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" ).arg( m_selection ) );
+        element.setAttribute( "selection", TQString( "%1" ).tqarg( m_selection ) );
     }
 }
 
diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index 73d031e16..1fe46cc11 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 children)
+ * Each element knows its size (a rect that includes all tqchildren)
  * 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 children. If there are children
+ * To build a tree an element must own tqchildren. If there are tqchildren
  * 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 children you might want to @ref insert and @ref remove
+ * If there can be tqchildren 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 children. Each child needs
+     * Each element might contain tqchildren. Each child needs
      * its own unique number. It is not guaranteed, however,
      * that the number stays the same all the time.
-     * (The SequenceElement's children are simply counted.)
+     * (The SequenceElement's tqchildren 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 children.
+     * that a read-only parent has read-only tqchildren.
      */
     virtual bool readOnly( const BasicElement* child ) const;
 
@@ -158,7 +158,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren'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 children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* /*cmd*/ ) {}
 
@@ -243,7 +243,7 @@ public:
      */
     virtual void entered( SequenceElement* /*child*/ );
 
-    // children
+    // tqchildren
 
     /**
      * Removes the child. If this was the main child this element might
@@ -257,7 +257,7 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren 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 children.
+    // Insert and remove tqchildren.
 
     /**
-     * Inserts all new children at the cursor position. Places the
+     * Inserts all new tqchildren 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 children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren have been.
      */
     virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction) {}
 
@@ -290,7 +290,7 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * children (except its main child) and should therefore
+     * tqchildren (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 children. Needed for alignment.
+     * Callback for the tabs among our tqchildren. Needed for tqalignment.
      */
     virtual void registerTab( BasicElement* /*tab*/ ) {}
 
@@ -368,7 +368,7 @@ public:
 
     /**
      * @return a TQDomElement that contain as DomChildren the
-     * children, and as attribute the attribute of this
+     * tqchildren, 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 children and
+     * Set this element attribute, build tqchildren and
      * call their buildFromDom.
      */
     bool buildFromDom(TQDomElement element);
 
     /**
-     * Set this element attribute, build children and call 
+     * Set this element attribute, build tqchildren 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 children.
+     * This is a service for all subclasses that contain tqchildren.
      */
     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 children
+     * of the element's tqchildren
      */
     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 alignment is done using the middle line.
+     * -1 in this case. The tqalignment is done using the middle line.
      */
     luPixel m_baseline;
 
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index a3714e60b..df51ffa83 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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.at( 0 ).latin1() ).toInt() );
+            *type = static_cast<SymbolType>( TQString::number( s.tqat( 0 ).latin1() ).toInt() );
         }
     }
     else {
diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h
index baf0ff1ea..83879aaca 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -95,8 +95,8 @@ public:
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
     /**
-     * Removes all selected children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren have been.
      *
      * We remove ourselve if we are requested to remove our content.
      */
@@ -110,7 +110,7 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren one has to become the main one.
 
     virtual SequenceElement* getMainChild();
 
@@ -200,7 +200,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -208,7 +208,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
@@ -322,7 +322,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -330,7 +330,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
@@ -389,7 +389,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -397,7 +397,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/config/esstixeight.font b/lib/kformula/config/esstixeight.font
index 37cbdfdbe..88992333e 100644
--- a/lib/kformula/config/esstixeight.font
+++ b/lib/kformula/config/esstixeight.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixeight font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 33, 0xE201
 37, 0xE205
diff --git a/lib/kformula/config/esstixeleven.font b/lib/kformula/config/esstixeleven.font
index d94bd3752..41e9fbe12 100644
--- a/lib/kformula/config/esstixeleven.font
+++ b/lib/kformula/config/esstixeleven.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixeleven font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixfifteen.font b/lib/kformula/config/esstixfifteen.font
index 3df00e54c..920be0c14 100644
--- a/lib/kformula/config/esstixfifteen.font
+++ b/lib/kformula/config/esstixfifteen.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixfifteen font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixfive.font b/lib/kformula/config/esstixfive.font
index 9f57fec25..62724a84b 100644
--- a/lib/kformula/config/esstixfive.font
+++ b/lib/kformula/config/esstixfive.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixfive font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 52, 0x2295
 53, 0x2297
diff --git a/lib/kformula/config/esstixfour.font b/lib/kformula/config/esstixfour.font
index dc6844b91..411a138ae 100644
--- a/lib/kformula/config/esstixfour.font
+++ b/lib/kformula/config/esstixfour.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixfour font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 56, 0x2291
 77, 0x2290
diff --git a/lib/kformula/config/esstixfourteen.font b/lib/kformula/config/esstixfourteen.font
index 802c47ec1..723a40947 100644
--- a/lib/kformula/config/esstixfourteen.font
+++ b/lib/kformula/config/esstixfourteen.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixfourteen font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 99, 0x2138
 97, 0x2135
diff --git a/lib/kformula/config/esstixnine.font b/lib/kformula/config/esstixnine.font
index 4f4e6197b..e294bd6d0 100644
--- a/lib/kformula/config/esstixnine.font
+++ b/lib/kformula/config/esstixnine.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixnine font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixone.font b/lib/kformula/config/esstixone.font
index 9ff6cabf2..df3e95ec5 100644
--- a/lib/kformula/config/esstixone.font
+++ b/lib/kformula/config/esstixone.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixone font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 75, 0x219B
 70, 0x219A
diff --git a/lib/kformula/config/esstixseven.font b/lib/kformula/config/esstixseven.font
index 25a7d01cb..37650ee1c 100644
--- a/lib/kformula/config/esstixseven.font
+++ b/lib/kformula/config/esstixseven.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixseven font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 61, 0x0028
 62, 0x0029
diff --git a/lib/kformula/config/esstixseventeen.font b/lib/kformula/config/esstixseventeen.font
index c3b8f3113..00df77cde 100644
--- a/lib/kformula/config/esstixseventeen.font
+++ b/lib/kformula/config/esstixseventeen.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixseventeen font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixsix.font b/lib/kformula/config/esstixsix.font
index a6412a582..43e2752c1 100644
--- a/lib/kformula/config/esstixsix.font
+++ b/lib/kformula/config/esstixsix.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixsix font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 46, 0x220F
 35, 0x222E
diff --git a/lib/kformula/config/esstixsixteen.font b/lib/kformula/config/esstixsixteen.font
index c212e08d5..2a96c0c10 100644
--- a/lib/kformula/config/esstixsixteen.font
+++ b/lib/kformula/config/esstixsixteen.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixsixteen font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixten.font b/lib/kformula/config/esstixten.font
index dd4c2b0ff..fa9c5ee2d 100644
--- a/lib/kformula/config/esstixten.font
+++ b/lib/kformula/config/esstixten.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixten font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 118, 0x2202
 86, 0x2207
diff --git a/lib/kformula/config/esstixthirteen.font b/lib/kformula/config/esstixthirteen.font
index fc13f8911..cee5bf99a 100644
--- a/lib/kformula/config/esstixthirteen.font
+++ b/lib/kformula/config/esstixthirteen.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixthirteen font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixthree.font b/lib/kformula/config/esstixthree.font
index c55acaebf..fe359c1f1 100644
--- a/lib/kformula/config/esstixthree.font
+++ b/lib/kformula/config/esstixthree.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixthree font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 101, 0x2204
 95, 0x227B
diff --git a/lib/kformula/config/esstixtwelve.font b/lib/kformula/config/esstixtwelve.font
index b82e5d7f8..3a4b9d23d 100644
--- a/lib/kformula/config/esstixtwelve.font
+++ b/lib/kformula/config/esstixtwelve.font
@@ -3,5 +3,5 @@
 # Unicode mapping for the esstixtwelve font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
diff --git a/lib/kformula/config/esstixtwo.font b/lib/kformula/config/esstixtwo.font
index ed83909f7..201f95e1d 100644
--- a/lib/kformula/config/esstixtwo.font
+++ b/lib/kformula/config/esstixtwo.font
@@ -3,7 +3,7 @@
 # Unicode mapping for the esstixtwo font. You can find it at
 # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip
 #
-# Each line consist of a char position and its unicode value.
+# Each line consist of a char position and its tqunicode value.
 #
 100, 0x2203
 99, 0x2200
diff --git a/lib/kformula/config/unicode.tbl b/lib/kformula/config/unicode.tbl
index e3e27db8e..d86b1df3d 100644
--- a/lib/kformula/config/unicode.tbl
+++ b/lib/kformula/config/unicode.tbl
@@ -1,6 +1,6 @@
 #
-# KFormula unicode table
-# Each line contains the unicode value, the char class
+# KFormula tqunicode table
+# Each line contains the tqunicode value, the char class
 # (ORDINARY, BINOP or RELATION) and optionally the
 # chars TeX name.
 #
diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h
index 11a103dd4..be4a8bcf0 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 alignment to the right.
+     * false means tqalignment to the right.
      */
     bool centerSymbol;
 
diff --git a/lib/kformula/elementtype.cc b/lib/kformula/elementtype.cc
index bd2c33738..a2e44ee6f 100644
--- a/lib/kformula/elementtype.cc
+++ b/lib/kformula/elementtype.cc
@@ -406,9 +406,9 @@ void AbstractOperatorType::saveMathML( SequenceElement* se, TQDomDocument& doc,
         op.appendChild( doc.createTextNode( be->getCharacter() ) );
     }
     else {
-        // unicode char
+        // tqunicode char
         TQString s;
-        op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().unicode() ) ) );
+        op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().tqunicode() ) ) );
     }
     TextElement* te = static_cast<TextElement*>( be );
     TQString mathvariant = format2variant( te->getCharStyle(), te->getCharFamily() );
diff --git a/lib/kformula/entities.h b/lib/kformula/entities.h
index 38a5a0e82..78e39315c 100644
--- a/lib/kformula/entities.h
+++ b/lib/kformula/entities.h
@@ -38,7 +38,7 @@ struct entityMap {
 	    return strcmp( name, right ) < 0;
     }
 	const char* name;
-	const uint unicode;
+	const uint tqunicode;
 };
 	
 extern const entityMap entities[];
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc
index cb1f6c545..7a685f868 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 children.
+ * Draws the whole element including its tqchildren.
  * 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 d52f949af..cfc2735de 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 children.
+     * Draws the whole element including its tqchildren.
      * 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 0df68fcba..0e37028a8 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.families();
+        const TQStringList lst = db.tqfamilies();
         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/fontstyle.h b/lib/kformula/fontstyle.h
index 9fcd78b76..8132bbb67 100644
--- a/lib/kformula/fontstyle.h
+++ b/lib/kformula/fontstyle.h
@@ -48,7 +48,7 @@ public:
      */
     bool init( ContextStyle* context, bool install = true );
 
-    /// the table for ordinary symbols (those that have a unicode value)
+    /// the table for ordinary symbols (those that have a tqunicode value)
     const SymbolTable* symbolTable() const { return &m_symbolTable; }
     SymbolTable* symbolTable() { return &m_symbolTable; }
 
diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc
index 2257d262c..9fe3afbde 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>& children,
+void FormulaCursor::insert(TQPtrList<BasicElement>& tqchildren,
                            Direction direction)
 {
     assert( !isReadOnly() );
     BasicElement* element = getElement();
-    element->insert(this, children, direction);
+    element->insert(this, tqchildren, direction);
 }
 
 
 /**
- * Removes the current selected children and returns them.
+ * Removes the current selected tqchildren 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>& children,
+void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren,
                            Direction direction)
 {
     assert( !isReadOnly() );
@@ -328,12 +328,12 @@ void FormulaCursor::remove(TQPtrList<BasicElement>& children,
             BasicElement* parent = sequence->getParent();
             if (parent != 0) {
                 parent->selectChild(this, sequence);
-                parent->remove(this, children, direction);
+                parent->remove(this, tqchildren, direction);
                 return;
             }
         }
         else {
-            sequence->remove(this, children, direction);
+            sequence->remove(this, tqchildren, direction);
         }
     }
 }
@@ -383,18 +383,18 @@ void FormulaCursor::replaceSelectionWith(BasicElement* element,
 BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction)
 {
     assert( !isReadOnly() );
-    TQPtrList<BasicElement> childrenList;
+    TQPtrList<BasicElement> tqchildrenList;
     TQPtrList<BasicElement> list;
     BasicElement* element = getElement();
     SequenceElement* mainChild = element->getMainChild();
     if ((mainChild != 0) && (mainChild->countChildren() > 0)) {
         mainChild->selectAllChildren(this);
-        remove(childrenList);
+        remove(tqchildrenList);
     }
     element->getParent()->selectChild(this, element);
     setSelection(false);
     remove(list);
-    insert(childrenList, direction);
+    insert(tqchildrenList, 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 children.
+ * The element is going to leave the formula with and all its tqchildren.
  */
 void FormulaCursor::elementWillVanish(BasicElement* element)
 {
diff --git a/lib/kformula/formulacursor.h b/lib/kformula/formulacursor.h
index cca6cf1af..9843abfaa 100644
--- a/lib/kformula/formulacursor.h
+++ b/lib/kformula/formulacursor.h
@@ -152,7 +152,7 @@ public:
     void insert(BasicElement*, Direction = beforeCursor);
 
     /**
-     * Inserts the listed children at the current position.
+     * Inserts the listed tqchildren at the current position.
      * Ignores the selection.
      * The list will be emptied.
      */
@@ -160,7 +160,7 @@ public:
                 Direction = beforeCursor);
 
     /**
-     * Removes the current selected children and returns them.
+     * Removes the current selected tqchildren 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 children.
+     * The element is going to leave the formula with and all its tqchildren.
      */
     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->children->size().
+     * Might be anything from 0 to current->tqchildren->size().
      *
      * This is where new elements are put in.
      */
diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h
index a7e83e4c1..e67026680 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 children.
+ * A formula consists of a FormulaElement and its tqchildren.
  * The only element that has no parent.
  */
 class FormulaElement : public SequenceElement {
@@ -113,7 +113,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -121,7 +121,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index 77d930766..1230bb607 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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 children and returns them. Places the
- * cursor to where the children have been.
+ * Removes all selected tqchildren and returns them. Places the
+ * cursor to where the tqchildren 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
- * children (except its main child) and should therefore
+ * tqchildren (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 children one has to become the main one.
+// If an element has tqchildren 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" ).arg( m_lineThickness ) );
+        element.setAttribute( "linethickness", TQString( "%1pt" ).tqarg( m_lineThickness ) );
         break;
     case RelativeSize:
-        element.setAttribute( "linethickness", TQString( "%1%" ).arg( m_lineThickness * 100.0 ) );
+        element.setAttribute( "linethickness", TQString( "%1%" ).tqarg( m_lineThickness * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "linethickness", TQString( "%1px" ).arg( m_lineThickness ) );
+        element.setAttribute( "linethickness", TQString( "%1px" ).tqarg( m_lineThickness ) );
         break;
     default:
         break;
diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h
index 408c3f3e8..cef69c134 100644
--- a/lib/kformula/fractionelement.h
+++ b/lib/kformula/fractionelement.h
@@ -70,7 +70,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -78,7 +78,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -128,8 +128,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren have been.
      *
      * We remove ourselve if we are requested to remove our numerator.
      *
@@ -141,7 +141,7 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren one has to become the main one.
 
     virtual SequenceElement* getMainChild();
 
@@ -150,7 +150,7 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * children (except its main child) and should therefore
+     * tqchildren (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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc
index 709609cf1..9d0b26e61 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -152,7 +152,7 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 void GlyphElement::writeMathMLAttributes( TQDomElement& element ) const
 {
     element.setAttribute( "fontfamily", m_fontFamily );
-    element.setAttribute( "index", m_char.unicode() );
+    element.setAttribute( "index", m_char.tqunicode() );
     element.setAttribute( "alt", m_alt );
 }
 
diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index 68833dd0b..e3934fce5 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -31,7 +31,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -39,7 +39,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 a540a7e1c..25b8997ab 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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)
 }
 
 
-// children
+// tqchildren
 
 
 // main child
 //
-// If an element has children one has to become the main one.
+// If an element has tqchildren 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 children at the cursor position. Places the
+ * Inserts all new tqchildren 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 children and returns them. Places the
- * cursor to where the children have been.
+ * Removes all selected tqchildren and returns them. Places the
+ * cursor to where the tqchildren 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
- * children (except its main child) and should therefore
+ * tqchildren (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" ).arg( m_subScriptShift ) );
+            element.setAttribute( "subscriptshift", TQString( "%1pt" ).tqarg( m_subScriptShift ) );
             break;
         case RelativeSize:
-            element.setAttribute( "subscriptshift", TQString( "%1%" ).arg( m_subScriptShift * 100.0 ) );
+            element.setAttribute( "subscriptshift", TQString( "%1%" ).tqarg( m_subScriptShift * 100.0 ) );
             break;
         case PixelSize:
-            element.setAttribute( "subscriptshift", TQString( "%1px" ).arg( m_subScriptShift ) );
+            element.setAttribute( "subscriptshift", TQString( "%1px" ).tqarg( 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" ).arg( m_superScriptShift ) );
+            element.setAttribute( "superscriptshift", TQString( "%1pt" ).tqarg( m_superScriptShift ) );
             break;
         case RelativeSize:
-            element.setAttribute( "superscriptshift", TQString( "%1%" ).arg( m_superScriptShift * 100.0 ) );
+            element.setAttribute( "superscriptshift", TQString( "%1%" ).tqarg( m_superScriptShift * 100.0 ) );
             break;
         case PixelSize:
-            element.setAttribute( "superscriptshift", TQString( "%1px" ).arg( m_superScriptShift ) );
+            element.setAttribute( "superscriptshift", TQString( "%1px" ).tqarg( m_superScriptShift ) );
             break;
         default:
             break;
diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h
index b8e567b80..f3fc1acba 100644
--- a/lib/kformula/indexelement.h
+++ b/lib/kformula/indexelement.h
@@ -77,7 +77,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -85,7 +85,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -137,7 +137,7 @@ public:
      */
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
-    // children
+    // tqchildren
 
     /**
      * Removes the child. If this was the main child this element might
@@ -151,7 +151,7 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren one has to become the main one.
 
     virtual SequenceElement* getMainChild() { return content; }
     //SequenceElement* upperLeft;
@@ -163,7 +163,7 @@ public:
 
 
     /**
-     * Inserts all new children at the cursor position. Places the
+     * Inserts all new tqchildren 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 children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren 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
-     * children (except its main child) and should therefore
+     * tqchildren (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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 65bfa6c36..267038c45 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 = childrenList().count();
+    uint count = tqchildrenList().count();
     styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = childrenList().at( i );
+        TextElement* child = tqchildrenList().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 = childrenList().count();
+    uint count = tqchildrenList().count();
     //styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = childrenList().at( i );
+        TextElement* child = tqchildrenList().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 = childrenList().count();
+    uint count = tqchildrenList().count();
     familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = childrenList().at( i );
+        TextElement* child = tqchildrenList().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 = childrenList().count();
+    uint count = tqchildrenList().count();
     //familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
-        TextElement* child = childrenList().at( i );
+        TextElement* child = tqchildrenList().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 bc1703bef..090010409 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 children are to be changend.
+     * Collects all parent elements those tqchildren are to be changend.
      */
     void addElement( BasicElement* element ) { elementList.append( element ); }
 
 protected:
 
-    TQPtrList<TextElement>& childrenList() { return list; }
+    TQPtrList<TextElement>& tqchildrenList() { return list; }
 
     void collectChildren();
 
@@ -520,7 +520,7 @@ private:
 
 
 /**
- * Changes the char style of a number of elements an their children.
+ * Changes the char style of a number of elements an their tqchildren.
  */
 class CharStyleCommand : public FontCommand {
 public:
@@ -539,7 +539,7 @@ private:
 
 
 /**
- * Changes the char family of a number of elements an their children.
+ * Changes the char family of a number of elements an their tqchildren.
  */
 class CharFamilyCommand : public FontCommand {
 public:
diff --git a/lib/kformula/kformulacompatibility.h b/lib/kformula/kformulacompatibility.h
index a221854cd..9be5c7baa 100644
--- a/lib/kformula/kformulacompatibility.h
+++ b/lib/kformula/kformulacompatibility.h
@@ -51,8 +51,8 @@ private:
 
     TQDomElement findIndexNode(const TQDomDocument& doc, TQDomElement sequence);
 
-    ushort nextToken() { return formulaString[pos++].unicode(); }
-    ushort lookAhead(uint i) const { return formulaString[pos+i].unicode(); }
+    ushort nextToken() { return formulaString[pos++].tqunicode(); }
+    ushort lookAhead(uint i) const { return formulaString[pos+i].tqunicode(); }
     void pushback() { pos--; }
 
     bool hasNext() const { return pos < formulaString.length(); }
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc
index 593defa3c..21c3b9469 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cc
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
@@ -63,7 +63,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi
     TQGroupBox *gbox = new TQGroupBox( i18n( "Fonts" ), box );
     gbox->setColumnLayout( 0, Qt::Horizontal );
 
-    TQGridLayout* grid = new TQGridLayout( gbox->layout(), 5, 3 );
+    TQGridLayout* grid = new TQGridLayout( gbox->tqlayout(), 5, 3 );
     grid->setSpacing( KDialog::spacingHint() );
 
     grid->setColStretch(1, 1);
@@ -108,7 +108,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi
 //     hlBox = new TQGroupBox( i18n( "Highlight Colors" ), box );
 //     hlBox->setColumnLayout( 0, Qt::Horizontal );
 
-//     grid = new TQGridLayout( hlBox->layout(), 5, 2 );
+//     grid = new TQGridLayout( hlBox->tqlayout(), 5, 2 );
 //     grid->setSpacing( KDialog::spacingHint() );
 
 //     TQLabel* defaultLabel = new TQLabel( hlBox, "defaultLabel" );
@@ -168,7 +168,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi
 
 
 TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent,
-            TQGridLayout* layout, int number, TQFont font, TQString name,
+            TQGridLayout* tqlayout, int number, TQFont font, TQString name,
             TQLabel*& fontName )
 {
     TQLabel* fontTitle = new TQLabel( name, parent );
@@ -180,9 +180,9 @@ TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent,
 
     TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), parent );
 
-    layout->addWidget( fontTitle, number, 0 );
-    layout->addWidget( fontName, number, 1 );
-    layout->addWidget( chooseButton, number, 2 );
+    tqlayout->addWidget( fontTitle, number, 0 );
+    tqlayout->addWidget( fontName, number, 1 );
+    tqlayout->addWidget( chooseButton, number, 2 );
 
     return chooseButton;
 }
diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h
index 2649ffa39..e3ff716ae 100644
--- a/lib/kformula/kformulaconfigpage.h
+++ b/lib/kformula/kformulaconfigpage.h
@@ -76,7 +76,7 @@ protected slots:
 
 private:
 
-    TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* layout, int number,
+    TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* tqlayout, int number,
                                 TQFont font, TQString name, TQLabel*& fontName );
 
     void updateFontLabel( TQFont font, TQLabel* label );
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc
index 46f3415a6..774c7e79e 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cc
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -339,10 +339,10 @@ void Container::paste()
 {
     if (!hasValidCursor())
         return;
-    TQClipboard* clipboard = TQApplication::clipboard();
+    TQClipboard* clipboard = TQApplication::tqclipboard();
     const TQMimeSource* source = clipboard->data();
     if (source->provides( MimeSource::selectionMimeType() )) {
-        TQByteArray data = source->encodedData( MimeSource::selectionMimeType() );
+        TQByteArray data = source->tqencodedData( MimeSource::selectionMimeType() );
         TQDomDocument formula;
         formula.setContent(data);
         paste( formula, i18n("Paste") );
@@ -374,7 +374,7 @@ void Container::copy()
     if (cursor != 0) {
         TQDomDocument formula = document()->createMathMLDomDocument();
         cursor->copy( formula );
-        TQClipboard* clipboard = TQApplication::clipboard();
+        TQClipboard* clipboard = TQApplication::tqclipboard();
         clipboard->setData(new MimeSource(document(), formula));
     }
 }
diff --git a/lib/kformula/kformulacontainer.h b/lib/kformula/kformulacontainer.h
index 0b25ae005..d87e8184d 100644
--- a/lib/kformula/kformulacontainer.h
+++ b/lib/kformula/kformulacontainer.h
@@ -21,7 +21,7 @@
 #ifndef KFORMULACONTAINER_H
 #define KFORMULACONTAINER_H
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdom.h>
 #include <tqimage.h>
 #include <tqptrlist.h>
@@ -347,7 +347,7 @@ signals:
     void errorMsg( const TQString& );
 
     /**
-     * The element is going to leave the formula with and all its children.
+     * The element is going to leave the formula with and all its tqchildren.
      */
     void elementWillVanish(BasicElement* element);
 
diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index 855121c75..80879f98c 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -163,7 +163,7 @@ enum TokenElementType {
  * The struct used to store static font data.
  */
 struct InternFontTable {
-    short unicode;
+    short tqunicode;
     TQChar pos;
     CharClass cl;
     CharStyle style;
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc
index ecd621eee..17d163f08 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cc
@@ -200,7 +200,7 @@ TQDomDocument Document::createDomDocument()
 }
 
 /**
- * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout
+ * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout
  * TODO: Shouldn't this go to KoDocument ?
  */
 TQDomDocument Document::createMathMLDomDocument()
@@ -969,7 +969,7 @@ void DocumentWrapper::insertSymbol()
 {
     if ( hasFormula() &&
          m_document->m_contextStyle->symbolTable().contains( m_selectedName ) ) {
-        TQChar ch = m_document->m_contextStyle->symbolTable().unicode( m_selectedName );
+        TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( m_selectedName );
         if ( ch != TQChar::null ) {
             TextCharRequest r( ch, true );
             formula()->performRequest( &r );
@@ -985,7 +985,7 @@ void DocumentWrapper::insertSymbol( TQString name )
 {
     if ( hasFormula() ) {
         if ( m_document->m_contextStyle->symbolTable().contains( name ) ) {
-            TQChar ch = m_document->m_contextStyle->symbolTable().unicode( name );
+            TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( name );
             if ( ch != TQChar::null ) {
                 TextCharRequest r( ch, true );
                 formula()->performRequest( &r );
@@ -1075,7 +1075,7 @@ void DocumentWrapper::textItalic()
 void DocumentWrapper::delimiterLeft()
 {
     TQString left = m_leftBracket->currentText();
-    switch ( left.at(0).latin1() ) {
+    switch ( left.tqat(0).latin1() ) {
     case '[':
     case ']':
     case '{':
@@ -1086,7 +1086,7 @@ void DocumentWrapper::delimiterLeft()
     case ')':
     case '/':
     case '\\':
-        m_leftBracketChar = static_cast<SymbolType>( left.at(0).latin1() );
+        m_leftBracketChar = static_cast<SymbolType>( left.tqat(0).latin1() );
         break;
     case '|':
         m_leftBracketChar = LeftLineBracket;
@@ -1100,7 +1100,7 @@ void DocumentWrapper::delimiterLeft()
 void DocumentWrapper::delimiterRight()
 {
     TQString right = m_rightBracket->currentText();
-    switch ( right.at(0).latin1() ) {
+    switch ( right.tqat(0).latin1() ) {
     case '[':
     case ']':
     case '{':
@@ -1111,7 +1111,7 @@ void DocumentWrapper::delimiterRight()
     case ')':
     case '/':
     case '\\':
-        m_rightBracketChar = static_cast<SymbolType>( right.at(0).latin1() );
+        m_rightBracketChar = static_cast<SymbolType>( right.tqat(0).latin1() );
         break;
     case '|':
         m_rightBracketChar = RightLineBracket;
@@ -1174,7 +1174,7 @@ void DocumentWrapper::initSymbolNamesAction()
         for ( TQStringList::Iterator it = names.begin();
               it != names.end();
               ++it, ++i ) {
-            chars[ i ] = st.unicode( *it );
+            chars[ i ] = st.tqunicode( *it );
         }
         m_symbolNamesAction->setSymbols( names, m_document->m_contextStyle->getMathFont(), chars );
         m_selectedName = names[0];
diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h
index 4d7572620..46de57743 100644
--- a/lib/kformula/kformuladocument.h
+++ b/lib/kformula/kformuladocument.h
@@ -188,7 +188,7 @@ public:
     static TQDomDocument createDomDocument();
 
     /**
-     * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout
+     * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout
      * TODO: Shouldn't this go to KoDocument ?
      */
     TQDomDocument createMathMLDomDocument();
diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc
index 4c7df0c77..58a6ad351 100644
--- a/lib/kformula/kformulamimesource.cc
+++ b/lib/kformula/kformulamimesource.cc
@@ -99,7 +99,7 @@ bool MimeSource::provides( const char * format) const
         return false;
 }
 
-TQByteArray MimeSource::encodedData ( const char *format ) const
+TQByteArray MimeSource::tqencodedData ( const char *format ) const
 {
     TQString fmt=format;  //case sensitive?
 
diff --git a/lib/kformula/kformulamimesource.h b/lib/kformula/kformulamimesource.h
index 3a94eaef4..a58255eb8 100644
--- a/lib/kformula/kformulamimesource.h
+++ b/lib/kformula/kformulamimesource.h
@@ -39,7 +39,7 @@ public:
 
     virtual const char* format ( int n = 0 ) const;
     virtual bool provides ( const char * ) const;
-    virtual TQByteArray encodedData ( const char * ) const;
+    virtual TQByteArray tqencodedData ( const char * ) const;
 
     virtual const SymbolTable& getSymbolTable() const;
 
diff --git a/lib/kformula/kformulaview.h b/lib/kformula/kformulaview.h
index cb9c715b8..9562bbfe9 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 repaint if it was ours.
+     * We need to tqrepaint if it was ours.
      */
     void slotCursorMoved(FormulaCursor* cursor);
 
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc
index 1014a66ef..ef5e09a35 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cc
@@ -69,11 +69,11 @@ void KFormulaWidget::setReadOnly(bool ro)
 
 void KFormulaWidget::paintEvent(TQPaintEvent* event)
 {
-    // Always repaint the buffer. This is not so much more work
-    // than it seems to be as each cursor movement requires a repaint.
+    // Always tqrepaint the buffer. This is not so much more work
+    // than it seems to be as each cursor movement requires a tqrepaint.
     TQPainter p( &buffer );
     //p.translate( -fr.x(), -fr.y() );
-    formulaView.draw( p, event->rect(), colorGroup() );
+    formulaView.draw( p, event->rect(), tqcolorGroup() );
 
     TQPainter painter;
     painter.begin(this);
@@ -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);
-    // repaint is needed even if the size doesn't change.
+    // tqrepaint is needed even if the size doesn't change.
     //update();
 }
 
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index 4d80e1c82..573447398 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -5,12 +5,12 @@
 #include <tqaccel.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqmainwindow.h>
 #include <tqpainter.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqwidget.h>
 #include <tqfileinfo.h>
 
@@ -277,7 +277,7 @@ int main(int argc, char** argv)
 
     // Make sure there are no elements in the clipboard.
     // Okey for a debug app.
-    TQApplication::clipboard()->clear();
+    TQApplication::tqclipboard()->clear();
 
     int destruct = BasicElement::getEvilDestructionCount();
     if (destruct != 0) {
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index 7371113f0..6b5a5898a 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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" ).arg( m_rowNumber );
+        rownumber = TQString( " %1" ).tqarg( 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 " ).arg( *lengthIt ) );
+            columnwidth.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
             lengthIt++;
             break;
         case RelativeSize:
-            columnwidth.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
+            columnwidth.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
             lengthIt++;
             break;
         case PixelSize:
-            columnwidth.append( TQString( "%1px " ).arg( *lengthIt ) );
+            columnwidth.append( TQString( "%1px " ).tqarg( *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" ).arg( m_width ) );
+        element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) );
         break;
     case RelativeSize:
-        element.setAttribute( "width", TQString( "%1% " ).arg( m_width * 100.0 ) );
+        element.setAttribute( "width", TQString( "%1% " ).tqarg( m_width * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "width", TQString( "%1px " ).arg( m_width ) );
+        element.setAttribute( "width", TQString( "%1px " ).tqarg( 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 " ).arg( *lengthIt ) );
+            rowspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
             break;
         case RelativeSize:
-            rowspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
+            rowspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
             break;
         case PixelSize:
-            rowspacing.append( TQString( "%1px " ).arg( *lengthIt ) );
+            rowspacing.append( TQString( "%1px " ).tqarg( *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 " ).arg( *lengthIt ) );
+            columnspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) );
             lengthIt++;
             break;
         case RelativeSize:
-            columnspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) );
+            columnspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) );
             lengthIt++;
             break;
         case PixelSize:
-            columnspacing.append( TQString( "%1px " ).arg( *lengthIt ) );
+            columnspacing.append( TQString( "%1px " ).tqarg( *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 " ).arg( m_frameHSpacing ) );
+        framespacing.append( TQString( "%1pt " ).tqarg( m_frameHSpacing ) );
         break;
     case RelativeSize:
-        framespacing.append( TQString( "%1% " ).arg( m_frameHSpacing * 100.0 ) );
+        framespacing.append( TQString( "%1% " ).tqarg( m_frameHSpacing * 100.0 ) );
         break;
     case PixelSize:
-        framespacing.append( TQString( "%1px " ).arg( m_frameHSpacing ) );
+        framespacing.append( TQString( "%1px " ).tqarg( 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 " ).arg( m_frameVSpacing ) );
+        framespacing.append( TQString( "%1pt " ).tqarg( m_frameVSpacing ) );
         break;
     case RelativeSize:
-        framespacing.append( TQString( "%1% " ).arg( m_frameVSpacing * 100.0 ) );
+        framespacing.append( TQString( "%1% " ).tqarg( m_frameVSpacing * 100.0 ) );
         break;
     case PixelSize:
-        framespacing.append( TQString( "%1px " ).arg( m_frameVSpacing ) );
+        framespacing.append( TQString( "%1px " ).tqarg( 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" ).arg( m_minLabelSpacing ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1pt" ).tqarg( m_minLabelSpacing ) );
         break;
     case RelativeSize:
-        element.setAttribute( "minlabelspacing", TQString( "%1%" ).arg( m_minLabelSpacing * 100.0 ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1%" ).tqarg( m_minLabelSpacing * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "minlabelspacing", TQString( "%1px" ).arg( m_minLabelSpacing ) );
+        element.setAttribute( "minlabelspacing", TQString( "%1px" ).tqarg( m_minLabelSpacing ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         element.setAttribute( "minlabelspacing", "negativeveryverythinmathspace" );
@@ -1810,7 +1810,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren'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 children to be moved.
+    // If there are tqchildren 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 children to be moved.
+    // If there are tqchildren 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 children of the mrow, child of tmp.
+        // the illegal TabMarkers are tqchildren 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 7320bf2b1..894266593 100644
--- a/lib/kformula/matrixelement.h
+++ b/lib/kformula/matrixelement.h
@@ -80,7 +80,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -88,7 +88,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -153,14 +153,14 @@ public:
     virtual SequenceElement* getMainChild();
 
     /**
-     * Inserts all new children at the cursor position. Places the
+     * Inserts all new tqchildren at the cursor position. Places the
      * cursor according to the direction.
      */
     //virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren have been.
      */
     //virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
@@ -184,14 +184,14 @@ public:
 
     /**
      * Returns wether the element has no more useful
-     * children (except its main child) and should therefore
+     * tqchildren (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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
@@ -375,7 +375,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -383,7 +383,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -414,7 +414,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc
index 27dbbdd65..66c1fcdc6 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" ).arg( length ) );
+        element.setAttribute( attr, TQString( "%1pt" ).tqarg( length ) );
         break;
     case RelativeSize:
-        element.setAttribute( attr, TQString( "%1% " ).arg( length * 100.0 ) );
+        element.setAttribute( attr, TQString( "%1% " ).tqarg( length * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( attr, TQString( "%1px " ).arg( length ) );
+        element.setAttribute( attr, TQString( "%1px " ).tqarg( length ) );
         break;
     case NegativeVeryVeryThinMathSpace:
         element.setAttribute( attr, "negativeveryverythinmathspace" );
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc
index e4f28ce71..f153a339f 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 children's parentPosition.
+ * our tqchildren'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" ).arg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1 width" ).tqarg( s ) );
         break;
     case HeightRelativeSize:
-        element.setAttribute( str, prefix + TQString( "%1 height" ).arg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1 height" ).tqarg( s ) );
     case AbsoluteSize:
-        element.setAttribute( str, prefix + TQString( "%1pt" ).arg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1pt" ).tqarg( s ) );
         break;
     case RelativeSize:
-        element.setAttribute( str, prefix + TQString( "%1%" ).arg( s * 100.0 ) );
+        element.setAttribute( str, prefix + TQString( "%1%" ).tqarg( s * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( str, prefix + TQString( "%1px" ).arg( s ) );
+        element.setAttribute( str, prefix + TQString( "%1px" ).tqarg( s ) );
         break;
     default:
         break;
diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index f50489c86..5df95b74e 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -32,7 +32,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc
index 78b0a1cb1..e2a07fc6d 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 children.
+ * Draws the whole element including its tqchildren.
  * 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 6fe9a9535..373c35450 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 children.
+     * Draws the whole element including its tqchildren.
      * 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 f1391069c..a2a944875 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 children."""
+        """Draws the whole thing. Including its tqchildren."""
         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 children's position."""
+        Please note: It's up to a parent to store its tqchildren's position."""
         pass
 
     def mainChild(self):
@@ -116,22 +116,22 @@ class BasicElement:
 
 
 class SequenceElement (BasicElement):
-    """The element that contains a number of children.
-    The children are aligned in one line."""
+    """The element that contains a number of tqchildren.
+    The tqchildren are aligned in one line."""
     
     def __init__(self, parent):
         BasicElement.__init__(self, parent)
-        self.children = []
+        self.tqchildren = []
 
     def elementAtCursor(self, cursor):
         """Returns the element before the cursor."""
         if cursor.pos() > 0:
-            return self.children[cursor.pos()-1]
+            return self.tqchildren[cursor.pos()-1]
         
     def elementAt(self, point, startPoint):
         r = BasicElement.elementAt(self, point, startPoint)
         if r != None:
-            for child in self.children:
+            for child in self.tqchildren:
                 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.children))
+            cursor.set(self, len(self.tqchildren))
 
         # 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.children[cursor.pos()-1].moveLeft(cursor, self)
+                    self.tqchildren[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 children or
+        # The cursor came from one of our tqchildren or
         # something is wrong.
         else:
-            fromPos = self.children.index(fromElement)
+            fromPos = self.tqchildren.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.children):
+            if cursor.pos() < len(self.tqchildren):
                 if cursor.isSelection():
                     cursor.set (self, cursor.pos()+1)
                 else:
-                    self.children[cursor.pos()].moveRight(cursor, self)
+                    self.tqchildren[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 children or
+        # The cursor came from one of our tqchildren or
         # something is wrong.
         else:
-            fromPos = self.children.index(fromElement)
+            fromPos = self.tqchildren.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.children.index(element)+1)
+                cursor.setMarkPos(self.tqchildren.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.children.index(element))
-        cursor.set(self, len(self.children))
+                cursor.setMarkPos(self.tqchildren.index(element))
+        cursor.set(self, len(self.tqchildren))
 
         
     def draw(self, painter, styleContext, startPoint):
         x, y = startPoint.x(), startPoint.y()
-        if len(self.children) > 0:
-            for child in self.children:
+        if len(self.tqchildren) > 0:
+            for child in self.tqchildren:
                 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.children) > 0:
+        if len(self.tqchildren) > 0:
             x = self.x()
             y = self.y()
             width = toMidline = fromMidline = 0
-            for child in self.children:
+            for child in self.tqchildren:
                 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.children:
+            for child in self.tqchildren:
                 child.setY(self.midline - child.midline)
 
         else:
@@ -272,13 +272,13 @@ class SequenceElement (BasicElement):
             self.midline = 5
 
     def mainChild(self):
-        if len(self.children) > 0:
-            return self.children[0]
+        if len(self.tqchildren) > 0:
+            return self.tqchildren[0]
         return None
 
     def setMainChild(self, sequenceElement):
-        if len(self.children) > 0:
-            self.children[0] = sequenceElement
+        if len(self.tqchildren) > 0:
+            self.tqchildren[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.children.pop(f)
+                child = self.tqchildren.pop(f)
                 self.formula().elementRemoved(child)
                 seq.addChild(child)
-            self.children.insert(f, element)
+            self.tqchildren.insert(f, element)
             cursor.setMarkPos(-1)
             cursor.set(self, f+1)
         elif cursor.pos() > 0:
-            seq.addChild(self.children[cursor.pos()-1])
+            seq.addChild(self.tqchildren[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.children.index(element)
-        self.children.remove(element)
-        for child in seq.children:
-            self.children.insert(pos, child)
+        pos = self.tqchildren.index(element)
+        self.tqchildren.remove(element)
+        for child in seq.tqchildren:
+            self.tqchildren.insert(pos, child)
             child.parent = self
             pos += 1
         cursor.set(self, pos)
@@ -334,7 +334,7 @@ class SequenceElement (BasicElement):
 
 
     def addChild(self, element):
-        self.children.append(element)
+        self.tqchildren.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.children.insert(pos, element)
+        self.tqchildren.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.children[cursor.pos()-1] = element
+        self.tqchildren[cursor.pos()-1] = element
         element.parent = self
         self.formula().changed()
 
     def removeChild(self, cursor, element):
         self.formula().elementRemoved(element)
-        cursor.set(self, self.children.index(element))
-        self.children.remove(element)
-        if len(self.children) == 0:
+        cursor.set(self, self.tqchildren.index(element))
+        self.tqchildren.remove(element)
+        if len(self.tqchildren) == 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.children.pop(f)
+                child = self.tqchildren.pop(f)
                 self.formula().elementRemoved(child)
             cursor.setMarkPos(-1)
             cursor.set(self, f)
             self.formula().changed()
-        elif pos < len(self.children):
-            self.children.pop(pos)
+        elif pos < len(self.tqchildren):
+            self.tqchildren.pop(pos)
             self.formula().changed()
         else:
-            if len(self.children) == 0:
+            if len(self.tqchildren) == 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.children.pop(f)
+                child = self.tqchildren.pop(f)
                 self.formula().elementRemoved(child)
             cursor.setMarkPos(-1)
             cursor.set(self, f)
             self.formula().changed()
         elif pos >= 0:
-            self.children.pop(pos)
+            self.tqchildren.pop(pos)
             cursor.set(self, pos)
             self.formula().changed()
         else:
-            if len(self.children) == 0:
+            if len(self.tqchildren) == 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.children):
-            d = self.children[pos].x()
+        if pos < len(self.tqchildren):
+            d = self.tqchildren[pos].x()
         else:
-            if len(self.children) > 0:
+            if len(self.tqchildren) > 0:
                 d = self.width()
             else:
                 d = 2
@@ -420,12 +420,12 @@ class SequenceElement (BasicElement):
         return point
 
     def countChildren(self):
-        return len(self.children)
+        return len(self.tqchildren)
             
 
 class FormulaElement (SequenceElement):
     """The main element.
-    A formula consists of a FormulaElement and its children.
+    A formula consists of a FormulaElement and its tqchildren.
     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 children if the formula changed in any way."""
+        """Is called by its tqchildren if the formula changed in any way."""
         self.document.changed()
 
     def elementRemoved(self, element):
diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py
index a13738152..0f9f3a116 100644
--- a/lib/kformula/prototype/gensymbolfontmap.py
+++ b/lib/kformula/prototype/gensymbolfontmap.py
@@ -3,7 +3,7 @@
 import time
 from xml.sax import saxutils, handler, make_parser
 
-unicodetable = { "normal":{}, "bold":{}, "italic":{},
+tqunicodetable = { "normal":{}, "bold":{}, "italic":{},
                  "slant":{}, "boldItalic":{} }
 fonttable = {}
 
@@ -14,7 +14,7 @@ class ContentGenerator(handler.ContentHandler):
         self.font = None
         
     def startElement(self, name, attrs):
-        if name == 'unicodetable':
+        if name == 'tqunicodetable':
             self.font = None
             for (name, value) in attrs.items():
                 if name == "font" and value:
@@ -31,7 +31,7 @@ class ContentGenerator(handler.ContentHandler):
                 elif name == "style": style = value
 
             if number != '':
-                unicodetable[style][number] = (latexName, charClass)
+                tqunicodetable[style][number] = (latexName, charClass)
                 fonttable[self.font].append((key, number, style))
 
 def fontkey(font, style, number):
@@ -43,9 +43,9 @@ def fontkey(font, style, number):
 
 def writeFontTable(fontname, f):
     f.write('\n\nstatic InternFontTable ' + fontname + 'Map[] = {\n')
-    for style in unicodetable:
-        for key in unicodetable[style]:
-            latexName, charClass = unicodetable[style][key]
+    for style in tqunicodetable:
+        for key in tqunicodetable[style]:
+            latexName, charClass = tqunicodetable[style][key]
             pos = fontkey(fontname, style, key)
             if pos:
                 f.write('    { ' + key + ', ' + hex(pos) + ', ' + charClass + ', ' + style + 'Char },\n')
@@ -107,14 +107,14 @@ def main():
         writeFontTable(fn, f)
     f.close()
 
-    f = open('../unicodenames.cc', 'w')
+    f = open('../tqunicodenames.cc', 'w')
     write_header(f)
-    print >>f, 'struct UnicodeNameTable { short unicode; const char* name; };'
+    print >>f, 'struct UnicodeNameTable { short tqunicode; const char* name; };'
     print >>f, 'static UnicodeNameTable nameTable[] = {'
     nameDir = {}
     table = {}
-    for style in unicodetable:
-        table.update(unicodetable[style])
+    for style in tqunicodetable:
+        table.update(tqunicodetable[style])
 
     for key in table:
         latexName, charClass = table[key]
@@ -128,10 +128,10 @@ def main():
     
 
    
-def make_unicode_table():
+def make_tqunicode_table():
     header = []
     codes = {}
-    f = open('../config/unicode.tbl', 'r')
+    f = open('../config/tqunicode.tbl', 'r')
     for line in f.xreadlines():
         if line[0] == '#':
             header.append(line.strip())
@@ -142,14 +142,14 @@ def make_unicode_table():
             codes[line.split(',')[0].strip()] = line
     f.close()
     
-    for key in unicodetable:
-        latexName, charClass = unicodetable[key]
+    for key in tqunicodetable:
+        latexName, charClass = tqunicodetable[key]
         if len(latexName) > 0:
             codes[key] = key + ', ' + charClass + ', ' + latexName.replace('\\', '')
         else:
             codes[key] = key + ', ' + charClass
             
-    f = open('../config/unicode.tbl', 'w')
+    f = open('../config/tqunicode.tbl', 'w')
     for line in header:
         print >> f, line
     for key in codes:
@@ -174,8 +174,8 @@ def make_font_table(font):
 ##    for line in header:
 ##        print >> f, line
     #print >> f, "name = " + font
-    for key in unicodetable:
-        latexName, charClass = unicodetable[key]
+    for key in tqunicodetable:
+        latexName, charClass = tqunicodetable[key]
         pos = fontkey(font, key)
         if pos:
             print >> f, str(pos), key, charClass, latexName
@@ -186,30 +186,30 @@ def make_all_font_tables():
         make_font_table(font)
 
 
-def symbol_entry(pos, unicode, charClass, name):
+def symbol_entry(pos, tqunicode, charClass, name):
     return '    <entry key="%d" number="%s" name="%s" class="%s"/>' % \
-           (pos, unicode, name, charClass)
+           (pos, tqunicode, name, charClass)
 
 
 def compare_font(font):
     for line in file(font+".font"):
         list = line.split()
         pos = int(list[0])
-        unicode = list[1]
+        tqunicode = list[1]
         charClass = list[2]
         if len(list)>3:
             name = list[3]
         else:
             name = ""
 
-        if (pos, unicode) not in fonttable[font]:
-            print "not in font", font, (pos, unicode)
-            print symbol_entry(pos, unicode, charClass, name)
-        if unicode not in unicodetable:
-            print font, unicode, (name, charClass)
-            print symbol_entry(pos, unicode, charClass, name)
-        elif unicodetable[unicode] != (name, charClass):
-            print font, unicode, pos, unicodetable[unicode], "!=", (name, charClass)
+        if (pos, tqunicode) not in fonttable[font]:
+            print "not in font", font, (pos, tqunicode)
+            print symbol_entry(pos, tqunicode, charClass, name)
+        if tqunicode not in tqunicodetable:
+            print font, tqunicode, (name, charClass)
+            print symbol_entry(pos, tqunicode, charClass, name)
+        elif tqunicodetable[tqunicode] != (name, charClass):
+            print font, tqunicode, pos, tqunicodetable[tqunicode], "!=", (name, charClass)
 
 def compare():
     fontnames = [ "symbol",
@@ -241,10 +241,10 @@ if __name__ == '__main__':
     parser.parse("symbol.xml")
 
     #print fonttable
-    #print unicodetable
+    #print tqunicodetable
 
     #compare()
     
     main()
-    #make_unicode_table()
+    #make_tqunicode_table()
     #make_all_font_tables()
diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py
index 3559711d0..585574cf4 100755
--- a/lib/kformula/prototype/unicode.py
+++ b/lib/kformula/prototype/unicode.py
@@ -130,7 +130,7 @@ class Widget(QWidget):
         print >> f, '<?xml version="1.0" encoding="iso-8859-1"?>'
         print >> f, '<table>'
         for font in self.fonts:
-            print >> f, '  <unicodetable font="' + font + '">'
+            print >> f, '  <tqunicodetable font="' + font + '">'
             for (key, number, latexName, charClass) in self.fonts[font]:
                 if not charClass or charClass == '':
                     charClass = 'ORDINARY'
@@ -140,7 +140,7 @@ class Widget(QWidget):
                       '" class="' + str(charClass) + \
                       '"/>'
             
-            print >> f, '  </unicodetable>'
+            print >> f, '  </tqunicodetable>'
         print >> f, '</table>'
         f.close()
 
@@ -152,7 +152,7 @@ class ContentGenerator(handler.ContentHandler):
         self.currentFont = None
 
     def startElement(self, name, attrs):
-        if name == 'unicodetable':
+        if name == 'tqunicodetable':
             for (name, value) in attrs.items():
                 if name == "font":
                     self.currentFont = value
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index 82a5870ce..5adeb51cd 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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 children and returns them. Places the
- * cursor to where the children have been.
+ * Removes all selected tqchildren and returns them. Places the
+ * cursor to where the tqchildren 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 children one has to become the main one.
+// If an element has tqchildren one has to become the main one.
 
 SequenceElement* RootElement::getMainChild()
 {
diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h
index f4286ab42..1eacf4d4a 100644
--- a/lib/kformula/rootelement.h
+++ b/lib/kformula/rootelement.h
@@ -66,7 +66,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -74,7 +74,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -124,8 +124,8 @@ public:
     virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction);
 
     /**
-     * Removes all selected children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren have been.
      *
      * We remove ourselve if we are requested to remove our content.
      */
@@ -139,7 +139,7 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/scripts/bycodes.py b/lib/kformula/scripts/bycodes.py
index 16d719599..35b79a556 100755
--- a/lib/kformula/scripts/bycodes.py
+++ b/lib/kformula/scripts/bycodes.py
@@ -25,11 +25,11 @@ import qt
 def decode( fd, font, line ):
 	begin = string.find( line, '"' )
 	end = string.find( line, '"', begin + 1)
-	unicode = line[begin + 2:end] # Remove 'U' from string aswell
+	tqunicode = line[begin + 2:end] # Remove 'U' from string aswell
 	char_list = []
-	separation = string.find( unicode, '-' )
+	separation = string.find( tqunicode, '-' )
 	if separation != -1:
-		second = unicode
+		second = tqunicode
 		while separation != -1:
 			first = second[0:separation]
 			second = second[separation + 2:]
@@ -38,13 +38,13 @@ def decode( fd, font, line ):
 			if separation == -1:
 				char_list.append( string.atoi( second, 16 ) )
 	else:
-		char_list.append( string.atoi ( unicode, 16 ) )
+		char_list.append( string.atoi ( tqunicode, 16 ) )
 	fm = qt.QFontMetrics( qt.QFont( font ) )
 	in_font = True
 	for c in char_list:
 		if not fm.inFont( qt.QChar( c ) ):
 			in_font = False
-	fd.write( unicode + ' ' + str( in_font ) + '\n')
+	fd.write( tqunicode + ' ' + str( in_font ) + '\n')
 
 def parse( file, font ):
 	fd = open( file )
diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py
index afb9ece55..0829cf90d 100755
--- a/lib/kformula/scripts/bynames.py
+++ b/lib/kformula/scripts/bynames.py
@@ -66,7 +66,7 @@ struct entityMap {
 	    return qstrcmp( name, right ) < 0;
     }
 	const char* name;
-	const uint unicode;
+	const uint tqunicode;
 };
 	
 extern const entityMap entities[];
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index e3573174a..93293db79 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 );
-    children.setAutoDelete(true);
+    tqchildren.setAutoDelete(true);
 }
 
 
@@ -88,12 +88,12 @@ SequenceElement::~SequenceElement()
 SequenceElement::SequenceElement( const SequenceElement& other )
     : BasicElement( other )
 {
-    children.setAutoDelete(true);
-    uint count = other.children.count();
+    tqchildren.setAutoDelete(true);
+    uint count = other.tqchildren.count();
     for (uint i = 0; i < count; i++) {
-        BasicElement* child = children.at(i)->clone();
+        BasicElement* child = tqchildren.at(i)->clone();
         child->setParent( this );
-        children.append( child );
+        tqchildren.append( child );
     }
 }
 
@@ -121,18 +121,18 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
         LuPixelPoint myPos(parentOrigin.x() + getX(),
                            parentOrigin.y() + getY());
 
-        uint count = children.count();
+        uint count = tqchildren.count();
         for (uint i = 0; i < count; i++) {
-            BasicElement* child = children.at(i);
+            BasicElement* child = tqchildren.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, children.find(e));
+                        cursor->setTo(this, tqchildren.find(e));
                     }
                     else {
-                        cursor->setTo(this, children.find(e)+1);
+                        cursor->setTo(this, tqchildren.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 = children.at(i);
+            BasicElement* child = tqchildren.at(i);
             if (dx < child->getX()) {
                 cursor->setTo( this, i );
                 handled = true;
-                return children.at( i );
+                return tqchildren.at( i );
             }
         }
 
@@ -161,9 +161,9 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 bool SequenceElement::isEmpty()
 {
-    uint count = children.count();
+    uint count = tqchildren.count();
     for (uint i = 0; i < count; i++) {
-        BasicElement* child = children.at(i);
+        BasicElement* child = tqchildren.at(i);
         if (!child->isInvisible()) {
             return false;
         }
@@ -174,7 +174,7 @@ bool SequenceElement::isEmpty()
 
 /**
  * Calculates our width and height and
- * our children's parentPosition.
+ * our tqchildren'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( children );
+        TQPtrListIterator<BasicElement> it( tqchildren );
         for ( ; it.current(); ++it ) {
             BasicElement* child = it.current();
 
@@ -237,7 +237,7 @@ void SequenceElement::calcSizes( const ContextStyle& context,
 
 void SequenceElement::setChildrenPositions()
 {
-    TQPtrListIterator<BasicElement> it( children );
+    TQPtrListIterator<BasicElement> it( tqchildren );
     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 children.
+ * Draws the whole element including its tqchildren.
  * 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( children );
+        TQPtrListIterator<BasicElement> it( tqchildren );
         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( children );
+    TQPtrListIterator<BasicElement> it( tqchildren );
     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 < children.count()) {
-        return children.at(child)->getX();
+    if (child < tqchildren.count()) {
+        return tqchildren.at(child)->getX();
     }
     else {
-        if (children.count() > 0) {
-            return children.at(child-1)->getX() + children.at(child-1)->getWidth();
+        if (tqchildren.count() > 0) {
+            return tqchildren.at(child-1)->getX() + tqchildren.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, children.count());
+        cursor->setTo(this, tqchildren.count());
         if ( cursor->isSelectionMode() ) {
-            cursor->setMark( children.count() );
+            cursor->setMark( tqchildren.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 (children.at(cursor->getPos())->isInvisible()) {
+            if (tqchildren.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 children or
+    // The cursor came from one of our tqchildren or
     // something is wrong.
     else {
-        int fromPos = children.find(from);
+        int fromPos = tqchildren.find(from);
         if ( fromPos > 0 ) {
-            children.at( fromPos - 1)->moveLeft( cursor, this );
+            tqchildren.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 < children.count()) {
+        if (pos < tqchildren.count()) {
             cursor->setTo(this, pos+1);
             
             // invisible elements are not visible so we move on.
-            if (children.at(pos)->isInvisible()) {
+            if (tqchildren.at(pos)->isInvisible()) {
                 moveRight(cursor, this);
             }
         }
@@ -530,12 +530,12 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from)
         }
     }
 
-    // The cursor came from one of our children or
+    // The cursor came from one of our tqchildren or
     // something is wrong.
     else {
-        int fromPos = children.find(from);
-        if ( fromPos < children.count() - 1 ) {
-            children.at( fromPos + 1 )->moveDown( cursor, this );
+        int fromPos = tqchildren.find(from);
+        if ( fromPos < tqchildren.count() - 1 ) {
+            tqchildren.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 = children.at(pos-1)->getElementType();
+        ElementType* type = tqchildren.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 < children.count()) {
-        ElementType* type = children.at(pos)->getElementType();
+    if (pos < tqchildren.count()) {
+        ElementType* type = tqchildren.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 < (children.count() - 1) / 2 ) {
+            if ( pos < (tqchildren.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 < children.count()) {
-                children.at(pos)->moveDown(cursor, this);
+        if (pos < tqchildren.count()) {
+                tqchildren.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, children.count() );
+            cursor->setTo( this, tqchildren.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(children.find(element)+1);
+            cursor->setMark(tqchildren.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(children.count());
+                    cursor->setMark(tqchildren.count());
                     break;
                 }
             }
             if (element != 0) {
-                cursor->setMark(children.find(element));
+                cursor->setMark(tqchildren.find(element));
             }
         }
     }
-    cursor->setTo(this, children.count());
+    cursor->setTo(this, tqchildren.count());
 }
 
 /**
@@ -705,11 +705,11 @@ void SequenceElement::goInside(FormulaCursor* cursor)
 void SequenceElement::goInsideLast(FormulaCursor* cursor)
 {
     cursor->setSelection(false);
-    cursor->setTo(this, children.count());
+    cursor->setTo(this, tqchildren.count());
 }
 
 
-// children
+// tqchildren
 
     /**
      * Insert a new child in the sequence
@@ -723,7 +723,7 @@ void SequenceElement::goInsideLast(FormulaCursor* cursor)
 
 bool SequenceElement::insert( uint index, BasicElement *child )
 {
-    return children.insert( index, child );
+    return tqchildren.insert( index, child );
 }
 
 /**
@@ -735,12 +735,12 @@ bool SequenceElement::insert( uint index, BasicElement *child )
  */
 // void SequenceElement::removeChild(FormulaCursor* cursor, BasicElement* child)
 // {
-//     int pos = children.find(child);
+//     int pos = tqchildren.find(child);
 //     formula()->elementRemoval(child, pos);
 //     cursor->setTo(this, pos);
-//     children.remove(pos);
+//     tqchildren.remove(pos);
 //     /*
-//         if len(self.children) == 0:
+//         if len(self.tqchildren) == 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 children at the cursor position. Places the
+ * Inserts all new tqchildren 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);
-        children.insert(pos+i, child);
+        tqchildren.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 children and returns them. Places the
- * cursor to where the children have been.
+ * Removes all selected tqchildren and returns them. Places the
+ * cursor to where the tqchildren 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 = children.at(pos);
+                    BasicElement* child = tqchildren.at(pos);
                     formula()->elementRemoval(child);
-                    children.take(pos);
+                    tqchildren.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 < children.count()) {
-                while (pos < children.count()) {
-                    BasicElement* child = children.at(pos);
+            if (pos < tqchildren.count()) {
+                while (pos < tqchildren.count()) {
+                    BasicElement* child = tqchildren.at(pos);
                     formula()->elementRemoval(child);
-                    children.take(pos);
+                    tqchildren.take(pos);
                     removedChildren.append(child);
                     if (!child->isInvisible()) {
                         break;
@@ -841,13 +841,13 @@ void SequenceElement::remove(FormulaCursor* cursor,
 
 
 /**
- * Removes the children at pos and appends it to the list.
+ * Removes the tqchildren at pos and appends it to the list.
  */
 void SequenceElement::removeChild(TQPtrList<BasicElement>& removedChildren, int pos)
 {
-    BasicElement* child = children.at(pos);
+    BasicElement* child = tqchildren.at(pos);
     formula()->elementRemoval(child);
-    children.take(pos);
+    tqchildren.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 children.at( cursor->getPos() - 1 );
+            return tqchildren.at( cursor->getPos() - 1 );
         }
     }
     else {
-        if ( cursor->getPos() < tqRound( children.count() ) ) {
-            return children.at( cursor->getPos() );
+        if ( cursor->getPos() < tqRound( tqchildren.count() ) ) {
+            return tqchildren.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 = children.find(child);
+    int pos = tqchildren.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 = children.find(child);
+    int childPos = tqchildren.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 children. The cursor is put behind, the mark before them.
+ * Selects all tqchildren. The cursor is put behind, the mark before them.
  */
 void SequenceElement::selectAllChildren(FormulaCursor* cursor)
 {
-    cursor->setTo(this, children.count(), 0);
+    cursor->setTo(this, tqchildren.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*>( children.at( cursor->getPos()-1 ) );
+                dynamic_cast<IndexElement*>( tqchildren.at( cursor->getPos()-1 ) );
             if ( element != 0 ) {
                 element->goInside( cursor );
                 return element->buildCommand( container, request );
@@ -1184,7 +1184,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request
             const SymbolTable& table = container->document()->getSymbolTable();
             if (table.greekLetters().find(element->getCharacter()) != -1) {
                 KFCReplace* command = new KFCReplace( i18n( "Change Char to Symbol" ), container );
-                TextElement* symbol = creationStrategy->createTextElement( table.unicodeFromSymbolFont( element->getCharacter() ), true );
+                TextElement* symbol = creationStrategy->createTextElement( table.tqunicodeFromSymbolFont( element->getCharacter() ), true );
                 command->addElement( symbol );
                 return command;
             }
@@ -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( children.at( i ) );
+                cmd->addElement( tqchildren.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( children.at( i ) );
+                cmd->addElement( tqchildren.at( i ) );
             }
             return cmd;
         }
@@ -1311,8 +1311,8 @@ KCommand* SequenceElement::input( Container* container, TQKeyEvent* event )
 
 KCommand* SequenceElement::input( Container* container, TQChar ch )
 {
-    int unicode = ch.unicode();
-    switch (unicode) {
+    int tqunicode = ch.tqunicode();
+    switch (tqunicode) {
     case '(': {
         BracketRequest r( container->document()->leftBracketChar(),
                           container->document()->rightBracketChar() );
@@ -1397,25 +1397,25 @@ KCommand* SequenceElement::input( Container* container, TQChar ch )
 }
 
 /**
- * Stores the given childrens dom in the element.
+ * Stores the given tqchildrens dom in the element.
  */
 void SequenceElement::getChildrenDom( TQDomDocument& doc, TQDomElement elem,
                                      uint from, uint to)
 {
     for (uint i = from; i < to; i++) {
-        TQDomElement tmpEleDom=children.at(i)->getElementDom(doc);
+        TQDomElement tmpEleDom=tqchildren.at(i)->getElementDom(doc);
         elem.appendChild(tmpEleDom);
     }
 }
 
 /**
- * Stores the given childrens MathML dom in the element.
+ * Stores the given tqchildrens MathML dom in the element.
  */
 void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& parent,
                                             uint from, uint to)
 {
     for ( uint i = from; i < to; i++ ) {
-        children.at( i )->writeMathML( doc, parent, false );
+        tqchildren.at( i )->writeMathML( doc, parent, false );
     }
 }
 
@@ -1467,7 +1467,7 @@ void SequenceElement::writeDom(TQDomElement element)
 {
     BasicElement::writeDom(element);
 
-    uint count = children.count();
+    uint count = tqchildren.count();
     TQDomDocument doc = element.ownerDocument();
     getChildrenDom(doc, element, 0, count);
 }
@@ -1495,7 +1495,7 @@ bool SequenceElement::readContentFromDom(TQDomNode& node)
         return false;
     }
 
-    return buildChildrenFromDom(children, node);
+    return buildChildrenFromDom(tqchildren, node);
 }
 
 
@@ -1504,9 +1504,9 @@ void SequenceElement::parse()
     delete parseTree;
 
     textSequence = true;
-    for (BasicElement* element = children.first();
+    for (BasicElement* element = tqchildren.first();
          element != 0;
-         element = children.next()) {
+         element = tqchildren.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(children);
+    parseTree = parser.parse(tqchildren);
 
     // 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 = children.count();
+    uint count = tqchildren.count();
     for ( uint i = 0; i < count; i++ ) {
-        BasicElement* child = children.at( i );
+        BasicElement* child = tqchildren.at( i );
 //         if ( isFirstOfToken( child ) ) {
 //             content += "";
 //         }
@@ -1559,9 +1559,9 @@ TQString SequenceElement::toLatex()
 TQString SequenceElement::formulaString()
 {
     TQString content;
-    uint count = children.count();
+    uint count = tqchildren.count();
     for ( uint i = 0; i < count; i++ ) {
-        BasicElement* child = children.at( i );
+        BasicElement* child = tqchildren.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( children ); it.current(); ++it ) {
+    for ( TQPtrListIterator<BasicElement> it( tqchildren ); 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( children );
+    TQPtrListIterator<BasicElement> it( tqchildren );
     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( children );
+    TQPtrListIterator<BasicElement> it( tqchildren );
     uint count = it.count();
     for ( uint i=0; i<count; ++i, ++it ) {
         if ( it.current() == child ) {
@@ -1700,8 +1700,8 @@ KCommand* NameSequence::buildCommand( Container* container, Request* request )
 
 KCommand* NameSequence::input( Container* container, TQChar ch )
 {
-    int unicode = ch.unicode();
-    switch (unicode) {
+    int tqunicode = ch.tqunicode();
+    switch (tqunicode) {
     case '(':
     case '[':
     case '|':
@@ -1746,12 +1746,12 @@ void NameSequence::setElementType( ElementType* t )
 BasicElement* NameSequence::replaceElement( const SymbolTable& table )
 {
     TQString name = buildName();
-    TQChar ch = table.unicode( name );
+    TQChar ch = table.tqunicode( name );
     if ( !ch.isNull() ) {
         return new TextElement( ch, true );
     }
     else {
-        ch = table.unicode( i18n( name.latin1() ) );
+        ch = table.tqunicode( i18n( name.latin1() ) );
         if ( !ch.isNull() ) {
             return new TextElement( ch, true );
         }
@@ -1782,7 +1782,7 @@ BasicElement* NameSequence::createElement( TQString type )
 
 // void NameSequence::parse()
 // {
-//     // A name sequence is known as name and so are its children.
+//     // A name sequence is known as name and so are its tqchildren.
 //     // 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(children, node);
+    return buildChildrenFromMathMLDom(tqchildren, node);
 }
 
 int SequenceElement::buildMathMLChild( TQDomNode node )
@@ -1915,7 +1915,7 @@ int SequenceElement::buildMathMLChild( TQDomNode node )
             child->setStyle(style);
         }
         if (child->buildFromMathMLDom(e) != -1) {
-            children.append(child);
+            tqchildren.append(child);
         }
         else {
             delete child;
diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h
index f9fb2ce66..4d32153c5 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 children.
- * The children are aligned in one line.
+ * The element that contains a number of tqchildren.
+ * The tqchildren 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 children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -100,7 +100,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -202,10 +202,10 @@ public:
     virtual void goInsideLast(FormulaCursor* cursor);
 
 
-    // children
+    // tqchildren
 
     /**
-     * Inserts all new children at the cursor position. Places the
+     * Inserts all new tqchildren 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 children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren 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 children we have.
+     * @returns the number of tqchildren we have.
      */
-    uint countChildren() const { return children.count(); }
+    uint countChildren() const { return tqchildren.count(); }
 
     /**
      * @returns whether the child has the given number.
      */
     bool isChildNumber( uint pos, BasicElement* child )
-        { return children.at( pos ) == child; }
+        { return tqchildren.at( pos ) == child; }
 
     /**
-     * Selects all children. The cursor is put behind, the mark before them.
+     * Selects all tqchildren. The cursor is put behind, the mark before them.
      */
     void selectAllChildren(FormulaCursor* cursor);
 
@@ -288,12 +288,12 @@ public:
     virtual void parse();
 
     /**
-     * Stores the given childrens dom in the element.
+     * Stores the given tqchildrens dom in the element.
      */
     void getChildrenDom( TQDomDocument& doc, TQDomElement elem, uint from, uint to);
 
     /**
-     * Stores the given childrens MathML dom in the element.
+     * Stores the given tqchildrens 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
@@ -315,10 +315,10 @@ public:
     /**
      * @returns the child at position i.
      */
-    BasicElement* getChild(uint i) { return children.at(i); }
+    BasicElement* getChild(uint i) { return tqchildren.at(i); }
     const BasicElement* getChild(uint i) const;
 
-    int childPos( BasicElement* child ) { return children.find( child ); }
+    int childPos( BasicElement* child ) { return tqchildren.find( child ); }
     int childPos( const BasicElement* child ) const;
 
     class ChildIterator {
@@ -407,7 +407,7 @@ protected:
     virtual bool readContentFromDom(TQDomNode& node);
 
     /**
-     * Sets the childrens' positions after their size has been
+     * Sets the tqchildrens' positions after their size has been
      * calculated.
      *
      * @see #calcSizes
@@ -458,16 +458,16 @@ protected:
 private:
 
     /**
-     * Removes the children at pos and appends it to the list.
+     * Removes the tqchildren at pos and appends it to the list.
      */
     void removeChild(TQPtrList<BasicElement>& removedChildren, int pos);
 
 
     /**
-     * Our children. Be sure to notify the rootElement before
+     * Our tqchildren. Be sure to notify the rootElement before
      * you remove any.
      */
-    TQPtrList<BasicElement> children;
+    TQPtrList<BasicElement> tqchildren;
 
     /**
      * 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 children reuse our own
+     * This can never happen here. Our tqchildren reuse our own
      * element type.
      */
     virtual bool isFirstOfToken( BasicElement* ) { return false; }
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc
index 1fb4f5530..a7e23464c 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" ).arg( m_width ) );
+        element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) );
         break;
     case RelativeSize:
-        element.setAttribute( "width", TQString( "%1%" ).arg( m_width * 100.0 ) );
+        element.setAttribute( "width", TQString( "%1%" ).tqarg( m_width * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "width", TQString( "%1px" ).arg( m_width ) );
+        element.setAttribute( "width", TQString( "%1px" ).tqarg( 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" ).arg( m_height ) );
+        element.setAttribute( "height", TQString( "%1pt" ).tqarg( m_height ) );
         break;
     case RelativeSize:
-        element.setAttribute( "height", TQString( "%1%" ).arg( m_height * 100.0 ) );
+        element.setAttribute( "height", TQString( "%1%" ).tqarg( m_height * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "height", TQString( "%1px" ).arg( m_height ) );
+        element.setAttribute( "height", TQString( "%1px" ).tqarg( m_height ) );
         break;
     default:
         break;
     }
     switch ( m_depthType ) {
     case AbsoluteSize:
-        element.setAttribute( "depth", TQString( "%1pt" ).arg( m_depth ) );
+        element.setAttribute( "depth", TQString( "%1pt" ).tqarg( m_depth ) );
         break;
     case RelativeSize:
-        element.setAttribute( "depth", TQString( "%1%" ).arg( m_depth * 100.0 ) );
+        element.setAttribute( "depth", TQString( "%1%" ).tqarg( m_depth * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "depth", TQString( "%1px" ).arg( m_depth ) );
+        element.setAttribute( "depth", TQString( "%1px" ).tqarg( m_depth ) );
         break;
     default:
         break;
diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h
index 46397509e..a8c5ec9a2 100644
--- a/lib/kformula/spaceelement.h
+++ b/lib/kformula/spaceelement.h
@@ -78,7 +78,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -86,7 +86,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc
index de7604532..3bb6b6b14 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" ).arg( m_scriptLevel ) );
+        element.setAttribute( "scriptlevel", prefix + TQString( "%1" ).tqarg( m_scriptLevel ) );
     }
     if ( m_customDisplayStyle ) {
         element.setAttribute( "displaystyle", m_displayStyle ? "true" : "false" );
     }
     if ( m_customScriptSizeMultiplier ) {
-        element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).arg( m_scriptSizeMultiplier ) );
+        element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).tqarg( 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" ).arg( s ) );
+        element.setAttribute( str, TQString( "%1pt" ).tqarg( s ) );
         break;
     case RelativeSize:
-        element.setAttribute( str, TQString( "%1%" ).arg( s * 100.0 ) );
+        element.setAttribute( str, TQString( "%1%" ).tqarg( s * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( str, TQString( "%1px" ).arg( s ) );
+        element.setAttribute( str, TQString( "%1px" ).tqarg( s ) );
         break;
     default:
         break;
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index e26f3fef6..d5aa31766 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" ).arg( TQChar( m_symbol ) ) );
+                 TQString( "%1" ).tqarg( TQChar( m_symbol ) ) );
 
     p->setFont( KGlobalSettings::generalFont() );
     fm = p->fontMetrics();
@@ -128,7 +128,7 @@ int SymbolAction::plug( TQWidget* w, int index )
                  TQT_SLOT( slotActivated( const TQString & ) ) );
         cb->setEnabled( isEnabled() );
         bar->insertWidget( id_, comboWidth(), cb, index );
-        cb->setMinimumWidth( cb->sizeHint().width() );
+        cb->setMinimumWidth( cb->tqsizeHint().width() );
 
         addContainer( bar, id_ );
 
@@ -166,7 +166,7 @@ void SymbolAction::updateItems( int id )
             for( uint i = 0; i < items().count(); ++i ) {
                 new SymbolComboItem( *items().at( i ), m_font, m_chars.at( i ), cb );
             }
-            cb->setMinimumWidth( cb->sizeHint().width() );
+            cb->setMinimumWidth( cb->tqsizeHint().width() );
         }
     }
 }
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc
index 31787b160..a601cea49 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 children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * 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)
     }
 }
 
-// children
+// tqchildren
 
 // main child
 //
-// If an element has children one has to become the main one.
+// If an element has tqchildren 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 children at the cursor position. Places the
+ * Inserts all new tqchildren 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 children and returns them. Places the
- * cursor to where the children have been.
+ * Removes all selected tqchildren and returns them. Places the
+ * cursor to where the tqchildren 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 ab9b5d89e..0133258ea 100644
--- a/lib/kformula/symbolelement.h
+++ b/lib/kformula/symbolelement.h
@@ -65,7 +65,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -73,7 +73,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -125,7 +125,7 @@ public:
      */
     virtual void moveDown(FormulaCursor* cursor, BasicElement* from);
 
-    // children
+    // tqchildren
 
     /**
      * Removes the child. If this was the main child this element might
@@ -139,14 +139,14 @@ public:
 
     // main child
     //
-    // If an element has children one has to become the main one.
+    // If an element has tqchildren one has to become the main one.
 
     virtual SequenceElement* getMainChild() { return content; }
     //virtual void setMainChild(SequenceElement*);
 
 
     /**
-     * Inserts all new children at the cursor position. Places the
+     * Inserts all new tqchildren 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 children and returns them. Places the
-     * cursor to where the children have been.
+     * Removes all selected tqchildren and returns them. Places the
+     * cursor to where the tqchildren 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc
index 369cf6c37..42c4a8e6e 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cc
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfontmetrics.h>
 
 #include <kconfig.h>
@@ -44,12 +44,12 @@ KFORMULA_NAMESPACE_BEGIN
 SymbolFontHelper::SymbolFontHelper()
     : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW")
 {
-    for ( uint i = 0; symbolMap[ i ].unicode != 0; i++ ) {
-        compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].unicode;
+    for ( uint i = 0; symbolMap[ i ].tqunicode != 0; i++ ) {
+        compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].tqunicode;
     }
 }
 
-TQChar SymbolFontHelper::unicodeFromSymbolFont( TQChar pos ) const
+TQChar SymbolFontHelper::tqunicodeFromSymbolFont( TQChar pos ) const
 {
     if ( compatibility.contains( pos ) ) {
         return compatibility[ pos.latin1() ];
@@ -66,17 +66,17 @@ SymbolTable::SymbolTable()
 void SymbolTable::init( const TQFont& font )
 {
     backupFont = font;
-    for ( int i=0; operatorTable[i].unicode != 0; ++i ) {
-        names[TQChar( operatorTable[i].unicode )] = get_name( operatorTable[i] );
-        entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].unicode );
+    for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) {
+        names[TQChar( operatorTable[i].tqunicode )] = get_name( operatorTable[i] );
+        entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].tqunicode );
     }
-    for ( int i=0; arrowTable[i].unicode != 0; ++i ) {
-        names[TQChar( arrowTable[i].unicode )] = get_name( arrowTable[i] );
-        entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].unicode );
+    for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) {
+        names[TQChar( arrowTable[i].tqunicode )] = get_name( arrowTable[i] );
+        entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].tqunicode );
     }
-    for ( int i=0; greekTable[i].unicode != 0; ++i ) {
-        names[TQChar( greekTable[i].unicode )] = get_name( greekTable[i] );
-        entries[get_name( greekTable[i] )] = TQChar( greekTable[i].unicode );
+    for ( int i=0; greekTable[i].tqunicode != 0; ++i ) {
+        names[TQChar( greekTable[i].tqunicode )] = get_name( greekTable[i] );
+        entries[get_name( greekTable[i] )] = TQChar( greekTable[i].tqunicode );
     }
 }
 
@@ -85,7 +85,7 @@ bool SymbolTable::contains(TQString name) const
     return entries.find( name ) != entries.end();
 }
 
-TQChar SymbolTable::unicode(TQString name) const
+TQChar SymbolTable::tqunicode(TQString name) const
 {
     return entries[ name ];
 }
@@ -112,9 +112,9 @@ CharClass SymbolTable::charClass( TQChar symbol ) const
 }
 
 
-TQChar SymbolTable::unicodeFromSymbolFont( TQChar pos ) const
+TQChar SymbolTable::tqunicodeFromSymbolFont( TQChar pos ) const
 {
-    return symbolFontHelper.unicodeFromSymbolFont( pos );
+    return symbolFontHelper.tqunicodeFromSymbolFont( pos );
 }
 
 
@@ -128,13 +128,13 @@ TQStringList SymbolTable::allNames() const
 {
     TQStringList list;
 
-    for ( int i=0; operatorTable[i].unicode != 0; ++i ) {
+    for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) {
         list.append( get_name( operatorTable[i] ));
     }
-    for ( int i=0; arrowTable[i].unicode != 0; ++i ) {
+    for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) {
         list.append( get_name( arrowTable[i] ));
     }
-    for ( int i=0; greekTable[i].unicode != 0; ++i ) {
+    for ( int i=0; greekTable[i].tqunicode != 0; ++i ) {
         list.append( get_name( greekTable[i] ) );
     }
     return list;
@@ -144,7 +144,7 @@ TQStringList SymbolTable::allNames() const
 TQString SymbolTable::get_name( struct UnicodeNameTable entry ) const
 {
     if ( !*entry.name ) {
-        return "U" + TQString( "%1" ).arg( entry.unicode, 4, 16 ).upper();
+        return "U" + TQString( "%1" ).tqarg( entry.tqunicode, 4, 16 ).upper();
     }
     return entry.name;
 }
diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h
index 7820af81a..d4a19f035 100644
--- a/lib/kformula/symboltable.h
+++ b/lib/kformula/symboltable.h
@@ -51,14 +51,14 @@ public:
     TQString greekLetters() const { return greek; }
 
     /**
-     * @returns the unicode value of the symbol font char.
+     * @returns the tqunicode value of the symbol font char.
      */
-    TQChar unicodeFromSymbolFont( TQChar pos ) const;
+    TQChar tqunicodeFromSymbolFont( TQChar pos ) const;
 
 private:
 
     /**
-     * symbol font char -> unicode mapping.
+     * symbol font char -> tqunicode mapping.
      */
     TQMap<TQChar, TQChar> compatibility;
 
@@ -91,7 +91,7 @@ public:
      * @returns the char in the symbol font that belongs to
      * the given name.
      */
-    TQChar unicode( TQString name ) const;
+    TQChar tqunicode( TQString name ) const;
     TQString name( TQChar symbol ) const;
 
     TQFont font( TQChar symbol, const TQFont& f ) const;
@@ -104,9 +104,9 @@ public:
     TQString greekLetters() const;
 
     /**
-     * @returns the unicode value of the symbol font char.
+     * @returns the tqunicode value of the symbol font char.
      */
-    TQChar unicodeFromSymbolFont( TQChar pos ) const;
+    TQChar tqunicodeFromSymbolFont( TQChar pos ) const;
 
     /**
      * @returns all known names as strings.
@@ -121,12 +121,12 @@ private:
     TQString get_name( UnicodeNameTable entry ) const;
 
     /**
-     * unicode -> name mapping.
+     * tqunicode -> name mapping.
      */
     NameTable names;
 
     /**
-     * Name -> unicode mapping.
+     * Name -> tqunicode mapping.
      */
     EntryTable entries;
 
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc
index 7f146b49b..c9826429e 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cc
@@ -66,7 +66,7 @@ TokenType TextElement::getTokenType() const
         return getSymbolTable().charClass( character );
     }
 
-    switch ( character.unicode() ) {
+    switch ( character.tqunicode() ) {
     case '+':
     case '-':
     case '*':
@@ -106,7 +106,7 @@ bool TextElement::isInvisible() const
 
 /**
  * Calculates our width and height and
- * our children's parentPosition.
+ * our tqchildren'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 children.
+ * Draws the whole element including its tqchildren.
  * The `parentOrigin' is the point this element's parent starts.
  * We can use our parentPosition to get our own origin then.
  */
@@ -202,7 +202,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
     ElementType* token = getElementType();
     if ( ( token != 0 ) && !symbol ) {
         TQString text = token->text( static_cast<SequenceElement*>( getParent() ) );
-//         kdDebug() << "draw text: " << text[0].unicode()
+//         kdDebug() << "draw text: " << text[0].tqunicode()
 //                   << " " << painter.font().family().latin1()
 //                   << endl;
         painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() ),
@@ -401,10 +401,10 @@ bool TextElement::readAttributesFromDom(TQDomElement element)
     if(!symbolStr.isNull()) {
         int symbolInt = symbolStr.toInt();
         if ( symbolInt == 1 ) {
-            character = getSymbolTable().unicodeFromSymbolFont(character);
+            character = getSymbolTable().tqunicodeFromSymbolFont(character);
         }
         if ( symbolInt == 2 ) {
-            switch ( character.unicode() ) {
+            switch ( character.tqunicode() ) {
             case 0x03D5: character = 0x03C6; break;
             case 0x03C6: character = 0x03D5; break;
             case 0x03Ba: character = 0x03BA; break;
diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h
index 1a64ce80a..99b6e63a2 100644
--- a/lib/kformula/textelement.h
+++ b/lib/kformula/textelement.h
@@ -73,7 +73,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -81,7 +81,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children.
+     * Dispatch this FontCommand to all our TextElement tqchildren.
      */
     virtual void dispatchFontCommand( FontCommand* cmd );
 
@@ -123,7 +123,7 @@ public:
 
     /**
      * @returns the latex representation of the element and
-     * of the element's children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
@@ -244,7 +244,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -252,7 +252,7 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
+     * Draws the whole element including its tqchildren.
      * 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 children
+     * of the element's tqchildren
      */
     virtual TQString toLatex();
 
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc
index 6addc385c..272af51fb 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cc
@@ -67,7 +67,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo
                 kdWarning() << "Invalid entity refererence: " << entity << endl;
             }
             else {
-                TextElement* child = new TextElement( TQChar( pos->unicode ) );
+                TextElement* child = new TextElement( TQChar( pos->tqunicode ) );
                 child->setParent(this);
                 child->setCharFamily( charFamily() );
                 child->setCharStyle( charStyle() );
@@ -97,7 +97,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo
         n = n.nextSibling();
     }
 //	parse();
-	kdWarning() << "Num of children " << list.count() << endl;
+	kdWarning() << "Num of tqchildren " << list.count() << endl;
     return 1;
 }
 
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc
index fcce16e7c..c8e4799fd 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" ).arg( m_mathSize ) );
+        element.setAttribute( "mathsize", TQString( "%1pt" ).tqarg( m_mathSize ) );
         break;
     case RelativeSize:
-        element.setAttribute( "mathsize", TQString( "%1%" ).arg( m_mathSize * 100.0 ) );
+        element.setAttribute( "mathsize", TQString( "%1%" ).tqarg( m_mathSize * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "mathsize", TQString( "%1px" ).arg( m_mathSize ) );
+        element.setAttribute( "mathsize", TQString( "%1px" ).tqarg( 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" ).arg( m_fontSize ) );
+        element.setAttribute( "fontsize", TQString( "%1pt" ).tqarg( m_fontSize ) );
         break;
     case RelativeSize:
-        element.setAttribute( "fontsize", TQString( "%1%" ).arg( m_fontSize * 100.0 ) );
+        element.setAttribute( "fontsize", TQString( "%1%" ).tqarg( m_fontSize * 100.0 ) );
         break;
     case PixelSize:
-        element.setAttribute( "fontsize", TQString( "%3px" ).arg( m_fontSize ) );
+        element.setAttribute( "fontsize", TQString( "%3px" ).tqarg( m_fontSize ) );
         break;
     default:
         break;
diff --git a/lib/kformula/unicodetable.cc b/lib/kformula/unicodetable.cc
index 23dc8636e..ad9a7f74e 100644
--- a/lib/kformula/unicodetable.cc
+++ b/lib/kformula/unicodetable.cc
@@ -19,7 +19,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-struct UnicodeNameTable { short unicode; const char* name; };
+struct UnicodeNameTable { short tqunicode; const char* name; };
 
 static UnicodeNameTable greekTable[] = {
     { 0x03B1, "alpha" },
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index a4cfcc149..d127f4448 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 ").arg(desktopName) );
+		        KMessageBox::error(0L, i18n("No template found for: %1 ").tqarg(desktopName) );
 		        delete shell;
 		     } else if ( paths.count() > 1 ) {
-		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").arg(desktopName) );
+		        KMessageBox::error(0L,  i18n("Too many templates found for: %1").tqarg(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.").arg(templateURL.prettyURL()) );
+		        KMessageBox::error(0L, i18n("Template %1 failed to load.").tqarg(templateURL.prettyURL()) );
  		        delete shell;
 		     }
 		  }
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 3348e8734..042a39a82 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." ).arg( nativeFormat ) );
+        KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).tqarg( nativeFormat ) );
         return DCOPRef();
     }
     KoDocument* doc = entry.createDoc( 0 );
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index c78ee70f5..41dfee8f2 100644
--- a/lib/kofficecore/KoChild.cpp
+++ b/lib/kofficecore/KoChild.cpp
@@ -34,7 +34,7 @@ public:
   {
   }
 
-  TQRect m_geometry;
+  TQRect m_tqgeometry;
 
   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_geometry = rect;
+  d->m_tqgeometry = rect;
 
   // Embedded objects should have a minimum size of 3, so they can be selected
-  if( d->m_geometry.width() < 3 )
-    d->m_geometry.setWidth( 3 );
+  if( d->m_tqgeometry.width() < 3 )
+    d->m_tqgeometry.setWidth( 3 );
 
-  if( d->m_geometry.height() < 3 )
-    d->m_geometry.setHeight( 3 );
+  if( d->m_tqgeometry.height() < 3 )
+    d->m_tqgeometry.setHeight( 3 );
 
   updateMatrix();
 
@@ -89,9 +89,9 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit )
     emit changed( this );
 }
 
-TQRect KoChild::geometry() const
+TQRect KoChild::tqgeometry() const
 {
-  return d->m_geometry;
+  return d->m_tqgeometry;
 }
 
 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_geometry.width(), d->m_geometry.height() ), matrix );
+  return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix );
 }
 
 //bool KoChild::contains( const TQPoint &point ) const
@@ -123,9 +123,9 @@ void KoChild::setClipRegion( TQPainter &painter, bool combine )
 {
   painter.setClipping( true );
   if ( combine && !painter.clipRegion().isEmpty() )
-    painter.setClipRegion( region( painter.worldMatrix() ).intersect( painter.clipRegion() ) );
+    painter.setClipRegion( region( painter.tqworldMatrix() ).intersect( painter.clipRegion() ) );
   else
-    painter.setClipRegion( region( painter.worldMatrix() ) );
+    painter.setClipRegion( region( painter.tqworldMatrix() ) );
 }
 
 void KoChild::setScaling( double x, double y )
@@ -218,7 +218,7 @@ void KoChild::transform( TQPainter &painter )
 {
     setClipRegion( painter, true );
 
-    TQWMatrix m = painter.worldMatrix();
+    TQWMatrix m = painter.tqworldMatrix();
     m = d->m_matrix * m;
     m.scale( d->m_scaleX, d->m_scaleY );
     painter.setWorldMatrix( m );
@@ -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_geometry.width() / d->m_scaleX),
-                int(d->m_geometry.height() / d->m_scaleY) );
+  return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_tqgeometry.width() / d->m_scaleX),
+                int(d->m_tqgeometry.height() / d->m_scaleY) );
 }
 
 TQPointArray KoChild::framePointArray( const TQWMatrix &matrix ) const
 {
-  return pointArray( TQRect( -6, -6, d->m_geometry.width() + 12, d->m_geometry.height() + 12 ), matrix );
+  return pointArray( TQRect( -6, -6, d->m_tqgeometry.width() + 12, d->m_tqgeometry.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_geometry.x(), -d->m_rotationPoint.y() + d->m_geometry.y() );
+  m.translate( -d->m_rotationPoint.x() + d->m_tqgeometry.x(), -d->m_rotationPoint.y() + d->m_tqgeometry.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_geometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
       return TopMid;
-  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), -5, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) )
       return TopRight;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
       return MidLeft;
-  if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomLeft;
-  if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3,
-				   d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3,
+				   d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
     return BottomMid;
-  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), d->m_geometry.height(), 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
       return BottomRight;
-  if ( TQRegion( pointArray( TQRect( d->m_geometry.width(),
-				   d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
+  if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(),
+				   d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
     return MidRight;
 
   return Move;
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index fe345e2e1..b7285deb9 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 geometry
+ * KoChild is an abstract base class that represents the tqgeometry
  * 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 geometry for this child document.
+   *  Sets a new tqgeometry 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 geometry() const;
+  TQRect tqgeometry() 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 geometry.
+   *         This value depends on the scaling and the tqgeometry.
    *         This is the value that is passed to KoDocument::paintContent.
    *
-   * @see #xScaling #geometry
+   * @see #xScaling #tqgeometry
    */
   virtual TQRect contentRect() const;
 
@@ -204,7 +204,7 @@ public:
   virtual TQRegion frameRegion( const TQWMatrix& matrix = TQWMatrix(), bool solid = false ) const;
 
   /**
-   * @return the frame geometry including a border (6 pixels) as a point
+   * @return the frame tqgeometry 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, geometry changes
+   * If the child is locked, tqgeometry changes
    * (including scaling, rotation, ...) are not backed up.
    *
    * As long as this child is locked, the backed up
-   * geometry state can be recovered with oldPointArray.
+   * tqgeometry 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 geometry transformed by given matrix.
+   * @return the backed up tqgeometry transformed by given matrix.
    */
   virtual TQPointArray oldPointArray( const TQWMatrix &matrix );
 
diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp
index ae4dbeabe..bd4bb4894 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->geometry();
+        m_geometryStart = child->tqgeometry();
         m_matrix = child->matrix() * matrix;
         m_invertParentMatrix = matrix.invert();
 
@@ -84,11 +84,11 @@ KoPartResizeHandler::~KoPartResizeHandler()
     d=0L;
 }
 
-void KoPartResizeHandler::repaint(TQRegion &rgn)
+void KoPartResizeHandler::tqrepaint(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())->repaint( rgn );
+  ((TQWidget*)target())->tqrepaint( 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 ) );
-                repaint(rgn);
+                tqrepaint(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 ) );
-                repaint(rgn);
+                tqrepaint(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 ) );
-                repaint(rgn);
+                tqrepaint(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() ) );
-                repaint(rgn);
+                tqrepaint(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() ) );
-                repaint(rgn);
+                tqrepaint(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 ) );
-                repaint(rgn);
+                tqrepaint(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 ) );
-                repaint(rgn);
+                tqrepaint(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 ) );
-                repaint(rgn);
+                tqrepaint(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->geometry();
+        m_geometryDragStart = m_dragChild->tqgeometry();
         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())->repaint( bound );
+        ((TQWidget*)target())->tqrepaint( bound );
 
         return true;
     }
diff --git a/lib/kofficecore/KoContainerHandler.h b/lib/kofficecore/KoContainerHandler.h
index 0187128d8..0ea9ba35f 100644
--- a/lib/kofficecore/KoContainerHandler.h
+++ b/lib/kofficecore/KoContainerHandler.h
@@ -68,7 +68,7 @@ public:
     ~KoPartResizeHandler();
 
 protected:
-    void repaint(TQRegion &rgn);
+    void tqrepaint(TQRegion &rgn);
     bool eventFilter( TQObject*, TQEvent* );
 
 private:
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 51fd1111e..ecbd496f3 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqheader.h>
 #include <tqrect.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpainter.h>
 #include <tqsimplerichtext.h>
 #include <tqevent.h>
@@ -296,7 +296,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instan
   fileList.setAutoDelete(false);
 
   do {
-    TQString key = TQString("File%1").arg(i);
+    TQString key = TQString("File%1").tqarg(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>")
-          .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
+          .tqarg(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>")
-          .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
+          .tqarg(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 eab229e39..ba3c9d547 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -59,7 +59,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 #include <tqxml.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <config.h>
 #include <assert.h>
@@ -120,7 +120,7 @@ public:
     }
 
     TQPtrList<KoView> m_views;
-    TQPtrList<KoDocumentChild> m_children;
+    TQPtrList<KoDocumentChild> m_tqchildren;
     TQPtrList<KoMainWindow> m_shells;
     TQValueList<TQDomDocument> m_viewBuildDocuments;
 
@@ -271,7 +271,7 @@ KoDocument::~KoDocument()
 {
     d->m_autoSaveTimer.stop();
 
-    TQPtrListIterator<KoDocumentChild> childIt( d->m_children );
+    TQPtrListIterator<KoDocumentChild> childIt( d->m_tqchildren );
     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_children.setAutoDelete( true );
-    d->m_children.clear();
+    d->m_tqchildren.setAutoDelete( true );
+    d->m_tqchildren.clear();
 
     d->m_shells.setAutoDelete( true );
     d->m_shells.clear();
@@ -401,7 +401,7 @@ bool KoDocument::saveFile()
                     backup = url();
                 else
                     backup = d->m_backupPath +"/"+url().fileName();
-                backup.setPath( backup.path() + TQString::fromLatin1("~") );
+                backup.setPath( backup.path() + TQString::tqfromLatin1("~") );
                 KFileItem item( entry, url() );
                 Q_ASSERT( item.name() == url().fileName() );
                 KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() );
@@ -418,7 +418,7 @@ bool KoDocument::saveFile()
         if ( !d->filterManager )
             d->filterManager = new KoFilterManager( this );
 
-        KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
+        KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
         ret = status == KoFilter::OK;
         suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph );
     } else {
@@ -591,7 +591,7 @@ void KoDocument::setManager( KParts::PartManager *manager )
 
     if ( manager )
     {
-        TQPtrListIterator<KoDocumentChild> it( d->m_children );
+        TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
         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_children );
+    TQPtrListIterator<KoDocumentChild> dIt( d->m_tqchildren );
     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_children.append( child );
+    d->m_tqchildren.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_children.removeRef( child );
+    d->m_tqchildren.removeRef( child );
 }
 
-const TQPtrList<KoDocumentChild>& KoDocument::children() const
+const TQPtrList<KoDocumentChild>& KoDocument::tqchildren() const
 {
-    return d->m_children;
+    return d->m_tqchildren;
 }
 
 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_children );
+    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
     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_children );
+    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
     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_children );
+    TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren );
     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 children (considered to be part of this doc)
-    TQPtrListIterator<KoDocumentChild> it = children();
+    // Then go through internally stored tqchildren (considered to be part of this doc)
+    TQPtrListIterator<KoDocumentChild> it = tqchildren();
     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 children of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
     int i = 0;
-    TQPtrListIterator<KoDocumentChild> it( children() );
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     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 children of doc='"<<url().url()<<"'"<<endl;
-    TQPtrListIterator<KoDocumentChild> it( children() );
+    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     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 children of doc='"<<url().url()<<"'"<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl;
     KoDocumentChild *ch;
-    TQPtrListIterator<KoDocumentChild> it = children();
+    TQPtrListIterator<KoDocumentChild> it = tqchildren();
     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 children
+                doc->setDoNotSaveExtDoc(); // Only save doc + it's internal tqchildren
                 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?" ).arg( "meta.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "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?" ).arg( "Thumbnails/thumbnail.png" );
+                d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "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?" ).arg( "Thumbnails/thumbnail.png" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "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?" ).arg( "META-INF/manifest.xml" );
+            d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "META-INF/manifest.xml" );
             delete store;
             return false;
         }
@@ -1064,7 +1064,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
     }
     else
     {
-        // Save internal children first since they might get a new url
+        // Save internal tqchildren 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?" ).arg( "maindoc.xml" );
+            d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "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 children happy cd to the correct directory
+    // To make the tqchildren happy cd to the correct directory
     _store->pushDirectory();
     _store->enterDirectory( _path );
 
@@ -1222,7 +1222,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size )
         docHeight = m_pageLayout.ptHeight / 72 * KoGlobal::dpiY();
 
     } else {
-        // If we don't have a page layout, just draw the top left hand corner
+        // If we don't have a page tqlayout, just draw the top left hand corner
         docWidth = 500.0;
         docHeight = 500.0;
     }
@@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const
         // Never saved? Use a temp file in $HOME then
         // Yes, two open unnamed docs will overwrite each other's autosave file,
         // but hmm, we can only do something if that's in the same process anyway...
-        TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension;
+        TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension;
         return ret;
     }
     else
@@ -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?" )
-            .arg(asf, dateStr) );
+            .tqarg(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" ).arg( _url.url() ); // ## used anywhere ?
+        d->lastErrorMessage = i18n( "Malformed URL\n%1" ).tqarg( _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.").arg(m_file) );
+            KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(m_file) );
         d->m_bLoading = false;
         return false;
     }
@@ -1456,7 +1456,7 @@ bool KoDocument::openFile()
     if ( !isNativeFormat( typeName.latin1() ) ) {
         if ( !d->filterManager )
             d->filterManager = new KoFilterManager( this );
-        KoFilter::ConversionStatus status;
+        KoFilter::ConversiontqStatus status;
         importedFile = d->filterManager->import( m_file, status );
         if ( status != KoFilter::OK )
         {
@@ -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.arg(msg).arg(docUrl) );
+                KMessageBox::error( 0L, errorMsg.tqarg(msg).tqarg(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" ).arg( filename );
+        d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( 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" )
-                              .arg( filename ).arg( errorLine ).arg( errorColumn )
-                              .arg( i18n ( "TQXml", errorMsg.utf8() ) );
+                              .tqarg( filename ).tqarg( errorLine ).tqarg( errorColumn )
+                              .tqarg( 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.").arg(file);
+        d->lastErrorMessage = i18n("The file %1 does not exist.").tqarg(file);
         return false;
     }
     if ( !fileInfo.isFile() )
     {
-        d->lastErrorMessage = i18n( "%1 is not a file." ).arg(file);
+        d->lastErrorMessage = i18n( "%1 is not a file." ).tqarg(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" )
-                                  .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) );
+                                  .tqarg( errorLine ).tqarg( errorColumn ).tqarg( 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" ).arg( file );
+        d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).tqarg( 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 children" << endl;
+            kdError(30003) << "ERROR: Could not load tqchildren" << 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 children" << endl;
+        kdError(30003) << "ERROR: Could not load tqchildren" << 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 = children();
+        TQPtrListIterator<KoDocumentChild> it = tqchildren();
         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>" ).arg(name));
+                    i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name));
 
     switch(res)
     {
@@ -2023,9 +2023,9 @@ int KoDocument::queryCloseDia()
 
 int KoDocument::queryCloseExternalChildren()
 {
-    //kdDebug(30003)<<k_funcinfo<<" checking for children in: "<<url().url()<<endl;
+    //kdDebug(30003)<<k_funcinfo<<" checking for tqchildren in: "<<url().url()<<endl;
     setDoNotSaveExtDoc(false);
-    TQPtrListIterator<KoDocumentChild> it( children() );
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     for (; it.current(); ++it )
     {
         if ( !it.current()->isDeleted() )
@@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified()
         // Get caption from document info (title(), in about page)
         if ( documentInfo() )
         {
-            KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") );
+            KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") );
             if (page)
                 caption = static_cast<KoDocumentInfoAbout *>(page)->title();
         }
@@ -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").arg(appName).arg(version);
+    TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").tqarg(appName).tqarg(version);
     TQDomDocumentType dtype = impl.createDocumentType( tagName,
-                                                      TQString("-//KDE//DTD %1 %1//EN").arg(appName).arg(version),
+                                                      TQString("-//KDE//DTD %1 %1//EN").tqarg(appName).tqarg(version),
                                                       url );
     // The namespace URN doesn't need to include the version number.
-    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").arg(appName);
+    TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").tqarg(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").arg(instname) );
+        service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(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" ).arg( m_file ) );
+        KMessageBox::error( 0L, i18n( "Could not save\n%1" ).tqarg( m_file ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).arg( m_file, d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).tqarg( m_file, d->lastErrorMessage ) );
     }
 }
 
@@ -2376,11 +2376,11 @@ void KoDocument::showLoadingErrorDialog()
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
+        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ) ) );
     }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
+        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) );
     }
 }
 
@@ -2656,7 +2656,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent)
 {
     KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault);
     KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType());
-    pane->layout()->setMargin(0);
+    pane->tqlayout()->setMargin(0);
     dlg.setMainWidget(pane);
     dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog"));
     connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk()));
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 1a5d08056..ac6de7e8c 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 children.
+     *  @param view        The KoView is needed to fiddle about with the active widget, when painting tqchildren.
      *  @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 children into the given painter object.
+     *  Paints all of the documents tqchildren 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 children.
+     *  paint the tqchildren.
      *  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 children. Do not modify the
+     * @return the list of all tqchildren. Do not modify the
      *         returned list.
      */
-    const TQPtrList<KoDocumentChild>& children() const;
+    const TQPtrList<KoDocumentChild>& tqchildren() 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 children().
+     * by traversing the list returned by tqchildren().
      */
     KoDocumentChild *child( KoDocument *doc );
 
@@ -741,7 +741,7 @@ public:
     virtual bool isStoredExtern() const;
 
     /**
-     * @return the page layout associated with this document (margins, pageSize, etc).
+     * @return the page tqlayout associated with this document (margins, pageSize, etc).
      * Override this if you want to provide different sized pages.
      *
      * @see KoPageLayout
@@ -771,14 +771,14 @@ public:
     int queryCloseDia();
 
     /**
-     * @brief Set when we do not want to save external children when saving our 'main' doc.
+     * @brief Set when we do not want to save external tqchildren when saving our 'main' doc.
      *
-     * 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.
+     * 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.
      * Use:
      * @code
      *      doc->setDoNotSaveExtDoc();
-     *      doc->save();    // saves doc and its internal children,
+     *      doc->save();    // saves doc and its internal tqchildren,
      *                            //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( children() );
+     *  TQPtrListIterator<KoDocumentChild> it( tqchildren() );
      *  for( ; it.current(); ++it )
      *  {
      *    if ( !it.current()->loadDocument( _store ) )
@@ -1043,16 +1043,16 @@ protected:
     virtual bool loadChildren( KoStore* );
 
     /**
-     *  Saves all internal children (only!).
-     *  @see saveExternalChildren if you have external children.
+     *  Saves all internal tqchildren (only!).
+     *  @see saveExternalChildren if you have external tqchildren.
      *  Returns true on success.
      */
     virtual bool saveChildren( KoStore* store );
 
     /**
-     *  Saves all internal children (only!), to the store, using the OASIS format.
+     *  Saves all internal tqchildren (only!), to the store, using the OASIS format.
      *  This is called automatically during saveNativeFormat.
-     *  @see saveExternalChildren if you have external children.
+     *  @see saveExternalChildren if you have external tqchildren.
      *  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 children and emits the
+     * Inserts the new child in the list of tqchildren 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 children.
+     *  Saves all externally stored tqchildren.
      *  Returns true on success.
-     * @see #saveChildren for internal children
+     * @see #saveChildren for internal tqchildren
      */
     virtual bool saveExternalChildren();
 
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index c71c76094..0767ab049 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& geometry )
+KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry )
     : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
   d->m_parent = parent;
   d->m_doc = doc;
-  setGeometry( geometry );
+  setGeometry( tqgeometry );
   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 &geometry )
+void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
 {
   kdDebug()<<k_funcinfo<<"doc: "<<doc->url().url()<<endl;
   d->m_doc = doc;
-  setGeometry( geometry );
+  setGeometry( tqgeometry );
 
   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" ).arg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( 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" ).arg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( 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").arg(m_tmpURL),
+                    0, i18n( "This document contains an external link to a remote document\n%1").tqarg(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" ).arg( errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).tqarg( errorMessage ) );
                 else
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).arg( tmpURL, errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).tqarg( tmpURL, errorMessage ) );
             }
             return res;
         }
@@ -409,7 +409,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
         }
         else
         {
-            // To make the children happy cd to the correct directory
+            // To make the tqchildren happy cd to the correct directory
             store->pushDirectory();
             store->enterDirectory( name );
 
@@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin
         d->m_doc->setURL( u );
     }
 
-    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     xmlWriter.addAttribute( "xlink:type", "simple" );
     xmlWriter.addAttribute( "xlink:show", "embed" );
     xmlWriter.addAttribute( "xlink:actuate", "onLoad" );
@@ -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", geometry().left() );
-        rect.setAttribute( "y", geometry().top() );
-        rect.setAttribute( "w", geometry().width() );
-        rect.setAttribute( "h", geometry().height() );
+        rect.setAttribute( "x", tqgeometry().left() );
+        rect.setAttribute( "y", tqgeometry().top() );
+        rect.setAttribute( "w", tqgeometry().width() );
+        rect.setAttribute( "h", tqgeometry().height() );
         e.appendChild(rect);
         return e;
     }
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index 50029cee1..de3704c09 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& geometry );
+  KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry );
 
   /**
    * 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 &geometry );
+  virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry );
 
   /**
    * @return document contained in this child
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 1c9400c63..cd4ecbafb 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" ).arg( KOFFICE_VERSION_STRING ) );
+    xmlWriter->addTextNode( TQString( "KOffice/%1" ).tqarg( 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").arg(group));
+  m_emailCfg->setGroup(TQString("PROFILE_%1").tqarg(group));
 
   if ( m_fullName.isNull() ) // only if null. Empty means the user made it explicitly empty.
   {
@@ -629,7 +629,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info )
     m_docInfo = info;
     m_editingCycles = 0;
     m_initialCreator = m_docInfo->creator();
-    m_creationDate = TQDateTime::currentDateTime();
+    m_creationDate = TQDateTime::tqcurrentDateTime();
 }
 
 void KoDocumentInfoAbout::saveParameters()
@@ -637,7 +637,7 @@ void KoDocumentInfoAbout::saveParameters()
     KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() );
     if ( m_firstSave && doc && !doc->isAutosaving() )
        m_editingCycles++;
-    m_modificationDate = TQDateTime::currentDateTime();
+    m_modificationDate = TQDateTime::tqcurrentDateTime();
     m_firstSave = false;
 }
 
@@ -878,7 +878,7 @@ void KoDocumentInfoAbout::resetMetaData()
 {
     m_editingCycles = 0;
     m_initialCreator = m_docInfo->creator();
-    m_creationDate = TQDateTime::currentDateTime();
+    m_creationDate = TQDateTime::tqcurrentDateTime();
     m_modificationDate = TQDateTime();
 }
 
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index a4aa21fcc..5973dbb47 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 #include <ktempfile.h>
 #include <kmimetype.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klistview.h>
 #include <tqgrid.h>
 #include <tqmap.h>
@@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo()
 
 void KoDocumentInfoDlg::resetMetaData()
 {
-  TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() );
+  TQString s = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() );
   d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() );
   d->m_aboutWidget->labelModified->setText( "" );
   d->m_aboutWidget->labelRevision->setText( "0" );
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 1c3a7fcb1..2a7bd3158 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)").arg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").tqarg( type->comment() ), idx++ );
     if ( addFlatXML )
-        filterWidget->changeItem( i18n("%1 (Flat XML File)").arg( type->comment() ), idx++ );
+        filterWidget->changeItem( i18n("%1 (Flat XML File)").tqarg( 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)").arg (mime->comment ()).arg (compatString), i);
+            filterWidget->changeItem (i18n ("%1 (%2 Compatible)").tqarg (mime->comment ()).tqarg (compatString), i);
     }
 }
 
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index 1e5beb479..628d5f17a 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" ).arg( extension ) );
+    url.setPath( TQString( "dummy.%1" ).tqarg( extension ) );
     KMimeType::Ptr m( KMimeType::findByURL( url, 0, true, true ) );
     return m->name();
 }
@@ -65,7 +65,7 @@ KoEmbeddingFilter::KoEmbeddingFilter() : KoFilter()
 }
 
 int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to,
-                                  KoFilter::ConversionStatus& status, const TQString& key )
+                                  KoFilter::ConversiontqStatus& status, const TQString& key )
 {
     ++( m_partStack.top()->m_lruPartIndex );
 
diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h
index cafad7741..77439648e 100644
--- a/lib/kofficecore/KoFilter.h
+++ b/lib/kofficecore/KoFilter.h
@@ -61,7 +61,7 @@ public:
      * Feel free to add some more error conditions @em before the last item
      * if it's needed.
      */
-    enum ConversionStatus { OK, StupidError, UsageError, CreationError, FileNotFound,
+    enum ConversiontqStatus { OK, StupidError, UsageError, CreationError, FileNotFound,
                             StorageCreationError, BadMimeType, BadConversionGraph,
                             EmbeddedDocError, WrongFormat, NotImplemented,
                             ParsingError, InternalError, UnexpectedEOF,
@@ -79,10 +79,10 @@ public:
      *
      * @param from The mimetype of the source file/document
      * @param to The mimetype of the destination file/document
-     * @return The error status, see the @ref #ConversionStatus enum.
+     * @return The error status, see the @ref #ConversiontqStatus enum.
      *         KoFilter::OK means that everything is alright.
      */
-    virtual ConversionStatus convert( const TQCString& from, const TQCString& to ) = 0;
+    virtual ConversiontqStatus convert( const TQCString& from, const TQCString& to ) = 0;
 
 signals:
     /**
@@ -201,7 +201,7 @@ protected:
      *         within the embedding filter).
      */
     int embedPart( const TQCString& from, TQCString& to,
-                   KoFilter::ConversionStatus& status,
+                   KoFilter::ConversiontqStatus& status,
                    const TQString& key = TQString() );
 
     /**
@@ -262,7 +262,7 @@ private:
 
     /**
      * This struct keeps track of the last used index for a
-     * child part and all references to existing children
+     * child part and all references to existing tqchildren
      * 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 62d93aa5a..471d60988 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi
 {
 }
 
-KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
+KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
 {
     if ( !m_filterEntry ) {
         kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl;
@@ -63,7 +63,7 @@ KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLi
     if ( parentChainLink )
         setupCommunication( parentChainLink->m_filter );
 
-    KoFilter::ConversionStatus status = m_filter->convert( m_from, m_to );
+    KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to );
     delete m_filter;
     m_filter=0;
     return status;
@@ -90,8 +90,8 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF
     if ( !parentFilter )
         return;
 
-    const TQMetaObject* const parent = parentFilter->metaObject();
-    const TQMetaObject* const child = m_filter->metaObject();
+    const TQMetaObject* const parent = parentFilter->tqmetaObject();
+    const TQMetaObject* const child = m_filter->tqmetaObject();
     if ( !parent || !child )
         return;
 
@@ -131,9 +131,9 @@ KoFilterChain::~KoFilterChain()
     manageIO(); // Called for the 2nd time in a row -> clean up
 }
 
-KoFilter::ConversionStatus KoFilterChain::invokeChain()
+KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
 {
-    KoFilter::ConversionStatus status = KoFilter::OK;
+    KoFilter::ConversiontqStatus status = KoFilter::OK;
 
     m_state = Beginning;
     int count = m_chainLinks.count();
@@ -568,7 +568,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name )
         return storageCleanupHelper( &m_outputStorage );
     }
 
-    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).arg( lruPartIndex ) ) )
+    if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).tqarg( lruPartIndex ) ) )
         return storageCleanupHelper( &m_outputStorage );
 
     return storageCreateFirstStream( name, &m_outputStorage, &m_outputStorageDevice );
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index a044eebe2..d926c613f 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -69,7 +69,7 @@ public:
      * @return The return status of the conversion. KoFilter::OK
      * if everything is alright.
      */
-    KoFilter::ConversionStatus invokeChain();
+    KoFilter::ConversiontqStatus invokeChain();
 
     /**
      * Tells the @ref KoFilterManager the output file of the
@@ -182,7 +182,7 @@ private:
         ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry,
                    const TQCString& from, const TQCString& to );
 
-        KoFilter::ConversionStatus invokeFilter( const ChainLink* const parentChainLink );
+        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink );
 
         TQCString from() const { return m_from; }
         TQCString to() const { return m_to; }
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 2b44459cd..31a1e43ea 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqapplication.h>
 
@@ -59,13 +59,13 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType
     setMainWidget (page);
 
     // looks too squashed together without * 2
-    TQVBoxLayout *layout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
 
     TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel");
-    layout->addWidget (filterLabel);
+    tqlayout->addWidget (filterLabel);
 
     m_filterList = new KListBox (page, "filterlist");
-    layout->addWidget (m_filterList);
+    tqlayout->addWidget (m_filterList);
 
     Q_ASSERT (!m_mimeTypes.isEmpty ());
     for (TQStringList::ConstIterator it = m_mimeTypes.begin ();
@@ -138,7 +138,7 @@ KoFilterManager::~KoFilterManager()
     delete d;
 }
 
-TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatus& status )
+TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqStatus& status )
 {
     // Find the mime type for the file to be imported.
     KURL u;
@@ -231,7 +231,7 @@ TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatu
     return TQString();
 }
 
-KoFilter::ConversionStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType )
+KoFilter::ConversiontqStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType )
 {
     bool userCancelled = false;
 
@@ -482,7 +482,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d
     // TODO maybe use the fake vertex trick from the method below, to make the search faster?
 
     TQStringList nativeMimeTypes;
-    nativeMimeTypes.append( TQString::fromLatin1( mimetype ) );
+    nativeMimeTypes.append( TQString::tqfromLatin1( mimetype ) );
     nativeMimeTypes += extraNativeMimeTypes;
 
     // Add the native mimetypes first so that they are on top.
@@ -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").arg( mimeType );
+    TQString tmp = i18n("Could not import file of type\n%1").tqarg( mimeType );
     // ###### FIXME: use KLibLoader::lastErrorMessage() here
     if (!suppressDialog) KMessageBox::error( 0L, tmp, i18n("Missing Import Filter") );
 }
diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h
index 111580126..5f0641f4f 100644
--- a/lib/kofficecore/KoFilterManager.h
+++ b/lib/kofficecore/KoFilterManager.h
@@ -81,7 +81,7 @@ public:
      * If the TQString which is returned isEmpty() and the status is OK,
      * then we imported the file directly into the document.
      */
-    TQString import( const TQString& url, KoFilter::ConversionStatus& status );
+    TQString import( const TQString& url, KoFilter::ConversiontqStatus& status );
     /**
      * @brief Exports the given file/document to the specified URL/mimetype.
      *
@@ -89,7 +89,7 @@ public:
      * and when the method returns @p mimeType contains this mimetype.
      * Oh, well, export is a C++ keyword ;)
      */
-    KoFilter::ConversionStatus exp0rt( const TQString& url, TQCString& mimeType );
+    KoFilter::ConversiontqStatus exp0rt( const TQString& url, TQCString& mimeType );
 
 
 
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index f9b3930ef..4909e1e04 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 geometry so they call resizeEvent.
+      // The other modes change the tqgeometry 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/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index e140ac50f..5c8f680f3 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -225,7 +225,7 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     }
     if ( !m_familyName.isEmpty() )
         const_cast<KoGenStyle *>( this )->
-            addAttribute( "style:family", TQString::fromLatin1( m_familyName ) );
+            addAttribute( "style:family", TQString::tqfromLatin1( m_familyName ) );
     else {
         if ( qstrcmp( elementName, "style:style" ) == 0 )
             kdWarning(30003) << "User style " << name << " is without family - invalid. m_type=" << m_type << endl;
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index d75167328..2a54f944a 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -274,7 +274,7 @@ public:
     {
         /**
          *  DefaultType depends on family: e.g. paragraph-properties if family=paragraph
-         *  or on the type of style (e.g. page-layout -> page-layout-properties).
+         *  or on the type of style (e.g. page-tqlayout -> page-tqlayout-properties).
          *  (In fact that tag name is the one passed to writeStyle)
          */
         DefaultType = 0,
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 3c979f934..8ba1c0777 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -136,7 +136,7 @@ void KoGlobal::createListOfLanguages()
     // currently have en_GB or en_US etc.
 
     const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
-                                                            TQString::fromLatin1("*/entry.desktop"));
+                                                            TQString::tqfromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
     {
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 248d3ed39..1219bf093 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -499,19 +499,19 @@ void KoMainWindow::updateCaption()
       // Get caption from document info (title(), in about page)
       if ( rootDocument()->documentInfo() )
       {
-          KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") );
+          KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") );
           if (page)
               caption = static_cast<KoDocumentInfoAbout *>(page)->title();
       }
       const TQString url = rootDocument()->url().prettyURL( 0, KURL::StripFileProtocol );
       if ( !caption.isEmpty() && !url.isEmpty() )
-          caption = TQString( "%1 - %2" ).arg( caption ).arg( url );
+          caption = TQString( "%1 - %2" ).tqarg( caption ).tqarg( 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").arg(rootDocument()->url().fileName(false)) );
+        d->m_paSave->setToolTip( i18n("Save as %1").tqarg(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.").arg(url.url()) );
+        KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(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)" ).arg( outputFormat.data() )
+                      i18n( "%1 (unknown file type)" ).tqarg( 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>" )
-                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
+                  .tqarg( TQString( "<b>%1</b>" ).tqarg( 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>" )
-                  .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later
+                  .tqarg( TQString( "<b>%1</b>" ).tqarg( 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>" ).arg(name),
+                        i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(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)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
+        //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), 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").arg( tb->text() ), 0,
+          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").tqarg( tb->text() ), 0,
                                                actionCollection(), tb->name() );
-	  act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() ));
+	  act->setCheckedState(i18n("Hide %1 Toolbar").tqarg( 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").arg(rootDocument()->url().fileName(false));
+        theSubject = i18n("Document - %1").tqarg(rootDocument()->url().fileName(false));
         urls.append( fileURL );
     }
 
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index fa1642e74..ea99ce8ab 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" ).arg( fileName );
+        errorMessage = i18n( "Could not find %1" ).tqarg( 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" )
-                       .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ) );
+                       .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ) );
     }
     else
     {
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index 04a0eb208..fe88a11b2 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -26,7 +26,7 @@
 #include <tqbuffer.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <KoStyleStack.h>
 
 class KoOasisStyles::Private
@@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
             //kdDebug(30003) << "Style: '" << name << "' loaded " << endl;
         }
     } else if ( ns == KoXmlNS::style && (
-                localName == "page-layout"
+                localName == "page-tqlayout"
              || localName == "font-decl"
-             || localName == "presentation-page-layout" ) )
+             || localName == "presentation-page-tqlayout" ) )
     {
         if ( m_styles.find( name ) != 0 )
             kdDebug(30003) << "Style: '" << name << "' already exists" << endl;
diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h
index e73eab0e7..dfa9e468c 100644
--- a/lib/kofficecore/KoOasisStyles.h
+++ b/lib/kofficecore/KoOasisStyles.h
@@ -47,8 +47,8 @@ public:
 
     /**
      * Look up a style by name.
-     *  This method can find styles defined by the tags "style:page-layout",
-     *   "style:presentation-page-layout", or "style:font-decl".
+     *  This method can find styles defined by the tags "style:page-tqlayout",
+     *   "style:presentation-page-tqlayout", or "style:font-decl".
      * Do NOT use this method for style:style styles.
      *
      * @param name the style name
@@ -148,7 +148,7 @@ private:
     KoOasisStyles& operator=( const KoOasisStyles & ); // forbidden
 
 private:
-    TQDict<TQDomElement>   m_styles; // page-layout, font-decl etc.
+    TQDict<TQDomElement>   m_styles; // page-tqlayout, font-decl etc.
     TQDict<TQDomElement>   m_defaultStyle;
     TQDomElement m_officeStyle;
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 15da91513..83978239f 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -20,7 +20,7 @@
 #include "KoOpenPane.h"
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqwidgetstack.h>
 #include <tqlabel.h>
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index c3965d450..05eff10ba 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -59,7 +59,7 @@ KoGenStyle KoPageLayout::saveOasis() const
 
 void KoPageLayout::loadOasis(const TQDomElement &style)
 {
-    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
     if ( !properties.isNull() )
     {
         ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -82,18 +82,18 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
 
 KoPageLayout KoPageLayout::standardLayout()
 {
-    KoPageLayout layout;
-    layout.format = KoPageFormat::defaultFormat();
-    layout.orientation = PG_PORTRAIT;
-    layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
-    layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
-    layout.ptLeft = MM_TO_POINT( 20.0 );
-    layout.ptRight = MM_TO_POINT( 20.0 );
-    layout.ptTop = MM_TO_POINT( 20.0 );
-    layout.ptBottom = MM_TO_POINT( 20.0 );
-    layout.ptPageEdge = -1;
-    layout.ptBindingSide = -1;
-    return layout;
+    KoPageLayout tqlayout;
+    tqlayout.format = KoPageFormat::defaultFormat();
+    tqlayout.orientation = PG_PORTRAIT;
+    tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
+    tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
+    tqlayout.ptLeft = MM_TO_POINT( 20.0 );
+    tqlayout.ptRight = MM_TO_POINT( 20.0 );
+    tqlayout.ptTop = MM_TO_POINT( 20.0 );
+    tqlayout.ptBottom = MM_TO_POINT( 20.0 );
+    tqlayout.ptPageEdge = -1;
+    tqlayout.ptBindingSide = -1;
+    return tqlayout;
 }
 
 struct PageFormatInfo
@@ -149,12 +149,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
             return KPrinter::A4;
     }
     else if ( format <= PG_LAST_FORMAT )
@@ -198,15 +198,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
 TQString KoPageFormat::formatString( KoFormat format )
 {
     if ( format <= PG_LAST_FORMAT )
-        return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::fromLatin1( "A4" );
+        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::tqfromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
             return pageFormatInfo[ i ].format;
     }
     // We do not know the format name, so we have a custom format
diff --git a/lib/kofficecore/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h
index f854b1eb7..4d4dc6cc8 100644
--- a/lib/kofficecore/KoPageLayout.h
+++ b/lib/kofficecore/KoPageLayout.h
@@ -154,7 +154,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page layout, including
+ * This structure defines the page tqlayout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -194,17 +194,17 @@ struct KoPageLayout
     }
 
     /**
-     * Save this page layout to OASIS.
+     * Save this page tqlayout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page layout from OASIS
+     * Load this page tqlayout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 
     /**
-     * @return a page layout with the default page size depending on the locale settings,
+     * @return a page tqlayout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index 62269f054..9edbc981a 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -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.device()->isExtDev() ) // Is it an external device (i.e. printer)
+    if ( painter.tqdevice()->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.
@@ -399,7 +399,7 @@ bool KoPictureEps::loadData(const TQByteArray& array, const TQString& /* extensi
         kdError(30003) << "Not standard bounding box: " << line << endl;
         return false;
     }
-    kdDebug(30003) << "Reg. Exp. Found: " << exp.capturedTexts() << endl;
+    kdDebug(30003) << "Reg. Exp. Found: " << exp.tqcapturedTexts() << endl;
     rect.setLeft((int)exp.cap(1).toDouble());
     rect.setTop((int)exp.cap(2).toDouble());
     rect.setRight((int)exp.cap(3).toDouble());
diff --git a/lib/kofficecore/KoPictureImage.cpp b/lib/kofficecore/KoPictureImage.cpp
index b0b28ff36..c0775ac74 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.device()->isExtDev() // we are printing
+    const bool scaleImage = painter.tqdevice()->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 ea2869a9a..0badb429e 100644
--- a/lib/kofficecore/KoPictureKey.cpp
+++ b/lib/kofficecore/KoPictureKey.cpp
@@ -139,8 +139,8 @@ void KoPictureKey::loadAttributes( const TQDomElement &elem )
 TQString KoPictureKey::toString() const
 {
     // We do not use the default TQDateTime::toString has it does not show microseconds
-    return TQString::fromLatin1( "%1 %2" )
-        .arg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") );
+    return TQString::tqfromLatin1( "%1 %2" )
+        .tqarg( 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 84a1be4bf..0003d00d1 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]" ).arg( mimetype ).arg( mimetype );
+  TQString constr = TQString::tqfromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( 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" ).arg( mimetype );
+    TQString constr = TQString::tqfromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype );
     vec = query( constr );
     if ( vec.isEmpty() )
     {
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index e309cc7e1..75c8fec8c 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -33,14 +33,14 @@
 #include <tqtabbar.h>
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlistview.h>
 #include <tqlistbox.h>
 #include <tqiconview.h>
 #include <tqtable.h>
 #include <tqgridview.h>
 #include <tqregexp.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 // KDE includes.
 #include <kapplication.h>
@@ -136,7 +136,7 @@ void KoSpeaker::probe()
     TQPoint pos;
     bool spoke = false;
     if ( d->m_speakFlags & SpeakFocusWidget ) {
-        w = kapp->focusWidget();
+        w = kapp->tqfocusWidget();
         if (w) {
             spoke = maybeSayWidget(w);
             if (!spoke)
diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index d65fab446..98c3ef720 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 children are hidden, we are hidden too
+    /// If all tqchildren are hidden, we are hidden too
     bool isHidden() const;
-    /// if we should hide, we hide all the children
+    /// if we should hide, we hide all the tqchildren
     void setHidden(bool hidden=true) const;
 
     KoTemplate *first() { return m_templates.first(); }
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index 3ba89f24b..cc8823457 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -183,15 +183,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 {
     if ( ok )
         *ok = true;
-    if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM;
-    if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM;
-    if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM;
-    if ( _unitName == TQString::fromLatin1( "in" )
-         || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH;
-    if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI;
-    if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD;
-    if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC;
-    if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT;
+    if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM;
+    if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM;
+    if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM;
+    if ( _unitName == TQString::tqfromLatin1( "in" )
+         || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH;
+    if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI;
+    if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD;
+    if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC;
+    if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT;
     if ( ok )
         *ok = false;
     return U_PT;
@@ -199,14 +199,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 
 TQString KoUnit::unitName( Unit _unit )
 {
-    if ( _unit == U_MM ) return TQString::fromLatin1( "mm" );
-    if ( _unit == U_CM ) return TQString::fromLatin1( "cm" );
-    if ( _unit == U_DM ) return TQString::fromLatin1( "dm" );
-    if ( _unit == U_INCH ) return TQString::fromLatin1( "in" );
-    if ( _unit == U_PI ) return TQString::fromLatin1( "pi" );
-    if ( _unit == U_DD ) return TQString::fromLatin1( "dd" );
-    if ( _unit == U_CC ) return TQString::fromLatin1( "cc" );
-    return TQString::fromLatin1( "pt" );
+    if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" );
+    if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" );
+    if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" );
+    if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" );
+    if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" );
+    if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" );
+    if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" );
+    return TQString::tqfromLatin1( "pt" );
 }
 
 void KoUnit::saveOasis(KoXmlWriter* settingsWriter, Unit _unit)
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 634a13934..debb9f7c0 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -42,7 +42,7 @@ public:
   {
     m_inOperation = false;
     m_zoom = 1.0;
-    m_children.setAutoDelete( true );
+    m_tqchildren.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_children;
+  TQPtrList<KoViewChild> m_tqchildren;
   TQWidget *m_tempActiveWidget;
   KoViewIface *m_dcopObject;
   bool m_registered;  // are we registered at the part manager?
@@ -339,10 +339,10 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
       if ( child->isRectangle() && !child->isTransparent() )
       {
         KoViewChild *viewChild = new KoViewChild( child, this );
-        d->m_children.append( viewChild );
+        d->m_tqchildren.append( viewChild );
 
         TQApplication::setOverrideCursor(waitCursor);
-        // This is the long operation (due to toolbar layout stuff)
+        // This is the long operation (due to toolbar tqlayout stuff)
         d->m_manager->setActivePart( child->document(), viewChild->frame()->view() );
         TQApplication::restoreOverrideCursor();
 
@@ -484,7 +484,7 @@ void KoView::paintEverything( TQPainter &painter, const TQRect &rect, bool trans
 
 KoViewChild *KoView::child( KoView *view )
 {
-  TQPtrListIterator<KoViewChild> it( d->m_children );
+  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
   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_children );
+  TQPtrListIterator<KoViewChild> it( d->m_tqchildren );
   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_children.remove( ch );
+  d->m_tqchildren.remove( ch );
 
   d->m_manager->addPart( docChild->document(), false ); // the destruction of the view removed the part from the partmanager. re-add it :)
 
@@ -671,12 +671,12 @@ void KoView::endOperation()
 
 KoMainWindow * KoView::shell() const
 {
-    return dynamic_cast<KoMainWindow *>( topLevelWidget() );
+    return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() );
 }
 
 KMainWindow * KoView::mainWindow() const
 {
-    return dynamic_cast<KMainWindow *>( topLevelWidget() );
+    return dynamic_cast<KMainWindow *>( tqtopLevelWidget() );
 }
 
 KStatusBar * KoView::statusBar() const
@@ -741,11 +741,11 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
 
   /*
    KoViewChild has basically three geometries to keep in sync.
-   - 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)
+   - 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)
 
-   So we need to subtract the scrollview's offset for the frame geometry, since it's a widget.
+   So we need to subtract the scrollview's offset for the frame tqgeometry, 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 geometry from the frame geometry (R2 reversed)
-  TQRect geom = m_frame->geometry();
+  // Set our tqgeometry from the frame tqgeometry (R2 reversed)
+  TQRect geom = m_frame->tqgeometry();
   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 geometry from the frame geometry (R1 reversed)
+    // Set the child tqgeometry from the frame tqgeometry (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 geometry "
-              << ( geometry() == childGeom ? "already " : "set to " )
+    kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry "
+              << ( tqgeometry() == childGeom ? "already " : "set to " )
               << childGeom << endl;
     m_child->setGeometry( childGeom );
     unlock();
@@ -811,15 +811,15 @@ void KoViewChild::slotDocGeometryChanged()
 {
   if ( locked() )
       return;
-  // Set frame geometry from child geometry (R1)
+  // Set frame tqgeometry from child tqgeometry (R1)
   // The frame's resizeEvent will call slotFrameGeometryChanged.
-  TQRect geom = parentView()->applyViewTransformations( m_child->geometry() );
+  TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() );
   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 geometry "
-            << ( m_frame->geometry() == borderRect ? "already " : "set to " )
+  kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry "
+            << ( m_frame->tqgeometry() == borderRect ? "already " : "set to " )
             << borderRect << endl;
 
   m_frame->setGeometry( borderRect );
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 16a08f0ce..3b2d3efb4 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 children AND the children are not loaded
+  // apparently has tqchildren AND the tqchildren 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 children, including this element
+  // XML snippet for the tqchildren, including this element
   TQString snippet = doc->buffer.mid( startPos, endPos-startPos+1 );
 
   // now parse all subnodes
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index f55d4abb7..188d58889 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -19,12 +19,12 @@
 
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kiconloader.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index f0121aa91..fc936fdc1 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* repaint the whole area, no matter what. This can easily be
+that we *always* tqrepaint 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, children,...) is zoomed accordingly.
+content (text, objects, tqchildren,...) 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 a9a1cb2ae..9535c14ac 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 != shape()) {
+            if (shayp != tqshape()) {
                 // Must restore and override to get the icon to refresh.
                 if (isActive) kapp->restoreOverrideCursor();
                 TQCursor::setShape((Qt::CursorShape)shayp);
@@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidgetList* KKbdAccessExtensions::getAllPanels()
 {
-    TQWidgetList* allWidgets = kapp->allWidgets();
+    TQWidgetList* allWidgets = kapp->tqallWidgets();
     TQWidgetList* allPanels = new TQWidgetList;
     TQWidget* widget = allWidgets->first();
     while (widget) {
@@ -390,7 +390,7 @@ void KKbdAccessExtensions::showIcon()
 {
     if (!d->panel) return;
     TQPoint p;
-    // kdDebug() << "KKbdAccessExtensions::showIcon: topLevelWidget = " << d->panel->topLevelWidget()->name() << endl;
+    // kdDebug() << "KKbdAccessExtensions::showIcon: tqtopLevelWidget = " << d->panel->tqtopLevelWidget()->name() << endl;
     if (::tqqt_cast<TQSplitter*>( d->panel )) {
         TQSplitter* splitter = dynamic_cast<TQSplitter *>(d->panel);
         int handleNdx = d->handleNdx - 1;
@@ -413,8 +413,8 @@ void KKbdAccessExtensions::showIcon()
         p = dockWindow->pos();
         if (dockWindow->area()) {
             // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl;
-            p = dockWindow->parentWidget()->mapTo(dockWindow->topLevelWidget(), p);
-            // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->topLevelWidget()->name() << endl;
+            p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
+            // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl;
             // TODO: How to get the handle width?
             if (d->handleNdx == 1) {
                 d->icon->setShape(TQt::SizeHorCursor);
@@ -440,7 +440,7 @@ void KKbdAccessExtensions::showIcon()
                         // else Handle is above the dock window.
                 }
             }
-            p = dockWindow->topLevelWidget()->mapToGlobal(p);
+            p = dockWindow->tqtopLevelWidget()->mapToGlobal(p);
         } else {
             d->icon->setShape(TQt::SizeAllCursor);
             p = TQPoint(dockWindow->width() / 2, dockWindow->height() / 2);
@@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys()
     }
     // Find all visible, focusable widgets and create a TQLabel for each.  Don't exceed
     // available list of access keys.
-    TQWidgetList* allWidgets = kapp->allWidgets();
+    TQWidgetList* allWidgets = kapp->tqallWidgets();
     TQWidget* widget = allWidgets->first();
     int accessCount = 0;
     int maxAccessCount = availableAccessKeys.length();
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 0b64d5ebd..c29e4a468 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -58,7 +58,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout2</cstring>
+                    <cstring>tqlayout2</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -82,7 +82,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -96,7 +96,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -158,7 +158,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -177,7 +177,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -191,7 +191,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -208,7 +208,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui
index 9e100ed2f..cf65eb81e 100644
--- a/lib/kofficecore/koDocumentInfoAboutWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>pixmapLabel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>56</width>
                             <height>56</height>
@@ -67,7 +67,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -96,7 +96,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout14</cstring>
+                        <cstring>tqlayout14</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -173,7 +173,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -189,7 +189,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>90</width>
                             <height>70</height>
@@ -206,7 +206,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -277,13 +277,13 @@
                     <property name="name">
                         <cstring>pbReset</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>24</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>24</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>50</width>
                             <height>16</height>
diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
index bce294468..60353b915 100644
--- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>labelAuthor</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>56</width>
                             <height>56</height>
@@ -61,7 +61,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout16</cstring>
+                <cstring>tqlayout16</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -227,7 +227,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index bc650f10e..2a8a531e8 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -26,7 +26,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -36,7 +36,7 @@
                     <property name="name">
                         <cstring>kPushButton2</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>130</width>
                             <height>0</height>
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>101</height>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index c0076afa4..a85ecb383 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -25,7 +25,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>tqlayout5</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -71,7 +71,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout4</cstring>
+                    <cstring>tqlayout4</cstring>
                 </property>
                 <vbox>
                     <property name="name">
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index 7ce1ed77d..baead627c 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 += "\" [shape=box, style=filled, fillcolor=lightblue];\n";
+                output += "\" [tqshape=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 a298bd509..5056e416c 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqbuffer.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 
@@ -639,7 +639,7 @@ void testDocument()
   CHECK( doc.previousSibling().isNull(), true );
   CHECK( doc.nextSibling().isNull(), true );
 
-  // make sure its children are fine
+  // make sure its tqchildren are fine
   KoXmlElement rootElement;
   rootElement = doc.firstChild().toElement();
   CHECK( rootElement.isNull(), false );
@@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "  <office:presentation>";
   xmlstream << "   <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" ";
   xmlstream << "      draw:master-page-name=\"lyt-cool\" ";
-  xmlstream << "      presentation:presentation-page-layout-name=\"AL1T0\">";
+  xmlstream << "      presentation:presentation-page-tqlayout-name=\"AL1T0\">";
   xmlstream << "    <draw:frame presentation:style-name=\"pr1\" ";
-  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"layout\" ";
+  xmlstream << "      draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" ";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"3.508cm\" ";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"1.543cm\" ";
   xmlstream << "      presentation:class=\"title\" ";
@@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <draw:frame presentation:style-name=\"pr2\" ";
-  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"layout\"";
+  xmlstream << "      draw:text-style-name=\"P3\" draw:layer=\"tqlayout\"";
   xmlstream << "      svg:width=\"23.912cm\" svg:height=\"13.231cm\"";
   xmlstream << "      svg:x=\"2.058cm\" svg:y=\"5.838cm\" ";
   xmlstream << "      presentation:class=\"subtitle\">";
@@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation()
   xmlstream << "     </draw:text-box>";
   xmlstream << "    </draw:frame>";
   xmlstream << "    <presentation:notes draw:style-name=\"dp2\">";
-  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
-  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
+  xmlstream << "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
+  xmlstream << "     <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
   xmlstream << "      <draw:text-box/>";
   xmlstream << "     </draw:frame>";
   xmlstream << "    </presentation:notes>";
@@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") );
   CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") );
   CHECK( titlePageElement.attributeNS(presentationNS,
-    "presentation-page-layout-name",""), TQString("AL1T0") );
+    "presentation-page-tqlayout-name",""), TQString("AL1T0") );
 
   // <draw:frame> for the title frame
   KoXmlElement titleFrameElement;
@@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") );
   CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") );
   CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") );
-  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
+  CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
   CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") );
   CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation()
   CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") );
   CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false );
   CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") );
-  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
+  CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") );
   CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1887,7 +1887,7 @@ void testLargeOpenDocumentSpreadsheet()
   xmlstream << "<office:spreadsheet>";
   for( int i = 0; i < sheetCount; i++ )
   {
-    TQString sheetName = TQString("Sheet%1").arg(i+1);
+    TQString sheetName = TQString("Sheet%1").tqarg(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").arg(table+1);
+    TQString tableName = TQString("Sheet%1").tqarg(table+1);
     CHECK( tableElement.isNull(), false );
     CHECK( tableElement.isElement(), true );
     CHECK( tableElement.localName(), TQString("table") );
diff --git a/lib/kofficeui/KoBrush.h b/lib/kofficeui/KoBrush.h
index 7314649a5..1134b05ef 100644
--- a/lib/kofficeui/KoBrush.h
+++ b/lib/kofficeui/KoBrush.h
@@ -21,7 +21,7 @@
 #ifndef KOBRUSH_H
 #define KOBRUSH_H
 
-#include <brush.h>
+#include <tqbrush.h>
 
 class KoGenStyle;
 class KoGenStyles;
diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index 422e4e66b..c8b104a95 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -20,7 +20,7 @@
 #include "KoCharSelectDia.h"
 #include "KoCharSelectDia.moc"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kcharselect.h>
@@ -58,7 +58,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool
 
     charSelect = new KCharSelect( page, "", _font, _chr );
     connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
-    charSelect->resize( charSelect->sizeHint() );
+    charSelect->resize( charSelect->tqsizeHint() );
     charSelect->enableFontCombo( true );
     grid->addWidget( charSelect, 0, 0 );
 
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 8d4284dab..27c51e792 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 
 #include <kaction.h>
@@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e)
     }
 }
 
-TQSize KoListBox::sizeHint() const
+TQSize KoListBox::tqsizeHint() const
 {
   return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400),
                TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300));
@@ -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").arg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").tqarg(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").arg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").tqarg(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").arg(d->m_present->name()));
+        m_redo->setText(i18n("&Redo: %1").tqarg(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").arg(d->m_present->name()));
+            m_undo->setText(i18n("&Undo: %1").tqarg(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").arg(d->m_present->name()));
+        m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
     }
 
     if(m_commands.next()!=0) {
         if (m_redo != 0) {
             m_redo->setEnabled(true);
-            m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name()));
+            m_redo->setText(i18n("&Redo: %1").tqarg(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").arg(m_commands.current()->name()));
+            lst.append(i18n("Undo: %1").tqarg(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").arg(d->m_present->name()));
+        lst.append(i18n("Redo: %1").tqarg(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").arg(m_commands.current()->name()));
+            lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name()));
             m_commands.next();
         }
     d->m_redoListBox->insertStringList( lst );
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 89b83744b..8522da3b9 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -39,7 +39,7 @@ public:
     KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 protected:
     virtual void contentsMouseMoveEvent ( TQMouseEvent * );
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 signals:
     void changeNumberOfSelectedItem( int );
 };
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index b893037c4..82f786e87 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -23,7 +23,7 @@
 #include <tqregion.h>
 #include <tqfont.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsimplerichtext.h>
 
 #include <kpixmap.h>
@@ -61,7 +61,7 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* )
 	KPixmap pm;
 	pm.resize( height(), width() );
 	TQPainter p( &pm );
-	p.fillRect( 0, 0, height(), width(), colorGroup().background() );
+	p.fillRect( 0, 0, height(), width(), tqcolorGroup().background() );
 	p.setFont( font() );
 	p.drawText( 0, 0, height(), width(), AlignCenter, m_text );
 	p.end();
@@ -90,9 +90,9 @@ void KoHelpNavButton::paintEvent( TQPaintEvent* )
 	if ( isEnabled() )
 	{
 		if ( m_pressed )
-			p.setPen( colorGroup().highlight() );
+			p.setPen( tqcolorGroup().highlight() );
 		else
-			p.setPen( colorGroup().text() );
+			p.setPen( tqcolorGroup().text() );
 		p.drawPixmap( 1, 1, m_bitmap );
 	}
 } // KoHelpNavButton::paintEvent
@@ -142,9 +142,9 @@ void KoTinyButton::paintEvent( TQPaintEvent* )
 	if ( isEnabled() )
 	{
 		if ( m_pressed )
-			p.setPen( colorGroup().highlight() );
+			p.setPen( tqcolorGroup().highlight() );
 		else
-			p.setPen( colorGroup().text() );
+			p.setPen( tqcolorGroup().text() );
 		p.drawPixmap( width() / 2 - 2, 1, m_bitmap );
 	}
 } // KoTinyButton::paintEvent
@@ -265,20 +265,20 @@ bool KoHelpView::eventFilter( TQObject*, TQEvent* e )
 void KoHelpView::paintEvent( TQPaintEvent* )
 {
 	TQPainter p( this );
-	currentText->draw( &p, 0, 0, TQRect(), colorGroup() );
+	currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() );
 } // KoHelpView::paintEvent
 
 KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent )
 		: TQWidget( parent )
 {
-	TQGridLayout* layout = new TQGridLayout( this, 3, 3 );
-	layout->setMargin( 2 );
-	layout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
-	layout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
-	layout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
-	layout->addColSpacing( 0, 5 );
-	layout->addColSpacing( 2, 5 );
-	layout->setColStretch( 1, 1 );
+	TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 );
+	tqlayout->setMargin( 2 );
+	tqlayout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
+	tqlayout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
+	tqlayout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
+	tqlayout->addColSpacing( 0, 5 );
+	tqlayout->addColSpacing( 2, 5 );
+	tqlayout->setColStretch( 1, 1 );
 
 	m_helpView = new KoHelpView( m_helpViewport );
 	m_helpViewport->setBackgroundMode( PaletteLight );
@@ -370,20 +370,20 @@ void KoHelpWidget::stopScrolling()
 KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
 		: TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 {
-	TQGridLayout* layout = new TQGridLayout( this );
+	TQGridLayout* tqlayout = new TQGridLayout( this );
 	TQHBoxLayout* buttonLayout;
-	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	buttonLayout = new TQHBoxLayout( layout );
-	//layout->addLayout( buttonLayout, 2, 0 );
-	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
+	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	buttonLayout = new TQHBoxLayout( tqlayout );
+	//tqlayout->addLayout( buttonLayout, 2, 0 );
+	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
 	buttonLayout->add( m_close = new KoTinyButton( KoTinyButton::Close, this ) );
 	buttonLayout->add( m_sticky = new KoTinyButton( KoTinyButton::Sticky, this ) );
-	layout->addColSpacing( 2, 2 );
-	layout->addRowSpacing( 3, 2 );
-	layout->setMargin( 3 );
-	layout->setSpacing( 1 );
-	layout->setRowStretch( 1, 1 );
+	tqlayout->addColSpacing( 2, 2 );
+	tqlayout->addRowSpacing( 3, 2 );
+	tqlayout->setMargin( 3 );
+	tqlayout->setSpacing( 1 );
+	tqlayout->setRowStretch( 1, 1 );
 	buttonLayout->setSpacing( 1 );
 	setMinimumSize( 180, 180 );
 
@@ -450,7 +450,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* )
 void KoContextHelpPopup::paintEvent( TQPaintEvent* )
 {
 	TQPainter p( this );
-	p.fillRect( 0, 0, width(), height(), colorGroup().light() );
+	p.fillRect( 0, 0, width(), height(), tqcolorGroup().light() );
 	p.setPen( black );
 	p.drawRect( 0, 0, width(), height() );
 	p.fillRect( width() - 3, 0, width() - 1, height() - 1, black );
@@ -537,13 +537,13 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name )
 		: TQWidget( parent, name )
 {
 	setCaption( i18n( "Context Help" ) );
-	TQGridLayout* layout = new TQGridLayout( this );
-	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
-	layout->setMargin( 2 );
-	layout->setSpacing( 1 );
-	layout->setRowStretch( 1, 1 );
+	TQGridLayout* tqlayout = new TQGridLayout( this );
+	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
+	tqlayout->setMargin( 2 );
+	tqlayout->setSpacing( 1 );
+	tqlayout->setRowStretch( 1, 1 );
 	this->setMinimumSize( 180, 120 );
 	this->show();
 	setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 );
@@ -567,13 +567,13 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name )
 {
 	setCaption( i18n( "Context Help" ) );
 	TQWidget* mainWidget = new TQWidget( this );
-	TQGridLayout* layout = new TQGridLayout( mainWidget );
-	layout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
-	layout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
-	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
-	layout->setMargin( 2 );
-	layout->setSpacing( 1 );
-	layout->setRowStretch( 1, 1 );
+	TQGridLayout* tqlayout = new TQGridLayout( mainWidget );
+	tqlayout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
+	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
+	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
+	tqlayout->setMargin( 2 );
+	tqlayout->setSpacing( 1 );
+	tqlayout->setRowStretch( 1, 1 );
 	mainWidget->setMinimumSize( 180, 120 );
 	mainWidget->show();
 	setWidget( mainWidget );
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index 3870ede41..19fd8c924 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeversion.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include "KoEditPath.h"
@@ -75,7 +75,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons
     TQVBox *page =makeVBoxMainWidget();
     new TQLabel( i18n("Location:"), page);
     m_urlReq = new KURLRequester(page);
-    m_urlReq->setMinimumWidth( m_urlReq->sizeHint().width() * 3 );
+    m_urlReq->setMinimumWidth( m_urlReq->tqsizeHint().width() * 3 );
 
     m_urlReq->lineEdit()->setText( _path );
     m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly);
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index 399bc900f..688688c2b 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index 1f0fcff00..a889b3d86 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -25,7 +25,7 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <klocale.h>
@@ -60,7 +60,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
 
     TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox );
     group->setRadioButtonExclusive( true );
-    //group->layout();
+    //group->tqlayout();
     m_hButton = new TQRadioButton( i18n( "Horizontal" ), group );
     m_vButton = new TQRadioButton( i18n( "Vertical" ), group );
 
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 870fddc67..01f6e7452 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -69,10 +69,10 @@ private:
     int m_pos;
 };
 
-const KoGuides::SnapStatus KoGuides::SNAP_NONE = 0;
-const KoGuides::SnapStatus KoGuides::SNAP_HORIZ = 1;
-const KoGuides::SnapStatus KoGuides::SNAP_VERT = 2;
-const KoGuides::SnapStatus KoGuides::SNAP_BOTH = 3;
+const KoGuides::SnaptqStatus KoGuides::SNAP_NONE = 0;
+const KoGuides::SnaptqStatus KoGuides::SNAP_HORIZ = 1;
+const KoGuides::SnaptqStatus KoGuides::SNAP_VERT = 2;
+const KoGuides::SnaptqStatus KoGuides::SNAP_BOTH = 3;
 
 KoGuides::KoGuides( KoView *view, KoZoomHandler *zoomHandler )
 : m_view( view )
@@ -365,11 +365,11 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do
 }
 
 
-void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff )
+void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff )
 {
-    if( !(snapStatus & SNAP_VERT))
+    if( !(snaptqStatus & SNAP_VERT))
         diff.setX(10000);
-    if( !(snapStatus & SNAP_HORIZ))
+    if( !(snaptqStatus & SNAP_HORIZ))
         diff.setY(10000);
 
     for ( int i = 0; i < GL_END; ++i )
@@ -380,60 +380,60 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus,
             if ( ( *it )->orientation == Qt::Horizontal )
             {
                 double tmp = (*it)->position - rect.top();
-                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snapStatus |= SNAP_HORIZ;
+                        snaptqStatus |= SNAP_HORIZ;
                     }
                 }
                 tmp = (*it)->position - rect.bottom();
-                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snapStatus |= SNAP_HORIZ;
+                        snaptqStatus |= SNAP_HORIZ;
                     }
                 }
             }
             else
             {
                 double tmp = (*it)->position - rect.left();
-                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snapStatus |= SNAP_VERT;
+                        snaptqStatus |= SNAP_VERT;
                     }
                 }
                 tmp = (*it)->position - rect.right();
-                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snapStatus |= SNAP_VERT;
+                        snaptqStatus |= SNAP_VERT;
                     }
                 }
             }
         }
     }
 
-    if(!(snapStatus & SNAP_VERT))
+    if(!(snaptqStatus & SNAP_VERT))
         diff.setX( 0 );
 
-    if(!(snapStatus & SNAP_HORIZ))
+    if(!(snaptqStatus & SNAP_HORIZ))
         diff.setY( 0 );
 }
 
-void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff )
+void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff )
 {
-    if( !(snapStatus & SNAP_VERT))
+    if( !(snaptqStatus & SNAP_VERT))
         diff.setX(10000);
-    if( !(snapStatus & SNAP_HORIZ))
+    if( !(snaptqStatus & SNAP_HORIZ))
         diff.setY(10000);
 
     for ( int i = 0; i < GL_END; ++i )
@@ -444,34 +444,34 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus,
             if ( ( *it )->orientation == Qt::Horizontal )
             {
                 double tmp = (*it)->position - pos.y();
-                if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
+                if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.y()))
                     {
                         diff.setY( tmp );
-                        snapStatus |= SNAP_HORIZ;
+                        snaptqStatus |= SNAP_HORIZ;
                     }
                 }
             }
             else
             {
                 double tmp = (*it)->position - pos.x();
-                if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
+                if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) )
                 {
                     if(TQABS( tmp ) < TQABS(diff.x()))
                     {
                         diff.setX( tmp );
-                        snapStatus |= SNAP_VERT;
+                        snaptqStatus |= SNAP_VERT;
                     }
                 }
             }
         }
     }
 
-    if(!(snapStatus & SNAP_VERT))
+    if(!(snaptqStatus & SNAP_VERT))
         diff.setX( 0 );
 
-    if(!(snapStatus & SNAP_HORIZ))
+    if(!(snaptqStatus & SNAP_HORIZ))
         diff.setY( 0 );
 }
 
@@ -530,7 +530,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect )
 }
 
 
-void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus )
+void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus )
 {
     bool needRepaint = false;
     for ( int i = 0; i < GL_END; ++i )
@@ -538,7 +538,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStat
         TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin();
         for ( ; it != m_guideLines[i].end(); ++it )
         {
-            if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) )
+            if ( ( *it )->orientation == Qt::Horizontal && ( snaptqStatus & SNAP_HORIZ ) )
             {
                 if( virtuallyEqual( snappedPoint.y(), (*it)->position ) )
                 {
@@ -556,7 +556,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStat
             }
             else
             {
-                if ( snapStatus & SNAP_VERT )
+                if ( snaptqStatus & SNAP_VERT )
                 {
                     if( virtuallyEqual( snappedPoint.x(), (*it)->position ) )
                     {
@@ -754,7 +754,7 @@ void KoGuides::slotRemove()
 
 void KoGuides::paint()
 {
-    m_view->canvas()->repaint( false );
+    m_view->canvas()->tqrepaint( false );
 }
 
 
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index c1f66138e..b98b04728 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -58,8 +58,8 @@ public:
      */
     void paintGuides( TQPainter &painter );
 
-    typedef int SnapStatus;
-    static const SnapStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH;
+    typedef int SnaptqStatus;
+    static const SnaptqStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH;
 
     /**
      * @brief Handle mousePressEvent
@@ -148,17 +148,17 @@ public:
      * @brief Snap rect to guidelines
      *
      * This looks for a guide which is in reach for the guide as defined in snap.
-     * This method has the abillity to combine more calls. The snapStatus and diff args are both input and
-     * output. On first call you should set snapStatus to 0. The return value would then show in which
+     * This method has the abillity to combine more calls. The snaptqStatus and diff args are both input and
+     * output. On first call you should set snaptqStatus to 0. The return value would then show in which
      * directions it has snapped. If you combine several KoGuides you can let these output arguments
      * be input for the next koGuide. That way you'll always catch the nearest guide.
      *
      * @param rect the rect which should be snapped
      * @param snap the distance within the guide should snap - but always snap if already snapped
-     * @param snapStatus if horiz,vert or both directions are snapped (both in and out param). 
+     * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param). 
      * @param diff distance away from guide. Only valid if status is snapping (both in and out param)
      */
-    void snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff );
+    void snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff );
 
     /**
      * @brief Snap rect to guidelines
@@ -167,13 +167,13 @@ public:
      *
      * @param pos the position which should be snapped
      * @param snap the distance wherein the guide should snap - but always snap if already snapped
-     * @param snapStatus if horiz,vert or both directions are snapped (both in and out param)
+     * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param)
      * @param diff distance away from guide. Only valid if status is snapping (both in and out param)
      */
-    void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff );
+    void snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff );
 
     /**
-     * @brief repaint guides if any changed snapping status
+     * @brief tqrepaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
@@ -182,16 +182,16 @@ public:
     void repaintSnapping( const KoRect &snappedRect );
 
     /**
-     * @brief repaint guides if any changed snapping status
+     * @brief tqrepaint guides if any changed snapping status
      *
      * This issues a paint request if any guides have changed snapping status.
      *
      * @param snappedPoint the point after it has been snapped
      */
-    void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus );
+    void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus );
 
     /**
-     * @brief repaint guides so none is snapped
+     * @brief tqrepaint 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 repaint the guides in the paint 
+     * With this signal it is possible to only tqrepaint 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 repaint is done.
+     * This signal is emitted before and after a tqrepaint is done.
      *
      * @param state true when starting painting guides, false when stopping.
      */
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 50b04c609..342889c42 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -20,7 +20,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdebug.h>
 #include <tqlabel.h>
@@ -484,7 +484,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   else
       recentFile->insertStringList( lst);
   
-  recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   
   connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this,  TQT_SLOT( slotSelectRecentFile( const TQString & )));
 
diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp
index 1db0ee9b7..5f42caae3 100644
--- a/lib/kofficeui/KoKoolBar.cpp
+++ b/lib/kofficeui/KoKoolBar.cpp
@@ -218,7 +218,7 @@ KoKoolBarBox::KoKoolBarBox( KoKoolBar *_bar ) :
   setFrameShape( StyledPanel );
   setFrameShadow( Sunken );
   // setBackgroundMode( PaletteBase );
-  setBackgroundColor( colorGroup().background() );
+  setBackgroundColor( tqcolorGroup().background() );
 }
 
 void KoKoolBarBox::setActiveGroup( KoKoolBarGroup *_grp )
diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp
index be51e60e1..8ea3b0b96 100644
--- a/lib/kofficeui/KoPageLayoutColumns.cpp
+++ b/lib/kofficeui/KoPageLayoutColumns.cpp
@@ -23,20 +23,20 @@
 #include <KoUnitWidgets.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", layout );
+    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
-    m_preview->setPageLayout( layout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
+    m_preview->setPageLayout( tqlayout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index b9dcd6c26..8ebac1b2e 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param layout the page layout that the preview should be initialzed with.
+     * @param tqlayout the page tqlayout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
 
     /**
-     * Update the page preview widget with the param layout.
-     * @param layout the new layout
+     * Update the page preview widget with the param tqlayout.
+     * @param tqlayout the new tqlayout
      */
-    void setLayout(KoPageLayout &layout);
+    void setLayout(KoPageLayout &tqlayout);
 public slots:
 
     /**
diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui
index 07cced255..325fe45e7 100644
--- a/lib/kofficeui/KoPageLayoutColumnsBase.ui
+++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 24e32a7a5..0b410bf1d 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -34,7 +34,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( layout );
+    setPageLayout( tqlayout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set layout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &layout )
+/*=================== set tqlayout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = layout.ptWidth * resolutionX;
-    m_pageHeight = layout.ptHeight * resolutionY;
+    m_pageWidth = tqlayout.ptWidth * resolutionX;
+    m_pageHeight = tqlayout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &layout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = layout.ptLeft * resolutionX * z;
-    m_textFrameY = layout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
+    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
+    m_textFrameY = tqlayout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
 
-    repaint( true );
+    tqrepaint( true );
 }
 
-/*=================== set layout =================================*/
+/*=================== set tqlayout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
-    repaint( true );
+    tqrepaint( true );
 }
 
 /*======================== draw contents =========================*/
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& layout,
+                                  const KoPageLayout& tqlayout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = layout;
+    m_layout = tqlayout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& layout,
+                  const KoPageLayout& tqlayout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = layout;
+    m_layout = tqlayout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
+        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumn
     return res;
 }
 
-/*===================== get a standard page layout ===============*/
+/*===================== get a standard page tqlayout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
-    m_layout.ptWidth = layout.ptWidth;
-    m_layout.ptHeight = layout.ptHeight;
-    m_layout.ptLeft = layout.ptLeft;
-    m_layout.ptRight = layout.ptRight;
-    m_layout.ptTop = layout.ptTop;
-    m_layout.ptBottom = layout.ptBottom;
-    m_layout.format = layout.format;
-    m_layout.orientation = layout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
+    m_layout.ptWidth = tqlayout.ptWidth;
+    m_layout.ptHeight = tqlayout.ptHeight;
+    m_layout.ptLeft = tqlayout.ptLeft;
+    m_layout.ptRight = tqlayout.ptRight;
+    m_layout.ptTop = tqlayout.ptTop;
+    m_layout.ptBottom = tqlayout.ptBottom;
+    m_layout.format = tqlayout.format;
+    m_layout.orientation = tqlayout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(layout);
+        m_columnsTab->setLayout(tqlayout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->layout()->setSpacing(KDialog::spacingHint());
-    gHead->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
+    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
+    gHead->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->layout()->setSpacing(KDialog::spacingHint());
-    gFoot->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
+    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
+    gFoot->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->layout()->setMargin(0);
+    m_columnsTab->tqlayout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->layout()->setMargin(0);
+    m_headerTab->tqlayout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h
index 1ed23ec51..21fe7df34 100644
--- a/lib/kofficeui/KoPageLayoutDia.h
+++ b/lib/kofficeui/KoPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page layout
+     *  set page tqlayout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the layout of the paper during printing.
+ *  With this dialog the user can specify the tqlayout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param layout   The layout.
+     *  @param tqlayout   The tqlayout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& layout,
+             const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param layout     The layout.
+     *  @param tqlayout     The tqlayout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& layout,
+             const KoPageLayout& tqlayout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page layout dialog.
+     *  Show page tqlayout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page layout.
+     *  Retrieves a standard page tqlayout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the layout
+     *  Returns the tqlayout
      */
-    const KoPageLayout& layout() const { return m_layout; }
+    const KoPageLayout& tqlayout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // layout
+    // tqlayout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &layout);
+    void sizeUpdated(KoPageLayout &tqlayout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/lib/kofficeui/KoPageLayoutHeader.cpp b/lib/kofficeui/KoPageLayoutHeader.cpp
index 5878ead52..002969573 100644
--- a/lib/kofficeui/KoPageLayoutHeader.cpp
+++ b/lib/kofficeui/KoPageLayoutHeader.cpp
@@ -20,7 +20,7 @@
 #include <KoPageLayoutHeader.moc>
 #include <KoUnitWidgets.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf)
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index 7f36378e4..b3bd79783 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 0e8e034c1..6ddf9409e 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -28,15 +28,15 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqhbox.h>
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent), m_blockSignals(false) {
-    m_layout = layout;
+    m_layout = tqlayout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -61,7 +61,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     else {
         TQString str=KoUnit::unitDescription(unit);
 
-        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this );
+        TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this );
         grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft );
     }
 
@@ -130,7 +130,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
@@ -160,9 +160,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout,
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
     grid1->addWidget( spacer1, 4, 0 );
     grid1->addWidget( spacer2, 4, 1 );
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index 6d50e014b..d917b349f 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param layout the page layout that this widget should be initialzed with.
+     * @param tqlayout the page tqlayout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -78,11 +78,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param layout the update layout structure with currently displayed info.
+     * @param tqlayout the update tqlayout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &layout);
+    void propertyChange(KoPageLayout &tqlayout);
 
 protected:
     TQComboBox *cpgFormat;
diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp
index 17bda1e34..ca24b89ad 100644
--- a/lib/kofficeui/KoPartSelectAction.cpp
+++ b/lib/kofficeui/KoPartSelectAction.cpp
@@ -64,7 +64,7 @@ void KoPartSelectAction::init()
 // Called when selecting a part
 void KoPartSelectAction::slotActionActivated()
 {
-    TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+    TQString servName = TQString::tqfromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
     KService::Ptr serv = KService::serviceByName( servName );
     m_documentEntry = KoDocumentEntry( serv );
     emit activated();
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index 144b8a08d..b5271b971 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -56,7 +56,7 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) :
 
     selectionChanged( 0 );
     setFocus();
-    resize( listview->sizeHint().width() + 20, 300 );
+    resize( listview->tqsizeHint().width() + 20, 300 );
 }
 
 void KoPartSelectDia::selectionChanged( TQListViewItem *item )
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index e06f2127c..7baed8f9d 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <tqbitmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfileinfo.h>
 #include <tqpainter.h>
 #include <tqscrollview.h>
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index b11b06047..212becd79 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -44,7 +44,7 @@ public:
     bool whileMovingBorderLeft, whileMovingBorderRight;
     bool whileMovingBorderTop, whileMovingBorderBottom;
     TQPixmap pmFirst, pmLeft;
-    KoPageLayout layout;
+    KoPageLayout tqlayout;
     KoTabChooser *tabChooser;
     KoTabulatorList tabList;
     // Do we have to remove a certain tab in the DC Event?
@@ -93,7 +93,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->canvas = _canvas;
     orientation = _orientation;
-    d->layout = _layout;
+    d->tqlayout = _layout;
     d->flags = _flags;
 
     d->m_bReadWrite=true;
@@ -125,11 +125,11 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->removeTab.type = T_INVALID;
     if ( orientation == Qt::Horizontal ) {
-        frameStart = tqRound( zoomIt(d->layout.ptLeft) );
-        d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) );
+        frameStart = tqRound( zoomIt(d->tqlayout.ptLeft) );
+        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptWidth - d->tqlayout.ptRight) );
     } else {
-        frameStart = tqRound( zoomIt(d->layout.ptTop) );
-        d->frameEnd = tqRound( zoomIt(d->layout.ptHeight - d->layout.ptBottom) );
+        frameStart = tqRound( zoomIt(d->tqlayout.ptTop) );
+        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptHeight - d->tqlayout.ptBottom) );
     }
     m_bFrameStartSet = false;
 
@@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Use a double-buffer pixmap
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalw = tqRound( zoomIt(d->layout.ptWidth) );
+    int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) );
     TQString str;
 
-    p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
+    p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
 
     // Draw white rect
     TQRect r;
@@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
     // Draw ending bar (at page width)
     //int constant=zoomIt(1);
     //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 );
-    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 );
 
     // Draw starting bar (at 0)
-    //p.setPen( colorGroup().color( TQColorGroup::Text ) );
+    //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
     //p.drawLine( -diffx, 1, -diffx, height() - 1 );
-    //p.setPen( colorGroup().color( TQColorGroup::Base ) );
+    //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
     //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 );
 
     // Draw the indents triangles
@@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( colorGroup().color( TQColorGroup::Text ) );
+        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
         p.drawLine( mposX, 1, mposX, height() - 1 );
     }
     hasToDelete = false;
@@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
 {
     int ptPos = 0;
 
-    _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
+    _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) );
     // Check if we're in a mousemove event, removing a tab.
     // In that case, we'll have to skip drawing that one.
     bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID;
@@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter )
             _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 );
             _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 );
             _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3,
-                               colorGroup().color( TQColorGroup::Text ) );
+                               tqcolorGroup().color( TQColorGroup::Text ) );
         } break;
         default: break;
         }
@@ -371,9 +371,9 @@ void KoRuler::drawVertical( TQPainter *_painter )
     resize( TQMAX( fm.height() + 4, 20 ), height() );
 
     TQPainter p( &buffer );
-    p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+    p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalh = tqRound( zoomIt(d->layout.ptHeight) );
+    int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) );
     // Clip rect - this gives basically always a rect like (2,2,width-2,height-2)
     TQRect paintRect = _painter->clipRegion( TQPainter::CoordPainter ).boundingRect();
     // Ruler rect
@@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter )
     if ( paintRect.intersects( rulerRect ) )  {
         TQString str;
 
-        p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
+        p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) );
 
         // Draw white rect
         TQRect r;
@@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter )
 
         // Draw ending bar (at page height)
         //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 );
-        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy );
 
         // Draw starting bar (at 0)
-        //p.setPen( colorGroup().color( TQColorGroup::Text ) );
+        //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
         //p.drawLine( 1, -diffy, width() - 1, -diffy );
-        //p.setPen( colorGroup().color( TQColorGroup::Base ) );
+        //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) );
         //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 );
     }
 
     // Show the mouse position
     if ( d->action == A_NONE && showMPos ) {
-        p.setPen( colorGroup().color( TQColorGroup::Text ) );
+        p.setPen( tqcolorGroup().color( TQColorGroup::Text ) );
         p.drawLine( 1, mposY, width() - 1, mposY );
     }
     hasToDelete = false;
@@ -598,7 +598,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
         if ( d->canvas )
             drawLine(d->oldMx, -1);
         update();
-        emit newPageLayout( d->layout );
+        emit newPageLayout( d->tqlayout );
     } else if ( d->action == A_BR_TOP || d->action == A_BR_BOTTOM ) {
         d->whileMovingBorderTop = false;
         d->whileMovingBorderBottom = false;
@@ -610,7 +610,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
             p.end();
         }
         update();
-        emit newPageLayout( d->layout );
+        emit newPageLayout( d->tqlayout );
     } else if ( d->action == A_FIRST_INDENT ) {
         if ( d->canvas )
             drawLine(d->oldMx, -1);
@@ -667,12 +667,12 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
     hasToDelete = false;
 
     int pw = d->frameEnd - frameStart;
-    int ph = tqRound(zoomIt(d->layout.ptHeight));
+    int ph = tqRound(zoomIt(d->tqlayout.ptHeight));
     int left = frameStart - diffx;
-    int top = tqRound(zoomIt(d->layout.ptTop));
+    int top = tqRound(zoomIt(d->tqlayout.ptTop));
     top -= diffy;
     int right = d->frameEnd - diffx;
-    int bottom = tqRound(zoomIt(d->layout.ptBottom));
+    int bottom = tqRound(zoomIt(d->tqlayout.ptBottom));
     bottom = ph - bottom - diffy;
     // Cumulate first-line-indent
     int ip_first = tqRound( zoomIt( i_first + ( d->rtl ? d->i_right : i_left) ) );
@@ -693,13 +693,13 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                 /////// ######
                 // At the moment, moving the left and right border indicators
                 // is disabled when setFrameStartEnd has been called (i.e. in KWord)
-                // Changing the layout margins directly from it would be utterly wrong
+                // Changing the tqlayout margins directly from it would be utterly wrong
                 // (just try the 2-columns modes...). What needs to be done is:
                 // emitting a signal frameResized in mouseReleaseEvent, when a left/right
                 // border has been moved, and in kword we need to update the margins from
                 // there, if the left border of the 1st column or the right border of the
                 // last column was moved... and find what to do with the other borders.
-                // And for normal frames, resize the frame without touching the page layout.
+                // And for normal frames, resize the frame without touching the page tqlayout.
                 // All that is too much for now -> disabling.
                 if ( !m_bFrameStartSet )
                 {
@@ -747,7 +747,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_LEFT: {
                         if ( d->canvas && mx < right-10 && mx+diffx-2 > 0) {
                             drawLine( d->oldMx, mx );
-                            d->layout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
+                            d->tqlayout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -770,7 +770,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_RIGHT: {
                         if ( d->canvas && mx > left+10 && mx+diffx <= pw-2) {
                             drawLine( d->oldMx, mx );
-                            d->layout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
+                            d->tqlayout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -895,7 +895,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->layout.ptTop = unZoomIt(static_cast<double>(my + diffy));
+                            d->tqlayout.ptTop = unZoomIt(static_cast<double>(my + diffy));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -910,7 +910,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->layout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
+                            d->tqlayout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -984,7 +984,7 @@ void KoRuler::handleDoubleClick()
 
     // Double-clicked nothing
     d->action = A_NONE;
-    emit doubleClicked(); // usually page layout dialog
+    emit doubleClicked(); // usually page tqlayout dialog
 }
 
 void KoRuler::setTabList( const KoTabulatorList & _tabList )
@@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i )
     }
 }
 
-TQSize KoRuler::minimumSizeHint() const
+TQSize KoRuler::tqminimumSizeHint() const
 {
     TQSize size;
     TQFont font = KGlobalSettings::toolBarFont();
@@ -1188,14 +1188,14 @@ TQSize KoRuler::minimumSizeHint() const
     return size;
 }
 
-TQSize KoRuler::sizeHint() const
+TQSize KoRuler::tqsizeHint() const
 {
-    return minimumSizeHint();
+    return tqminimumSizeHint();
 }
 
 void KoRuler::setPageLayout( const KoPageLayout& _layout )
 {
-    d->layout = _layout;
+    d->tqlayout = _layout;
     update();
 }
 
diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h
index 352e6820d..5cea5678f 100644
--- a/lib/kofficeui/KoRuler.h
+++ b/lib/kofficeui/KoRuler.h
@@ -96,7 +96,7 @@ class KoRulerPrivate;
  * and supports zooming, tabulators, paragraph indents, showing the mouse position, etc.
  *
  * It also offers a popupmenu upon right-clicking, for changing the unit,
- * the page layout, or removing a tab.
+ * the page tqlayout, or removing a tab.
  */
 class KOFFICEUI_EXPORT KoRuler : public TQFrame
 {
@@ -139,7 +139,7 @@ public:
     const double& zoom() const { return m_zoom; }
 
     /**
-     * Set the page layout, see @ref KoPageLayout.
+     * Set the page tqlayout, see @ref KoPageLayout.
      * This defines the size of the page and the margins,
      * from which the size of the ruler is deducted.
      */
@@ -246,12 +246,12 @@ public:
     /**
      * Reimplemented from TQWidget
      */
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     /**
      * Reimplemented from TQWidget
      */
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 signals:
     void newPageLayout( const KoPageLayout & );
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 02c34f2d4..e33ce12c2 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -37,7 +37,7 @@
 // TODO
 // improvement possibilities
 // - use offscreen buffer to reduce flicker even more
-// - keep track of tabs, only (re)layout when necessary
+// - keep track of tabs, only (re)tqlayout when necessary
 // - paint all tabs to buffer, show only by shifting
 // - customizable button pixmaps
 // - use TQStyle to paint the tabs & buttons (is it good/possible?)
@@ -57,7 +57,7 @@ public:
     // read-only: no mouse drag, double-click, right-click
     bool readOnly;
     
-    // if true, layout is from right to left
+    // if true, tqlayout is from right to left
     bool reverseLayout;
 
     // list of all tabs, in order of appearance
@@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString&
     painter.save();
 
     // fill it first  
-    TQBrush bg = tabbar->colorGroup().background();
-    if( active ) bg = TQBrush(tabbar->colorGroup().base());
+    TQBrush bg = tabbar->tqcolorGroup().background();
+    if( active ) bg = TQBrush(tabbar->tqcolorGroup().base());
     painter.setBrush( bg );
     painter.setPen( TQPen( TQt::NoPen ) );
     painter.drawPolygon( polygon );
 
     // draw the lines
-    painter.setPen( tabbar->colorGroup().dark() );
+    painter.setPen( tabbar->tqcolorGroup().dark() );
     if( !active )
       painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() );
     // TQt4: painter.setRenderHint( TQPainter::Antialiasing );
     painter.drawPolyline( polygon );
 
-    painter.setPen( tabbar->colorGroup().buttonText() );
+    painter.setPen( tabbar->tqcolorGroup().buttonText() );
     TQFont f = painter.font();
     if( active ) f.setBold( true );
     painter.setFont( f );
@@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
     TQPainter painter;
     TQPixmap pm( size() );
-    pm.fill( colorGroup().background() );
-    painter.begin( TQT_TQPAINTDEVICE(&pm), this );
+    pm.fill( tqcolorGroup().background() );
+    painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
 
-    painter.setPen( colorGroup().dark() );
+    painter.setPen( tqcolorGroup().dark() );
     painter.drawLine( 0, 0, width(), 0 );
 
     if( !d->reverseLayout )
@@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* )
     update();
 }
 
-TQSize KoTabBar::sizeHint() const
+TQSize KoTabBar::tqsizeHint() const
 {
-    return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
+    return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
 }
 
 void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name )
diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h
index 0c4233b4e..39cf03b8c 100644
--- a/lib/kofficeui/KoTabBar.h
+++ b/lib/kofficeui/KoTabBar.h
@@ -219,7 +219,7 @@ public slots:
      */
     void clear();
     
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 signals:
 
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index 19d937646..ed891e890 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;
 	}
-	repaint( true );
+	tqrepaint( true );
     } break;
     case Qt::RightButton: {
 	TQPoint pnt( TQCursor::pos() );
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index fb9a0591a..31ad0f859 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; repaint( true ); }
-    void rbCenter() { currType = TAB_CENTER; repaint( true ); }
-    void rbRight() { currType = TAB_RIGHT; repaint( true ); }
-    void rbDecPoint() { currType = TAB_DEC_PNT; repaint( true ); }
+    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 ); }
 
 };
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 6fe4f5501..1e5261330 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -47,7 +47,7 @@
 #include <kaboutdata.h>
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -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." ).arg( url.path() ) );
+                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
                 }
             }
             return ok;
@@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate {
 	// choose a file
 	MyFileDialog *m_filedialog;
 
-	// for the layout
+	// for the tqlayout
 	TQTabWidget* tabWidget;
 	TQWidget* newTab;
 	TQWidget* existingTab;
@@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const {
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout)
+void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
 {
 
         d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files");
         // I prefer the icons to be in "most recent first" order (DF)
         d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) );
-        layout->addWidget(d->m_recent,0,0);
+        tqlayout->addWidget(d->m_recent,0,0);
 
         TQString oldGroup = d->m_instance->config()->group();
         d->m_instance->config()->setGroup( "RecentFiles" );
@@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
         int i = 0;
         TQString value;
         do {
-                TQString key=TQString( "File%1" ).arg( i );
+                TQString key=TQString( "File%1" ).tqarg( i );
                 value=d->m_instance->config()->readPathEntry( key );
                 if ( !value.isEmpty() ) {
                     // Support for tdelibs-3.5's new RecentFiles format: name[url]
@@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout)
+void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
 {
     TQString dir = TQString();
     TQPoint point( 0, 0 );
@@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 	    "file dialog",
 	    false);
 
-    layout->addWidget(d->m_filedialog,0,0);
+    tqlayout->addWidget(d->m_filedialog,0,0);
     d->m_filedialog->reparent( widgetbase , point );
     //d->m_filedialog->setOperationMode( KFileDialog::Opening);
 
@@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout)
+void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
 {
 
     d->m_jwidget = new KJanusWidget(
 	    widgetbase,
 	    "kjanuswidget",
 	    KJanusWidget::IconList);
-    layout->addWidget(d->m_jwidget,0,0);
+    tqlayout->addWidget(d->m_jwidget,0,0);
 
     d->boxdescription = new TQVGroupBox(
 	    i18n("Selected Template"),
 	    widgetbase,
 	    "boxdescription");
-    layout->addWidget(d->boxdescription, 1, 0 );
+    tqlayout->addWidget(d->boxdescription, 1, 0 );
 
     // config
     KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
@@ -429,11 +429,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 		group->name(),
 		group->first()->loadPicture(d->m_instance));
 
-	TQGridLayout * layout = new TQGridLayout(frame);
+	TQGridLayout * tqlayout = new TQGridLayout(frame);
 	KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame );
-	layout->addWidget(canvas,0,0);
+	tqlayout->addWidget(canvas,0,0);
 
-	canvas->setBackgroundColor( colorGroup().base() );
+	canvas->setBackgroundColor( tqcolorGroup().base() );
 	canvas->setResizeMode(TQIconView::Adjust);
 	canvas->setWordWrapIconText( true );
 	canvas->show();
@@ -478,10 +478,10 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     currentChanged(itemtoselect);
 
     // setup the checkbox
-    TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
+    TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName);
 
     d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
-    layout->addWidget(d->m_nodiag, 2, 0);
+    tqlayout->addWidget(d->m_nodiag, 2, 0);
     TQString  startwithoutdialog = grp.readEntry( "NoStartDlg" );
     bool ischecked = startwithoutdialog == TQString("yes");
 
@@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk()
 	static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" };
 	if ( d->m_returnType <= Empty )
 	{
-	    grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) );
+	    grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) );
 	    if (d->m_returnType == Template)
 	    {
 		grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() );
@@ -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." ).arg( url.path() ) );
+			KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
 			return false;
 		}
 		d->m_fullTemplateName = url.url();
@@ -793,12 +793,12 @@ 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 ").arg(toolTipText), 0,
+    toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0,
                           "myToolTip",
                           WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
     toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
     toolTip->setLineWidth( 1 );
-    toolTip->setAlignment( AlignLeft | AlignTop );
+    toolTip->tqsetAlignment( AlignLeft | AlignTop );
     toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) );
     toolTip->adjustSize();
     TQRect screen = TQApplication::desktop()->screenGeometry(
@@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
         toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y());
     }
     toolTip->setFont( TQToolTip::font() );
-    toolTip->setPalette( TQToolTip::palette(), TRUE );
+    toolTip->tqsetPalette( TQToolTip::palette(), TRUE );
     toolTip->show();
 }
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 9363477d7..677c11b19 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -236,9 +236,9 @@ private:
 
     TQString descriptionText(const TQString &name, const TQString &description);
     void setupDialog();
-    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout);
-    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout);
-    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout);
+    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
+    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
+    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
     bool collectInfo();
     bool noStartupDlg() const;
 
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 53770a42f..6243b9dcb 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -23,7 +23,7 @@
 #include <KoTemplateCreateDia.h>
 
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqradiobutton.h>
@@ -142,15 +142,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     TQVBoxLayout *rightbox=new TQVBoxLayout(mbox);
     TQGroupBox *pixbox=new TQGroupBox(i18n("Picture"), mainwidget);
     rightbox->addWidget(pixbox);
-    TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
+    TQVBoxLayout *pixtqlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
                                            KDialogBase::spacingHint());
-    pixlayout->addSpacing(pixbox->fontMetrics().height()/2);
-    pixlayout->addStretch(1);
+    pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2);
+    pixtqlayout->addStretch(1);
     d->m_default=new TQRadioButton(i18n("&Default"), pixbox);
     d->m_default->setChecked(true);
     connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault()));
-    pixlayout->addWidget(d->m_default);
-    TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout);
+    pixtqlayout->addWidget(d->m_default);
+    TQHBoxLayout *custombox=new TQHBoxLayout(pixtqlayout);
     d->m_custom=new TQRadioButton(i18n("Custom"), pixbox);
     d->m_custom->setChecked(false);
     connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom()));
@@ -159,19 +159,19 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect()));
     custombox->addWidget(d->m_select, 1);
     custombox->addStretch(1);
-    pixlayout->addStretch(1);
+    pixtqlayout->addStretch(1);
     label=new TQLabel(i18n("Preview:"), pixbox);
-    pixlayout->addWidget(label);
-    TQHBoxLayout *previewbox=new TQHBoxLayout(pixlayout);
+    pixtqlayout->addWidget(label);
+    TQHBoxLayout *previewbox=new TQHBoxLayout(pixtqlayout);
     previewbox->addStretch(10);
     d->m_preview=new TQLabel(pixbox); // setPixmap() -> auto resize?
     previewbox->addWidget(d->m_preview);
     previewbox->addStretch(10);
-    pixlayout->addStretch(8);
+    pixtqlayout->addStretch(8);
 
     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").arg(instance->aboutData()->programName() ) );
+    TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").tqarg(instance->aboutData()->programName() ) );
     rightbox->addWidget( d->m_defaultTemplate );
 
     enableButtonOK(false);
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index 556dce023..db4d6467c 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqtoolbar.h>
 #include <tqdockwindow.h>
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 7b31d8478..764ce4c11 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -104,7 +104,7 @@ public:
     TQWidget* getNextParent();
 
 private:
-    TQPtrList<TQWidget>  m_children;
+    TQPtrList<TQWidget>  m_tqchildren;
     TQBoxLayout        *m_layout;
 
     TQWidget           *m_leftRow;
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index abe449b28..7260bbea6 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -53,12 +53,12 @@ KoColorPanel::~KoColorPanel()
 {
 }
 
-TQSize KoColorPanel::sizeHint() const
+TQSize KoColorPanel::tqsizeHint() const
 {
-    return minimumSizeHint();
+    return tqminimumSizeHint();
 }
 
-TQSize KoColorPanel::minimumSizeHint() const
+TQSize KoColorPanel::tqminimumSizeHint() const
 {
     return TQSize( COLS << 4, lines() << 4 );
 }
@@ -109,7 +109,7 @@ void KoColorPanel::clear()
     if ( m_colorMap.isEmpty() )
         return;
 
-    TQSize area( minimumSizeHint() );
+    TQSize area( tqminimumSizeHint() );
     m_colorMap.clear();
     init();
     updateGeometry();
@@ -136,7 +136,7 @@ void KoColorPanel::insertDefaultColors()
         return;
     m_defaultsAdded = true;
 
-    int currentRow = m_nextPosition.y; // we have to repaint this row below
+    int currentRow = m_nextPosition.y; // we have to tqrepaint 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 repaint anyway
+    finalizeInsertion( m_nextPosition );  // with a no-op paint() call as we tqrepaint anyway
     updateGeometry();
-    // we have to repaint the "old" current row explicitly due
+    // we have to tqrepaint the "old" current row explicitly due
     // to WStaticContents
     update( 0, currentRow << 4, COLS << 4, 16 );
 }
@@ -369,7 +369,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
     if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 &&
          mapFromPosition( m_focusPosition ).intersects( e->rect() ) )
         tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
-                               colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
+                               tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
 
     --lns;  // Attention: We just avoid some lns - 1 statements
 
@@ -580,7 +580,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
     if ( it != m_colorMap.end() ) {
         // draw at the new focus position
         tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
-                               colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
+                               tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
         p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() );
     }
 
@@ -663,21 +663,21 @@ KoToolButton::~KoToolButton()
 {
 }
 
-TQSize KoToolButton::sizeHint() const
+TQSize KoToolButton::tqsizeHint() const
 {
-    return minimumSizeHint();
+    return tqminimumSizeHint();
 }
 
-TQSize KoToolButton::minimumSizeHint() const
+TQSize KoToolButton::tqminimumSizeHint() const
 {
-    TQSize size = KToolBarButton::minimumSizeHint();
+    TQSize size = KToolBarButton::tqminimumSizeHint();
     size.setWidth( size.width() + ARROW_WIDTH );
     return size;
 }
 
-TQSize KoToolButton::minimumSize() const
+TQSize KoToolButton::tqminimumSize() const
 {
-    return minimumSizeHint();
+    return tqminimumSizeHint();
 }
 
 void KoToolButton::colorSelected( const TQColor& color )
@@ -691,7 +691,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
     TQStyle::SCFlags active = TQStyle::SC_None;
     TQStyle::SCFlags arrowActive = TQStyle::SC_None;
     TQStyleOption opt;
-    TQColorGroup cg( colorGroup() );
+    TQColorGroup cg( tqcolorGroup() );
 
     if ( isEnabled() ) {
   	flags |= TQStyle::Style_Enabled;
@@ -712,10 +712,10 @@ void KoToolButton::drawButton(TQPainter *_painter)
 
     // Draw styled toolbuttons
     _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() );
-    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
+    tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
                                 flags, TQStyle::SC_ToolButton, active, opt );
     _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() );
-    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
+    tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
                                 arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt );
     _painter->setClipping( false );
 
@@ -724,7 +724,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
                            cg, flags, opt );
 
     if ( KToolBarButton::isRaised() || m_arrowPressed )
-        qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true );
+        qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, tqcolorGroup(), true );
 
     int dx, dy;
     TQFont tmp_font( KGlobalSettings::toolBarFont() );
@@ -798,11 +798,11 @@ void KoToolButton::drawButton(TQPainter *_painter)
     if (!textLabel().isNull() && !textRect.isNull()) {
         _painter->setFont( KGlobalSettings::toolBarFont() );
         if ( !isEnabled() )
-            _painter->setPen( palette().disabled().dark() );
+            _painter->setPen( tqpalette().disabled().dark() );
         else if( KToolBarButton::isRaised() )
             _painter->setPen( KGlobalSettings::toolBarHighlightColor() );
         else
-            _painter->setPen( colorGroup().buttonText() );
+            _painter->setPen( tqcolorGroup().buttonText() );
         _painter->drawText( textRect, textFlags, textLabel() );
     }
 }
@@ -838,15 +838,15 @@ void KoToolButton::init()
     // We are interested in the mouse clicks on the arrow button
     m_popup->installEventFilter( this );
 
-    ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
+    ARROW_WIDTH = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
     kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl;
 }
 
 void KoToolButton::buttonShift( int& dx, int& dy )
 {
     if ( isDown() && !m_arrowPressed ) {
-        dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal );
-        dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical );
+        dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal );
+        dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical );
     }
 }
 
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 804b270b6..1374f6d28 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -34,8 +34,8 @@ public:
     KoColorPanel( TQWidget* parent = 0, const char* name = 0 );
     virtual ~KoColorPanel();
 
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     enum MenuStyle { Plain, CustomColors };
     static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor,
@@ -163,9 +163,9 @@ public:
 
     virtual ~KoToolButton();
 
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
-    virtual TQSize minimumSize() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize tqminimumSize() const;
 
 public slots:
     void colorSelected( const TQColor& color );
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index a5af7bdf7..476e35b34 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 // ----------------------------------------------------------------
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -223,7 +223,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -235,7 +235,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    setAlignment( TQt::AlignRight );
+    tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     setValidator( m_validator );
     setUnit( unit );
@@ -287,7 +287,7 @@ double KoUnitDoubleLineEdit::value( void ) const
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    lineEdit()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -300,7 +300,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    lineEdit()->setAlignment( TQt::AlignRight );
+    lineEdit()->tqsetAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
@@ -379,48 +379,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
-    //layout->setMargin( 2 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
+    //tqlayout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    layout->addWidget( up, 0, 0 );
+    tqlayout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    layout->addWidget( down, 1, 0 );
+    tqlayout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index df1bac4d8..7f9e41392 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%").arg(*it) );
+    values.append( i18n("%1%").tqarg(*it) );
   setItems( values );
   
-  TQString zoomStr = i18n("%1%").arg( zoom );
+  TQString zoomStr = i18n("%1%").tqarg( zoom );
   setCurrentItem( values.findIndex( zoomStr ) );
 }
 
@@ -92,21 +92,21 @@ void KoZoomAction::init()
   setEditable( true );
     
   TQStringList values;
-  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");
+  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");
   setItems( values );
   
-  setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) );
+  setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) );
   
   connect( this, TQT_SIGNAL( activated( const TQString& ) ), 
     TQT_SLOT( activated( const TQString& ) ) );
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index c2d86aa6f..c812c1c6b 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -24,7 +24,7 @@
 #include <tqbitmap.h>
 #include <tqwhatsthis.h>
 #include <tqmenubar.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kpopupmenu.h>
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index e09ef63d4..c0da86e93 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -266,7 +266,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
             menu->setItemEnabled( id, false );
 
         if ( !whatsThis().isEmpty() )
-            menu->setWhatsThis( id, whatsThisWithIcon() );
+            menu->tqsetWhatsThis( id, whatsThisWithIcon() );
 
         addContainer( menu, id );
         connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
@@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const
 {
     TQString text = whatsThis();
     if (!icon().isEmpty())
-      return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(icon()).arg(text);
+      return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text);
     return text;
 }
 
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index 4739ee819..729285bb8 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
@@ -36,19 +36,19 @@
 
 TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name )
 {
-    setCaption( TQString::fromLatin1( "KColorAction test application" ) );
+    setCaption( TQString::tqfromLatin1( "KColorAction test application" ) );
 
     TQWidget *w = new TQWidget( this );
     setCentralWidget( w );
 
     TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() );
-    TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w );
+    TQGroupBox* b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 1" ), w );
     panel = new KoColorPanel( b1, "panel1" );
     connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) );
     //panel->insertDefaultColors();
     l->addWidget( b1 );
 
-    b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 2" ), w );
+    b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 2" ), w );
 
     ( void ) new KoColorPanel( b1, "panel2" );
     l->addWidget( b1 );
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index c62b77459..6a7d198a7 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -22,7 +22,7 @@
 #include "tkcombobox.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <ktoolbar.h>
 #include <kiconloader.h>
@@ -120,19 +120,19 @@ void TKAction::updateLayout()
   }
 }
 
-TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
 {
   TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
   TQLabel* textLabel = new TQLabel(base,"text");
   textLabel->setMinimumHeight(1);
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
-  children->reparent(base,TQPoint(0,0));
-  children->setName("widget");
-  TQHBoxLayout* layout = new TQHBoxLayout(base,0,3);
-  layout->setResizeMode(TQLayout::Minimum);
-  layout->addWidget(textLabel);
-  layout->addWidget(pixLabel);
-  layout->addWidget(children,1);
+  tqchildren->reparent(base,TQPoint(0,0));
+  tqchildren->setName("widget");
+  TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
+  tqlayout->setResizeMode(TQLayout::Minimum);
+  tqlayout->addWidget(textLabel);
+  tqlayout->addWidget(pixLabel);
+  tqlayout->addWidget(tqchildren,1);
 
   updateLayout(base);
   return base;
@@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base)
   } else
     pixLabel->hide();
 
-  base->setFixedWidth( w->sizeHint().width() +
-                       (textLabel->isVisible() ? textLabel->sizeHint().width():0) +
-                       (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) );
+  base->setFixedWidth( w->tqsizeHint().width() +
+                       (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) +
+                       (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) );
 }
 /******************************************************************************/
 TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name )
@@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index)
 
     TKComboBox* cb = new TKComboBox(m_editable,bar);
     initComboBox(cb);
-    cb->setMinimumWidth( cb->sizeHint().width() );
+    cb->setMinimumWidth( cb->tqsizeHint().width() );
     TQWidget* base = createLayout(bar,cb);
 
     bar->insertWidget( id_, 100, base, index );
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index b9a84a416..26b4069da 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* children);
+  TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren);
   void updateLayout();
   virtual void updateLayout(TQWidget*);
 
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index a425421c4..1449d0fbb 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -22,7 +22,7 @@
 #include "tkcoloractions.h"
 #include "tktoolbarbutton.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <kcolordialog.h>
 #include <ktoolbar.h>
 #include <tqpainter.h>
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index cd20f7901..d1cb7ac20 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -59,7 +59,7 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   int bh = height()-4;
 
   TQPainter p( this );
-  const TQColorGroup& g = colorGroup();
+  const TQColorGroup& g = tqcolorGroup();
 
   TQRect fr(2,2,width()-4,height()-4);
 
@@ -87,8 +87,8 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   TQPixmap pixmap(arrow_down);
 
 
-  tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() );
-  tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
+  tqstyle().tqdrawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), tqcolorGroup() );
+  tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, tqcolorGroup(), isEnabled(), &pixmap, TQString() );
 
   if ( hasFocus()) {
     tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index 5f829589e..b0520a2c1 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;
-  repaint(false);
+  tqrepaint(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;
-  repaint(false);
+  tqrepaint(false);
 }
 
 void TKToolBarButton::setAutoRaised(bool f)
@@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *)
     } else {
       TQToolButton::setPixmap(disabledPixmap);
     }
-    repaint(false);
+    tqrepaint(false);
   }
 }
 
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;
@@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p )
 #define DRAW_PIXMAP_AND_TEXT \
   int x = 3;\
   if (pixmap()) {\
-    tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\
+    tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\
     if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\
       x += pixmap()->width() + 3;\
     }\
   }\
   if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\
     TQFontMetrics fm(KGlobalSettings::toolBarFont());\
-    tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
+    tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\
   }
 
   const char* arrow[] = {
@@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p )
             if (d->m_isRaised)	flags |= TQStyle::Style_Raised;
             if (hasFocus())	flags |= TQStyle::Style_HasFocus;
 
-            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() );
+            tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
+            tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
+            tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() );
             if ( d->m_isRaised )
-                qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true );
+                qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true );
             DRAW_PIXMAP_AND_TEXT
         } else {
-            tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
+            tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
             DRAW_PIXMAP_AND_TEXT
             int z = f ? 1:0;
             p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix);
         }
     } else {
-        tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
+        tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
         DRAW_PIXMAP_AND_TEXT
     }
 }
@@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &)
     TQToolButton::setPixmap( disabledPixmap );
   else
     TQToolButton::setPixmap( defaultPixmap );
-  repaint(false);
+  tqrepaint(false);
 }
 
 void TKToolBarButton::makeDefaultPixmap()
@@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap()
   disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState);
 }
 
-TQSize TKToolBarButton::sizeHint() const
+TQSize TKToolBarButton::tqsizeHint() const
 {
-    return minimumSize();
+    return tqminimumSize();
 }
 
-TQSize TKToolBarButton::minimumSizeHint() const
+TQSize TKToolBarButton::tqminimumSizeHint() const
 {
-    return minimumSize();
+    return tqminimumSize();
 }
 
 void TKToolBarButton::showMenu()
@@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled()
 void TKToolBarButton::on(bool flag)
 {
   d->m_isOn = flag;
-  repaint();
+  tqrepaint();
 }
 
 void TKToolBarButton::toggle()
@@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag)
     disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
 
   modeChange();
-  repaint();
+  tqrepaint();
 }
 
 void TKToolBarButton::setIconMode( TK::IconMode m )
 {
   d->m_iconMode = m;
   modeChange();
-  repaint();
+  tqrepaint();
 }
 
 #include <tktoolbarbutton.moc>
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 883d7811d..3cec2f575 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -180,8 +180,8 @@ public:
 
   TQPixmap getActivePixmap() const;
 
-  virtual TQSize sizeHint() const;
-  virtual TQSize minimumSizeHint() const;
+  virtual TQSize tqsizeHint() const;
+  virtual TQSize tqminimumSizeHint() const;
 
 signals:
   void buttonClicked();
diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc
index dc70b9218..e2406a796 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cc
@@ -21,7 +21,7 @@
 #include "koColorChooser.h"
 
 #include <tqcolor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqtabwidget.h>
 
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index 6e7c0239e..6c1f82307 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;
-  repaint();
+  tqrepaint();
 }
 
 void KoColorFrame::slotSetColor2(const TQColor &c)
 {
   mC2 = c;
   mColorChanged = true;
-  repaint();
+  tqrepaint();
 }
 
 void KoColorFrame::drawContents(TQPainter *p)
diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc
index d5f2dada0..c87fe2309 100644
--- a/lib/kopainter/koFrameButton.cc
+++ b/lib/kopainter/koFrameButton.cc
@@ -37,7 +37,7 @@ TQLabel(parent, name)
   setFrameStyle(Panel | Raised);
   setLineWidth(1);
   setText(text);
-  setAlignment(AlignHCenter | AlignVCenter);
+  tqsetAlignment(AlignHCenter | AlignVCenter);
   mActive = false;
   mToggle = false;
 }
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index 6d1225920..4604bbbd3 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -26,7 +26,7 @@
 #include <tqcursor.h>
 #include <tqapplication.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdebug.h>
 
 KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent, const char *name):
@@ -166,7 +166,7 @@ void KoIconChooser::setCurrentItem(KoIconItem *item)
     mCurRow = index / mNCols;
     mCurCol = index % mNCols;
 
-    // repaint the old and the new item
+    // tqrepaint the old and the new item
     repaintCell(oldRow, oldCol);
     repaintCell(mCurRow, mCurCol);
 
@@ -446,7 +446,7 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget
 	for( itr.toFirst(); itr.current(); ++itr )
 		chooser->addItem( itr.current() );
 
-	TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main layout" );
+	TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main tqlayout" );
 	mainLayout->addWidget( chooser, 10 );
 }
 
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc
index 01c71d84a..1eb9eeced 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cc
@@ -22,7 +22,7 @@
 
 #include "ko_cmyk_widget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -41,7 +41,7 @@
 KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 4, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc
index f309125ca..0c2688499 100644
--- a/lib/kopainter/ko_color_wheel.cc
+++ b/lib/kopainter/ko_color_wheel.cc
@@ -49,7 +49,7 @@ void KoColorWheel::drawWheel( TQPixmap *pixmap )
     TQPoint center(size/2, size/2);
 
     TQImage image( size, size, 32 );
-    image.fill(colorGroup ().background().pixel());
+    image.fill(tqcolorGroup ().background().pixel());
 
     TQColor col;
     int a, b, h, s;
diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc
index fb59947eb..e40031b5a 100644
--- a/lib/kopainter/ko_gray_widget.cc
+++ b/lib/kopainter/ko_gray_widget.cc
@@ -19,7 +19,7 @@
 
 #include "ko_gray_widget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -36,7 +36,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n
     m_ColorButton = new KDualColorButton(this);
     Q_CHECK_PTR(m_ColorButton);
 
-    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index 840c0b2de..c870248a2 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -21,7 +21,7 @@
 #include "ko_color_wheel.h"
 
 #include <kselect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -37,7 +37,7 @@
 KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
 
     TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2);
     m_colorwheel = new KoColorWheel(this);
@@ -96,7 +96,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam
     connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int)));
     connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int)));
 
-    //setFixedSize(mGrid -> minimumSize());
+    //setFixedSize(mGrid -> tqminimumSize());
     m_autovalue = true; // So on the initial selection of h or v, s gets set to 255.
 
     update(TQt::black, TQt::white);
@@ -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->repaint(false);
+    m_VSelector->tqrepaint(false);
     m_colorwheel->blockSignals(false);
 }
 
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc
index 1eadfc969..5eaef38e8 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cc
@@ -21,7 +21,7 @@
 
 #include "ko_rgb_widget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -38,7 +38,7 @@
 KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name)
 {
     m_ColorButton = new KDualColorButton(this);
-    m_ColorButton ->  setFixedSize(m_ColorButton->sizeHint());
+    m_ColorButton ->  setFixedSize(m_ColorButton->tqsizeHint());
     TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2);
 
     /* setup color sliders */
diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cc
index a2265d594..c95a5671c 100644
--- a/lib/kopainter/kogradientmanager.cc
+++ b/lib/kopainter/kogradientmanager.cc
@@ -21,7 +21,7 @@
 
 #include "svgnamedcolors.h"
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcstring.h>
 
 #include <kdebug.h>
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index ed9df8e61..600dad1cc 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -21,12 +21,12 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -54,8 +54,8 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
     setHorizontallyStretchable(false);
 
     setNewLine(true);
-    layout() -> setSpacing(0);
-    layout() -> setMargin(0);
+    tqlayout() -> setSpacing(0);
+    tqlayout() -> setMargin(0);
 
     resetFont();
 }
@@ -82,7 +82,7 @@ KoPalette::~KoPalette()
 void KoPalette::setMainWidget(TQWidget * widget)
 {
     setWidget(widget);
-    resize( TQSize(285, 233).expandedTo(minimumSizeHint()) );
+    resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
     widget->setFont(m_font);
     m_page = widget;
diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h
index 3ea6c4758..48d9cb3cf 100644
--- a/lib/kopalette/kopalette.h
+++ b/lib/kopalette/kopalette.h
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqfont.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <koffice_export.h>
 
 #include "kopalettemanager.h"
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 91d237a35..94ea8d4d7 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").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
-    a->setCheckedState(i18n("Hide %1").arg(widget->caption()));
+    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()));
 
     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/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index dd8f16868..be9e7126a 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -172,7 +172,7 @@ public slots:
     void showAllPalettes(bool shown);
 
     /**
-     * Restores the palette configuration to the default layout, i.e, the layout
+     * Restores the palette configuration to the default tqlayout, i.e, the tqlayout
      * preferred by each docker.
      */
     virtual void slotReset();
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 599832228..6ffdcf5c3 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -27,7 +27,7 @@
 #include "widget.h"
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
 #include <tqheader.h>
@@ -233,7 +233,7 @@ Editor::fill()
 		}
 	}
 
-//	repaint();
+//	tqrepaint();
 
 	if (firstChild())
 	{
@@ -271,12 +271,12 @@ Editor::addItem(const TQCString &name, EditorItem *parent)
 
 	// Create child items
 	item->setOpen(true);
-	if(!property->children())
+	if(!property->tqchildren())
 		return;
 
 	last = 0;
-	TQValueList<Property*>::ConstIterator endIt = property->children()->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = property->children()->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = property->tqchildren()->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = property->tqchildren()->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);
@@ -366,7 +366,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString&
 		if (item) {
 			d->itemToSelectLater = item;
 			TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater()));
-			//d->doNotSetFocusOnSelection = !hasParent(this, focusWidget());
+			//d->doNotSetFocusOnSelection = !hasParent(this, tqfocusWidget());
 			//setSelected(item, true);
 			//d->doNotSetFocusOnSelection = false;
 //			ensureItemVisible(item);
@@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it)
 	if (d->currentWidget) {
 		if (d->currentWidget->visibleFlag()) {
 			d->currentWidget->show();
-			if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) ))
+			if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->tqfocusWidget()) ))
 				d->currentWidget->setFocus();
 		}
 	}
@@ -652,7 +652,7 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty)
 			this, TQT_SLOT(slotWidgetRejectInput(Widget*)) );
 	}
 
-	//update geometry earlier, because Widget::setValue() can depend on widget's geometry
+	//update tqgeometry earlier, because Widget::setValue() can depend on widget's tqgeometry
 	updateEditorGeometry(d->currentItem, widget);
 
 	if(widget && (!widget->property() || changeWidgetProperty))
@@ -720,10 +720,10 @@ Editor::updateGroupLabelsPosition()
 
 	EditorGroupItem *group = dynamic_cast<EditorGroupItem*>(d->topItem->firstChild());
 	while(group) {
-		TQRect r = itemRect((TQListViewItem*) group);
+		TQRect r = tqitemRect((TQListViewItem*) group);
 		if(group->label()) {
 			group->label()->setGeometry(r);
-			group->label()->repaint();
+			group->label()->tqrepaint();
 		}
 		group = dynamic_cast<EditorGroupItem*>(group->nextSibling());
 	}
@@ -747,8 +747,8 @@ Editor::showUndoButton( bool show )
 	if (!d->currentItem || !d->currentWidget || (d->currentWidget && d->currentWidget->isReadOnly()))
 		return;
 
-	int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y();
-	TQRect geometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
+	int y = viewportToContents(TQPoint(0, tqitemRect(d->currentItem).y())).y();
+	TQRect tqgeometry(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()) {
-				geometry.setWidth(geometry.width()-d->undoButton->width());
+				tqgeometry.setWidth(tqgeometry.width()-d->undoButton->width());
 			}
-			d->currentWidget->resize(geometry.width(), geometry.height());
+			d->currentWidget->resize(tqgeometry.width(), tqgeometry.height());
 		}*/
 		d->undoButton->hide();
 		return;
 	}
 
-	TQPoint p = contentsToViewport(TQPoint(0, geometry.y()));
-	d->undoButton->move(geometry.x() + geometry.width()
+	TQPoint p = contentsToViewport(TQPoint(0, tqgeometry.y()));
+	d->undoButton->move(tqgeometry.x() + tqgeometry.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(geometry.width()-d->undoButton->width(), geometry.height());
+//	  d->currentWidget->resize(tqgeometry.width()-d->undoButton->width(), tqgeometry.height());
 //  }
 	d->undoButton->show();
 }
@@ -791,7 +791,7 @@ Editor::slotExpanded(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 void
@@ -815,7 +815,7 @@ Editor::slotCollapsed(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 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()->repaint();
+			it.current()->tqrepaint();
 	}
 	}*/
 /*
@@ -843,7 +843,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 		}
 	}*/
 //	repaintContents();
-//	repaint();
+//	tqrepaint();
 	updateEditorGeometry();
 	update();
 }
@@ -869,10 +869,10 @@ Editor::slotColumnSizeChanged(int section)
 }
 
 TQSize
-Editor::sizeHint() const
+Editor::tqsizeHint() const
 {
 	return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+"   "),
-		KListView::sizeHint().height());
+		KListView::tqsizeHint().height());
 }
 
 void
@@ -1021,7 +1021,7 @@ Editor::setSorting( int column, bool ascending )
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 #include "editor.moc"
diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h
index 05725529b..c3ab0c2e8 100644
--- a/lib/koproperty/editor.h
+++ b/lib/koproperty/editor.h
@@ -77,7 +77,7 @@ class KOPROPERTY_EXPORT Editor : public KListView
 
 		virtual ~Editor();
 
-		virtual TQSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 		virtual void setFocus();
 		virtual void setSorting( int column, bool ascending = true );
 
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index dc1bb19ee..653cbe0ab 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -31,7 +31,7 @@
 #include <tqheader.h>
 #include <tqstyle.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -98,7 +98,7 @@ class GroupWidgetBase : public TQWidget
 		, m_isOpen(true)
 		, m_mouseDown(false)
 		{
-			setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
+			tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
 		}
 
 		void setText( const TQString &text )
@@ -121,9 +121,9 @@ class GroupWidgetBase : public TQWidget
 			m_isOpen = set;
 		}
 
-		virtual TQSize sizeHint () const
+		virtual TQSize tqsizeHint () const
 		{
-			TQSize s( TQWidget::sizeHint() );
+			TQSize s( TQWidget::tqsizeHint() );
 			s.setHeight(fontMetrics().height()*2);
 			return s;
 		}
@@ -133,9 +133,9 @@ class GroupWidgetBase : public TQWidget
 			TQRect r(rect());
 			TQPainter p(this);
 			TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
-			kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
+			kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active(), flags);
 
-			paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
+			paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen());
 			if (!m_miniicon.isNull()) {
 				p.drawPixmap(24, (r.height()-m_miniicon.height())/2, m_miniicon);
 			}
@@ -143,7 +143,7 @@ class GroupWidgetBase : public TQWidget
 			if (!m_titleStr.isNull())
 			{
 				int indent = 16 + (m_miniicon.isNull() ? 0 : (m_miniicon.width()+4));
-				p.setPen(palette().active().text());
+				p.setPen(tqpalette().active().text());
 				TQFont f = p.font();
 				f.setBold(true);
 				p.setFont(f);
@@ -208,7 +208,7 @@ GroupContainer::GroupContainer(const TQString& title, TQWidget* parent)
 : TQWidget(parent)
 , d(new Private())
 {
-	setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
+	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
 	d->lyr = new TQVBoxLayout(this);
 	d->groupWidget = new GroupWidgetBase(this);
 	d->groupWidget->setText( title );
@@ -245,7 +245,7 @@ bool GroupContainer::event( TQEvent * e ) {
 				d->contents->show();
 			else
 				d->contents->hide();
-			d->lyr->invalidate();
+			d->lyr->tqinvalidate();
 			update();
 		}
 	}
@@ -563,7 +563,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in
 	//	return;
 	/*p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color?
 
-	p->setClipRect(listView()->itemRect(this));
+	p->setClipRect(listView()->tqitemRect(this));
 	if(column == 1)
 		p->translate(-listView()->columnWidth(0) + 20, 0);
 	int totalWidth = listView()->columnWidth(0) + listView()->columnWidth(1) - 20;
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index fc7032398..9f2c75c29 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 children.
+		    signs only if the item has tqchildren.
 		*/
 		virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h);
 
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 09d55e94b..886f20d86 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -30,7 +30,7 @@
 #include <tqtoolbutton.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbitmap.h>
 
 using namespace KoProperty;
@@ -45,8 +45,8 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
     m_toggle->setFocusPolicy(TQ_WheelFocus);
     m_toggle->setUsesTextLabel(true);
     m_toggle->setTextPosition(TQToolButton::Right);
-    m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    //we're not using layout to because of problems with button size
+    m_toggle->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    //we're not using tqlayout to because of problems with button size
     m_toggle->move(0, 0);
     m_toggle->resize(width(), height());
     setFocusWidget(m_toggle);
diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp
index f72009e30..a9ab1f1a1 100644
--- a/lib/koproperty/editors/coloredit.cpp
+++ b/lib/koproperty/editors/coloredit.cpp
@@ -21,7 +21,7 @@
 #include "coloredit.h"
 
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 
@@ -36,7 +36,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KColorCombo(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 	connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int)));
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 	setFocusWidget(m_edit);
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index 1dd35a8d9..343a9ed9b 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -19,7 +19,7 @@
 */
 #include "combobox.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
@@ -37,7 +37,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KComboBox(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 5ff0bb34f..61d444996 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().shape(), emitChange);
+	ComboBox::setValue(value.toCursor().tqshape(), emitChange);
 }
 
 void
 CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	ComboBox::drawViewer(p, cg, r, value.toCursor().shape());
+	ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape());
 }
 
 void
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index d6e5c7517..0df8532a9 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetimeedit.h>
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
 
@@ -37,7 +37,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 9355f9342..6e12641ab 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetimeedit.h>
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
 
@@ -37,7 +37,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateTimeEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 09cd73885..634641b88 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -24,7 +24,7 @@
 
 #include <tqpushbutton.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
@@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester
 		FontEditRequester(TQWidget* parent)
 			: KFontRequester(parent)
 		{
-			label()->setPaletteBackgroundColor(palette().active().base());
+			label()->setPaletteBackgroundColor(tqpalette().active().base());
 			label()->setMinimumWidth(0);
 			label()->setFrameShape(TQFrame::Box);
 			label()->setIndent(-1);
@@ -55,13 +55,13 @@ class FontEditRequester : public KFontRequester
 			label()->setFocusPolicy(TQ_ClickFocus);
 			KAcceleratorManager::setNoAccel(label());
 #endif
-			layout()->remove(label());
-			layout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
-			delete layout();
+			tqlayout()->remove(label());
+			tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
+			delete tqlayout();
 			button()->setText(i18n("..."));
 			TQToolTip::add(button(), i18n("Change font"));
 			button()->setFocusPolicy(TQ_NoFocus);
-			button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+			button()->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 			TQFontMetrics fm(button()->font());
 			button()->setFixedWidth(fm.width(button()->text()+' '));
 		}
diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp
index 5c3c5b514..e7f5b2f86 100644
--- a/lib/koproperty/editors/linestyledit.cpp
+++ b/lib/koproperty/editors/linestyledit.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 
 using namespace KoProperty;
@@ -140,7 +140,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQComboBox(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index 3742ae030..92ab746db 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -23,7 +23,7 @@
 #include "editoritem.h"
 #include "property.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
 #include <tqcursor.h>
@@ -58,22 +58,22 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
 
 	m_edit = new TQLabel(this, "m_edit");
 	TQToolTip::add(m_edit, i18n("Click to show image preview"));
-	m_edit->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+	m_edit->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
 	m_edit->setMinimumHeight(5);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
 	m_edit->setBackgroundMode(TQt::PaletteBase);
 	m_edit->setMouseTracking(true);
 	setBackgroundMode(TQt::PaletteBase);
 
 	m_button = new TQPushButton(i18n("..."), this, "m_button");
 	TQToolTip::add(m_button, i18n("Insert image from file"));
-	m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_button->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	TQFontMetrics fm(m_button->font());
 	m_button->setFixedWidth(fm.width(m_button->text()+' '));
 	m_button->setFocusPolicy(TQ_NoFocus);
 
 	m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop);
-	m_popup->setPaletteBackgroundColor(m_popup->palette().active().base());
+	m_popup->setPaletteBackgroundColor(m_popup->tqpalette().active().base());
 	m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box);
 	m_popup->setMargin(2);
 	m_popup->setLineWidth(1);
@@ -153,7 +153,7 @@ PixmapEdit::selectPixmapFileName()
 		emit valueChanged(this);
 	}
 #endif*/
-	TQString caption( i18n("Insert Image From File (for \"%1\" property)").arg(property()->caption()) );
+	TQString caption( i18n("Insert Image From File (for \"%1\" property)").tqarg(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 30d3c7d60..6983dd682 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -41,10 +41,10 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 //	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	setFocusWidget(m_edit);
@@ -64,8 +64,8 @@ PointEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toPoint().x()).arg(value.toPoint().y()));
+	Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+//		TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 }
 
 void
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index c97451eaf..ba6fec49b 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -21,7 +21,7 @@
 #include "editoritem.h"
 
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -39,7 +39,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name)
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
@@ -60,10 +60,10 @@ RectEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toRect().x()).arg(value.toRect().y())
-	 	.arg(value.toRect().width()).arg(value.toRect().height()));
+		TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).tqarg(value.toRect().y())
+	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//	 	TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y())
-//	 	.arg(value.toRect().width()).arg(value.toRect().height()));
+//	 	TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y())
+//	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index b5dd6be5c..05422119b 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -41,9 +41,9 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 //	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	setFocusWidget(m_edit);
@@ -63,8 +63,8 @@ SizeEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toSize().width()).arg(value.toSize().height()));
+		TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+//		TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 0b13292bf..125e0a26f 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqsizepolicy.h>
 #include <tqmap.h>
@@ -42,7 +42,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char
 	m_edit = new TQLabel(this);
 	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
 	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	l->addWidget(m_edit);
@@ -77,9 +77,9 @@ void
 SizePolicyEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
-	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()));
+	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()));
 	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").arg(findDescription(value.toSizePolicy().horData())).
-		arg(findDescription(value.toSizePolicy().verData())).
-		arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+		TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
+		tqarg(findDescription(value.toSizePolicy().verData())).
+		tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
 }
 
 TQString
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index d2020d2c8..8e890419b 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -22,7 +22,7 @@
 
 #include "property.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
@@ -36,7 +36,7 @@ using namespace KoProperty;
 IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name)
 : KIntSpinBox(lower, upper, step, value, base, parent, name)
 {
-	editor()->setAlignment(TQt::AlignLeft);
+	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
 	installEventFilter(this);
 	TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
@@ -179,7 +179,7 @@ IntEdit::setReadOnlyInternal(bool readOnly)
 DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent)
 : KDoubleSpinBox(lower, upper, step, value, precision, parent)
 {
-	editor()->setAlignment(TQt::AlignLeft);
+	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
 	installEventFilter(this);
 	TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
@@ -247,7 +247,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name)
 		 0, precision.toInt(), this);
 	if (!minValueText.isNull())
 		m_edit->setSpecialValueText(minValueText.toString());
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 
diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp
index c78b6edb0..55d8b3ed4 100644
--- a/lib/koproperty/editors/stringedit.cpp
+++ b/lib/koproperty/editors/stringedit.cpp
@@ -20,7 +20,7 @@
 
 #include "stringedit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvariant.h>
 
@@ -31,7 +31,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQLineEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMargin(1);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index f5a1de39a..56bf1145c 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -21,7 +21,7 @@
 #include "stringlistedit.h"
 
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdialog.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
@@ -46,12 +46,12 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char
 	m_edit = new TQLineEdit(this);
 	m_edit->setLineWidth(0);
 	m_edit->setReadOnly(true);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
 	m_selectButton = new TQPushButton("...", this);
-	m_selectButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
+	m_selectButton->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
 	l->addWidget(m_selectButton);
 	setFocusWidget(m_selectButton);
 
@@ -87,10 +87,10 @@ StringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r
 void
 StringListEdit::showEditor()
 {
-	KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
+	KDialogBase dialog(this->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(property()->caption()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(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 9bb503d9e..53394d54f 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
 
@@ -41,12 +41,12 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name)
 	m_edit = new TQLineEdit(this);
 	m_edit->setLineWidth(0);
 	m_edit->setReadOnly(true);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	m_edit->setMaxLength(1);
 	l->addWidget(m_edit);
 	m_select = new TQPushButton("...", this);
-	m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+	m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
 	m_select->setMinimumHeight(5);
 	l->addWidget(m_select);
 
@@ -61,7 +61,7 @@ TQVariant
 SymbolCombo::value() const
 {
 	if (!(m_edit->text().isNull()))
-		return m_edit->text().at(0).unicode();
+		return m_edit->text().tqat(0).tqunicode();
 	else
 		return 0;
 }
@@ -90,7 +90,7 @@ SymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, c
 void
 SymbolCombo::selectChar()
 {
-	KDialogBase dialog(this->topLevelWidget(), "charselect_dialog", true, i18n("Select Char"),
+	KDialogBase dialog(this->tqtopLevelWidget(), "charselect_dialog", true, i18n("Select Char"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
 	KCharSelect *select = new KCharSelect(&dialog, "select_char");
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index a6ede613d..674d2c89c 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -24,7 +24,7 @@
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqdatetime.h>
 
@@ -38,7 +38,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQTimeEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp
index 02734776c..8c150de20 100644
--- a/lib/koproperty/editors/urledit.cpp
+++ b/lib/koproperty/editors/urledit.cpp
@@ -20,7 +20,7 @@
 
 #include "urledit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 
 #include <kurlrequester.h>
@@ -36,14 +36,14 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KURLRequester(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
 	setProperty(property);
 
 	connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&)));
-	m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 }
 
 URLEdit::~URLEdit()
diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h
index f4b0cf36e..8aca55387 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 children properties must have custom
+     If you create a composed property, both parent and tqchildren 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 children's value, making sure that useCustomProperty argument is set
+     You just need to update tqchildren'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 children properties.
+     when the proerty value changes. Also make sure to avoid infinite recursion if you use tqchildren 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 6c4fa246a..49ca2b6cc 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), children(0), relatedProperties(0),
+		 sets(0), parent(0), tqchildren(0), relatedProperties(0),
 		 sortingKey(0)
 		{
 		}
@@ -63,7 +63,7 @@ class PropertyPrivate
 			delete caption;
 			caption = 0;
 			delete listData;
-			delete children;
+			delete tqchildren;
 			delete relatedProperties;
 			delete custom;
 			delete sets;
@@ -99,7 +99,7 @@ class PropertyPrivate
 //	TQValueList<Set*>  sets;
 
 	Property  *parent;
-	TQValueList<Property*>  *children;
+	TQValueList<Property*>  *tqchildren;
 	//! 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->children) {
-		delete d->children;
-		d->children = 0;
+	if(d->tqchildren) {
+		delete d->tqchildren;
+		d->tqchildren = 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 children value, using CustomProperty
+		// updates all tqchildren value, using CustomProperty
 		setValue(property.value());
 	}
 	else {
 		d->value = property.d->value;
-		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) {
+		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) {
 				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 children
+	// update these later because they may have been changed when creating tqchildren
 	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::children() const
+Property::tqchildren() const
 {
-	return d->children;
+	return d->tqchildren;
 }
 
 Property*
 Property::child(const TQCString &name)
 {
-	TQValueList<Property*>::ConstIterator endIt = d->children->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = d->children->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = d->tqchildren->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = d->tqchildren->constBegin(); it != endIt; ++it) {
 		if((*it)->name() == name)
 			return *it;
 	}
@@ -659,11 +659,11 @@ Property::addChild(Property *prop)
 	if (!prop)
 		return;
 
-	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());
+	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());
 		prop->d->parent = this;
 	}
 	else {
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index 9f097c617..bc8a503ea 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -104,7 +104,7 @@ enum PropertyType {
 
 	//predefined custom types
 	ValueFromList = 2000          /**<string value from a list*/,
-	Symbol = 2001                 /**<unicode symbol code*/,
+	Symbol = 2001                 /**<tqunicode symbol code*/,
 	FontName                      /**<font name, e.g. "times new roman"*/,
 	FileURL                       /**<url of a file*/,
 	PictureFileURL                /**<url of a pixmap*/,
@@ -306,9 +306,9 @@ class KOPROPERTY_EXPORT Property
 		/*! \return property icon's string. Can be empty. */
 		TQString icon() 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 list of all tqchildren for this property, or NULL of there
+		 is no tqchildren for this property */
+		const TQValueList<Property*>*  tqchildren() 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 children will be owned by this property. */
+		 The tqchildren 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 1c4678c97..df0ec956e 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -65,10 +65,10 @@ Test::Test()
 	m_set->addProperty(new Property("Bool", TQVariant(true, 4), "Bool"), group);
 	m_set->addProperty(p = new Property("3 States", TQVariant(), "3 States", "", Boolean), group);
 	p->setOption("3rdState", "None");
-	m_set->addProperty(p = new Property("Date", TQDate::currentDate(),"Date"), group);
+	m_set->addProperty(p = new Property("Date", TQDate::tqcurrentDate(),"Date"), group);
 	p->setIcon("date");
 	m_set->addProperty(new Property("Time", TQTime::currentTime(),"Time"), group);
-	m_set->addProperty(new Property("DateTime", TQDateTime::currentDateTime(),"Date/Time"), group);
+	m_set->addProperty(new Property("DateTime", TQDateTime::tqcurrentDateTime(),"Date/Time"), group);
 
 	TQStringList list;//keys
 	list << "myitem" << "otheritem" << "3rditem";
@@ -89,7 +89,7 @@ Test::Test()
 		group = "ComplexGroup";
 		m_set->setGroupDescription(group, "Complex Group");
 	}
-	m_set->addProperty(new Property("Rect", this->geometry(),"Rect"), group);
+	m_set->addProperty(new Property("Rect", this->tqgeometry(),"Rect"), group);
 	m_set->addProperty(new Property("Point", TQPoint(3,4), "Point"), group);
 	m_set->addProperty(new Property("Size", TQPoint(3,4), "Size"), group);
 
@@ -107,7 +107,7 @@ Test::Test()
 	p->setIcon("fonts");
 	m_set->addProperty(new Property("Cursor", TQCursor(TQt::WaitCursor),"Cursor"), group);
 	m_set->addProperty(new Property("LineStyle", 3, "Line Style", "", LineStyle), group);
-	m_set->addProperty(new Property("SizePolicy", sizePolicy(), "Size Policy"), group);
+	m_set->addProperty(new Property("SizePolicy", tqsizePolicy(), "Size Policy"), group);
 
 //	kdDebug() << m_set->groupNames() << endl;
 
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index 3d6153ae4..b0169a963 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -192,7 +192,7 @@ Widget::setEditor(TQWidget* editor)
 	d->editor = editor;
 	if (!d->editor)
 		return;
-	d->editor->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	d->editor->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	d->editor->move(0,0);
 }
 
diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp
index 1a4ba02bd..a45583197 100644
--- a/lib/koproperty/widgetproxy.cpp
+++ b/lib/koproperty/widgetproxy.cpp
@@ -22,7 +22,7 @@
 #include "widget.h"
 #include "factory.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 
 namespace KoProperty {
@@ -30,7 +30,7 @@ class WidgetProxyPrivate
 {
 	public:
 		WidgetProxyPrivate()
-		: property(0), widget(0), type(Invalid), layout(0)
+		: property(0), widget(0), type(Invalid), tqlayout(0)
 		{}
 		~WidgetProxyPrivate() {}
 
@@ -38,7 +38,7 @@ class WidgetProxyPrivate
 		Widget  *widget;
 		PropertyType  type;
 
-		TQHBoxLayout *layout;
+		TQHBoxLayout *tqlayout;
 };
 }
 
@@ -49,7 +49,7 @@ WidgetProxy::WidgetProxy(TQWidget *parent, const char *name)
 {
 	d = new WidgetProxyPrivate();
 	d->property = new Property();
-	d->layout = new TQHBoxLayout(this, 0, 0);
+	d->tqlayout = new TQHBoxLayout(this, 0, 0);
 }
 
 WidgetProxy::~WidgetProxy()
@@ -118,7 +118,7 @@ WidgetProxy::setWidget()
 
 	if (d->widget) {
 		d->widget->reparent(this, TQPoint(0,0), true);
-		d->layout->addWidget(d->widget);
+		d->tqlayout->addWidget(d->widget);
 	}
 }
 
diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN
index 12bc29409..4fd1e479d 100644
--- a/lib/kotext/DESIGN
+++ b/lib/kotext/DESIGN
@@ -26,17 +26,17 @@ Zoomed: (aka Normal)
 
 Internal:
     The former two were mostly for objects like frames etc, not for text. Text (the individual
-    words and characters) are positioned with the layout coordinates. Layout is similar to the
+    words and characters) are positioned with the tqlayout coordinates. Layout is similar to the
     Zoomed system, but always uses the same resolution. This resolution is sufficiently high to
-    do the layout in integers, and not really lose info.
+    do the tqlayout in integers, and not really lose info.
 
-    This is the high-resolution unit in which the text layout is done,
+    This is the high-resolution unit in which the text tqlayout is done,
     currently set to 1440 DPI. Everything known the QRT classes will be in
     this coordinate system (including the QTextFormats). When painting, we apply
     the current zoom and resolution to find the right font size to use, and we 
     have to catch up with rounding differences. However the position of the words
-    (i.e. layout) is the one determined previously in layout units. KoZoomHandler
-    offers methods for converting between layout units and zoom-dependent points 
+    (i.e. tqlayout) is the one determined previously in tqlayout units. KoZoomHandler
+    offers methods for converting between tqlayout units and zoom-dependent points 
     and pixels.
    
     Note that the Internal coordinate system starts at the topleft corner of
@@ -73,14 +73,14 @@ Document (pt values, in double, KoPoint, KoRect.)
  |
  |--KWTextFrameSet::documentToInternal
  V
-Internal coordinates (the coordinates given to QRT - in "layout units")
-Note that there are pixels and pts in the layout unit system too !
+Internal coordinates (the coordinates given to QRT - in "tqlayout units")
+Note that there are pixels and pts in the tqlayout unit system too !
 There are conversions between LU points and document points,
 but also direct conversions between LU pixels and view pixels.
 
 Font sizes
 ==========
-A 12pt font will lead to a layout font of ptToLayoutUnit(12)=20*12=240pt -
+A 12pt font will lead to a tqlayout font of ptToLayoutUnit(12)=20*12=240pt -
 that's the value stored in the QTextFormat.
 
 However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for a 12pt font)
diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp
index 49749f91d..c93807a33 100644
--- a/lib/kotext/DateFormatWidget.cpp
+++ b/lib/kotext/DateFormatWidget.cpp
@@ -147,7 +147,7 @@ void DateFormatWidget::updateLabel()
 {
     KoVariableDateFormat format;
     format.setFormatProperties( resultString() );
-    TQDateTime ct = TQDateTime::currentDateTime().addDays( correctValue() );
+    TQDateTime ct = TQDateTime::tqcurrentDateTime().addDays( correctValue() );
     label->setText( format.convert( ct ) );
 }
 
diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h
index ee1cdfb90..6ccb28913 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" ).arg( TQABS( mn ) );
+    TQString str = TQString::tqfromLatin1( "PT00H%1M00S" ).tqarg( 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" ).arg( TQABS( days ) );
+    TQString str = TQString::tqfromLatin1( "P%1D" ).tqarg( TQABS( days ) );
     if ( neg )
         str.prepend( '-' );
     return str;
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 7afeb354f..beaeb9f95 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -34,7 +34,7 @@
 #include <tqfont.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollbar.h>
 #include <tqstringlist.h>
 #include <tqfontdatabase.h>
@@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list )
   }
   if( w == 0 ) { w = 40; }
   w += list->frameWidth() * 2;
-  w += list->verticalScrollBar()->sizeHint().width();
+  w += list->verticalScrollBar()->tqsizeHint().width();
   return w;
 }
 
@@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
   sampleEdit->setFont(tmpFont);
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
-  sampleEdit->setAlignment(TQt::AlignCenter);
+  sampleEdit->tqsetAlignment(TQt::AlignCenter);
   gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
   TQString sampleEditWhatsThisText =
     i18n("This sample text illustrates the current settings. "
@@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
     setSizeIsRelative( *sizeIsRelativeState );
 
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
-  showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
+  KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
+  showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
 }
 
 KFontChooser_local::~KFontChooser_local()
@@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const
        : TQButton::NoChange;
 }
 
-TQSize KFontChooser_local::sizeHint( void ) const
+TQSize KFontChooser_local::tqsizeHint( void ) const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
 
@@ -473,7 +473,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family)
 
 
     TQFontDatabase dbase;
-    TQStringList styles = TQStringList(dbase.styles(currentFamily));
+    TQStringList styles = TQStringList(dbase.tqstyles(currentFamily));
     styleListBox->clear();
     currentStyles.clear();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
@@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style)
         fillSizeList();
     } else {                                // is bitmap font.
         //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
-        TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
+        TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
         if(sizes.count() > 0) {
             TQValueList<int>::iterator it;
             diff=1000;
@@ -654,7 +654,7 @@ void KFontChooser_local::setupDisplay()
 void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria)
 {
   TQFontDatabase dbase;
-  TQStringList lstSys(dbase.families());
+  TQStringList lstSys(dbase.tqfamilies());
 
   // if we have criteria; then check fonts before adding
   if (fontListCriteria)
@@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont )
   if ( !ptr )
     return;
 
-  TQString font = TQString::fromLatin1(ptr + 1);
+  TQString font = TQString::tqfromLatin1(ptr + 1);
 
   int pos;
   if ( ( pos = font.find( '-' ) ) > 0 ) {
     font.truncate( pos );
 
-    if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
+    if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
       return;
 
     TQStringList::Iterator it = list.begin();
diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h
index 943ce7242..b9d4853c8 100644
--- a/lib/kotext/KFontDialog_local.h
+++ b/lib/kotext/KFontDialog_local.h
@@ -263,7 +263,7 @@ public:
   /**
    * Reimplemented for internal reasons.
    */
-  virtual TQSize sizeHint( void ) const;
+  virtual TQSize tqsizeHint( void ) const;
 
 signals:
   /**
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 7ca6f1a7f..c859d26c5 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -932,7 +932,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para
                 uint maxlength = 0;
                 for ( TQStringList::ConstIterator it = wordlist.begin(); it != wordlist.end(); ++it ) // several completion words were found
                 {
-                  if ( (*it).startsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord
+                  if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord
                   {
                     if ( (*it).length() > maxlength )
                       maxlength = (*it).length();
@@ -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).at(i).lower() != ch.lower() )
+                      if ( (*it).tqat(i).lower() != ch.lower() )
                       {
                         word = (*it).left(i); //the completion word is truncated here
                         //kdDebug() << "set the word completion to:" << word << endl;
@@ -1063,7 +1063,7 @@ void KoAutoFormat::showToolTipBox(KoTextParag *parag,  int index, TQWidget *widg
             m_completionBox->setText(word);
             m_completionBox->setLastWord(lastWord);
             m_completionBox->adjustSize();
-            int const height = m_completionBox->sizeHint().height();
+            int const height = m_completionBox->tqsizeHint().height();
             m_completionBox->move( show_pos.x(), show_pos.y() - height );
 
             if (!m_completionBox->isShown() )
@@ -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->invalidate(0);
+        parag->tqinvalidate(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.at(3)!=word.at(3).upper() )
+        if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.tqat(3)!=word.tqat(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.at(0)==wordAfter.at(0).lower())
+            if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.tqat(0)==wordAfter.tqat(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.at(0).isLetter() && word.at(0)==word.at(0).lower() )
+    if( word.tqat(0).isLetter() && word.tqat(0)==word.tqat(0).lower() )
     {
         KoTextCursor cursor( parag->document() );
         cursor.setParag( parag );
         cursor.setIndex( start );
         textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor );
         cursor.setIndex( start + length );
-        TQString replacement = replaceStr.at(0).upper() + replaceStr.right( length-1 );
+        TQString replacement = replaceStr.tqat(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 30a110a0c..e6dce371e 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -28,7 +28,7 @@
 #include <klistview.h>
 #include <kstandarddirs.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
@@ -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..." )
-            .arg( TQString( "�" ) ) );
+            .tqarg( TQString( "�" ) ) );
     TQWhatsThis::add( cbAutoReplaceNumber, i18n(
             "Most standard fraction notations will be converted when available"
             ) );
@@ -331,11 +331,11 @@ void KoAutoFormatDia::setupTab1()
     hbox->addSpacing( 20 );
     hbox->setSpacing(KDialog::spacingHint());
     pbBulletStyle = new TQPushButton( tab1 );
-    pbBulletStyle->setFixedSize( pbBulletStyle->sizeHint() );
+    pbBulletStyle->setFixedSize( pbBulletStyle->tqsizeHint() );
     hbox->addWidget( pbBulletStyle );
     pbDefaultBulletStyle = new TQPushButton( tab1 );
     pbDefaultBulletStyle->setText(i18n("Default"));
-    pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->sizeHint() );
+    pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->tqsizeHint() );
     hbox->addWidget( pbDefaultBulletStyle );
 
     hbox->addStretch( 1 );
@@ -393,10 +393,10 @@ void KoAutoFormatDia::setupTab2()
     hbox->addSpacing( 20 );
 
     pbDoubleQuote1 = new TQPushButton( tab2 );
-    pbDoubleQuote1->setFixedSize( pbDoubleQuote1->sizeHint() );
+    pbDoubleQuote1->setFixedSize( pbDoubleQuote1->tqsizeHint() );
 
     pbDoubleQuote2 = new TQPushButton( tab2 );
-    pbDoubleQuote2->setFixedSize( pbDoubleQuote2->sizeHint() );
+    pbDoubleQuote2->setFixedSize( pbDoubleQuote2->tqsizeHint() );
 
     if (TQApplication::reverseLayout()) {
         hbox->addWidget( pbDoubleQuote2 );
@@ -410,7 +410,7 @@ void KoAutoFormatDia::setupTab2()
 
     pbDoubleDefault = new TQPushButton( tab2 );
     pbDoubleDefault->setText(i18n("Default"));
-    pbDoubleDefault->setFixedSize( pbDoubleDefault->sizeHint() );
+    pbDoubleDefault->setFixedSize( pbDoubleDefault->tqsizeHint() );
     hbox->addWidget( pbDoubleDefault );
 
     hbox->addStretch( 1 );
@@ -434,10 +434,10 @@ void KoAutoFormatDia::setupTab2()
     hbox->addSpacing( 20 );
 
     pbSimpleQuote1 = new TQPushButton( tab2 );
-    pbSimpleQuote1->setFixedSize( pbSimpleQuote1->sizeHint() );
+    pbSimpleQuote1->setFixedSize( pbSimpleQuote1->tqsizeHint() );
 
     pbSimpleQuote2 = new TQPushButton( tab2 );
-    pbSimpleQuote2->setFixedSize( pbSimpleQuote2->sizeHint() );
+    pbSimpleQuote2->setFixedSize( pbSimpleQuote2->tqsizeHint() );
 
     if (TQApplication::reverseLayout()) {
         hbox->addWidget( pbSimpleQuote2 );
@@ -451,7 +451,7 @@ void KoAutoFormatDia::setupTab2()
 
     pbSimpleDefault = new TQPushButton( tab2 );
     pbSimpleDefault->setText(i18n("Default"));
-    pbSimpleDefault->setFixedSize( pbSimpleDefault->sizeHint() );
+    pbSimpleDefault->setFixedSize( pbSimpleDefault->tqsizeHint() );
     hbox->addWidget( pbSimpleDefault );
 
     hbox->addStretch( 1 );
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index 612f0be70..f3b8928b9 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 repaint once a paragraph is completely done.
+    // slow (chunky) if we only tqrepaint 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 repaint here, in the slotParagraphModified case we want to repaint only once at the end
+    // don't tqrepaint here, in the slotParagraphModified case we want to tqrepaint only once at the end
 }
 
 void KoBgSpellCheck::checkerContinue()
diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp
index cde58f0a7..8f7c2515c 100644
--- a/lib/kotext/KoChangeCaseDia.cpp
+++ b/lib/kotext/KoChangeCaseDia.cpp
@@ -36,7 +36,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name )
 
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Case" ),page );
     grp->setRadioButtonExclusive( TRUE );
-    grp->layout();
+    grp->tqlayout();
     m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp );
     m_lowerCase=new TQRadioButton( i18n("&Lowercase"), grp );
 
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index 370befe83..a6c8b2bbb 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 #include <tqmultilineedit.h>
 #include "KoCommentDia.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kglobal.h>
 #include <tqdatetime.h>
@@ -64,9 +64,9 @@ TQString KoCommentDia::commentText()
 
 void KoCommentDia::slotAddAuthorName()
 {
-    TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() );
+    TQString date = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
     TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() );
-    TQString result = TQString("--------%1 ,%2, %3------\n").arg(authorName).arg(date).arg(time);
+    TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time);
     m_multiLine->insertLine( result, m_multiLine->numLines() );
 }
 
diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui
index babc467cf..12ae9d5d3 100644
--- a/lib/kotext/KoCompletionBase.ui
+++ b/lib/kotext/KoCompletionBase.ui
@@ -29,7 +29,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -83,7 +83,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -129,7 +129,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -254,7 +254,7 @@ This option is most important when Automatically add words to completion list is
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -289,7 +289,7 @@ This option is most important when Automatically add words to completion list is
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>101</width>
                                     <height>20</height>
@@ -302,7 +302,7 @@ This option is most important when Automatically add words to completion list is
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -329,7 +329,7 @@ This option is most important when Automatically add words to completion list is
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 2f5729b26..66d8d374a 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -25,7 +25,7 @@
 #include <kcompletion.h>
 #include <kconfig.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
@@ -40,7 +40,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoForm
 {
     TQVBox *page = makeVBoxMainWidget();
     m_widget = new KoCompletion(page, autoFormat);
-    m_widget->layout()->setMargin(0);
+    m_widget->tqlayout()->setMargin(0);
     connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf()));
     setButtonWhatsThis(Ok,i18n("This will save your options."));
     setButtonWhatsThis(Cancel,i18n("This will abort all changes."));
@@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl
       m_autoFormat( *autoFormat ),
       m_docAutoFormat( autoFormat )
 {
-    connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus()));
+    connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus()));
     TQStringList lst;
     lst << i18n( "Enter" );
     lst << i18n( "Tab" );
@@ -74,10 +74,10 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl
     connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry()));
 
     slotResetConf(); // aka load config
-    changeButtonStatus();
+    changeButtontqStatus();
 }
 
-void KoCompletion::changeButtonStatus() {
+void KoCompletion::changeButtontqStatus() {
     bool state = cbAllowCompletion->isChecked();
 
     completionBox->setEnabled( state);
@@ -122,7 +122,7 @@ void KoCompletion::slotResetConf() {
     default:
         m_completionKeyAction->setCurrentItem( 0 );
     }
-    changeButtonStatus();
+    changeButtontqStatus();
 }
 
 void KoCompletion::slotAddCompletionEntry() {
diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h
index 98927e0b9..1aefb39ab 100644
--- a/lib/kotext/KoCompletionDia.h
+++ b/lib/kotext/KoCompletionDia.h
@@ -35,7 +35,7 @@ public:
     void saveSettings();
 
 protected slots:
-    void changeButtonStatus();
+    void changeButtontqStatus();
     void slotResetConf();
     void slotAddCompletionEntry();
     void slotRemoveCompletionEntry();
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 475f439da..54599d075 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -65,14 +65,14 @@ KoBidiContext::~KoBidiContext()
 	delete parent;
 }
 
-static TQChar *shapeBuffer = 0;
-static int shapeBufSize = 0;
+static TQChar *tqshapeBuffer = 0;
+static int tqshapeBufSize = 0;
 
 /*
    Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on
    arabic).
 
-   Each unicode char has a joining class (right, dual (left&right), center (joincausing) or transparent).
+   Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent).
    transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks.
 
    Right join-causing: dual + center
@@ -103,7 +103,7 @@ static int shapeBufSize = 0;
 */
 
 /*
-  Two small helper functions for arabic shaping. They get the next shape causing character on either
+  Two small helper functions for arabic shaping. They get the next tqshape 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
@@ -113,7 +113,7 @@ static inline const TQChar *prevChar( const TQString &str, int pos )
 {
     //kdDebug() << "leftChar: pos=" << pos << endl;
     pos--;
-    const TQChar *ch = str.unicode() + pos;
+    const TQChar *ch = str.tqunicode() + pos;
     while( pos > -1 ) {
 	if( !ch->isMark() )
 	    return ch;
@@ -127,7 +127,7 @@ static inline const TQChar *nextChar( const TQString &str, int pos)
 {
     pos++;
     int len = str.length();
-    const TQChar *ch = str.unicode() + pos;
+    const TQChar *ch = str.tqunicode() + pos;
     while( pos < len ) {
 	//kdDebug() << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << endl;
 	if( !ch->isMark() )
@@ -155,11 +155,11 @@ KoComplexText::Shape KoComplexText::glyphVariant( const TQString &str, int pos)
 {
     // ignores L1 - L3, done in the codec
     TQChar::Joining joining = str[pos].joining();
-    //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl;
+    //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl;
     switch ( joining ) {
 	case TQChar::OtherJoining:
 	case TQChar::Center:
-	    // these don't change shape
+	    // these don't change tqshape
 	    return XIsolated;
 	case TQChar::Right:
 	    // only rule R2 applies
@@ -200,11 +200,11 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in
 {
     // ignores L1 - L3, ligatures are job of the codec
     TQChar::Joining joining = str[pos].joining();
-    //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl;
+    //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl;
     switch ( joining ) {
 	case TQChar::OtherJoining:
 	case TQChar::Center:
-	    // these don't change shape
+	    // these don't change tqshape
 	    return XIsolated;
 	case TQChar::Right:
 	    // only rule R2 applies
@@ -229,11 +229,11 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in
 
 // -------------------------------------------------------------
 
-// The unicode to unicode shaping codec.
+// The tqunicode to tqunicode shaping codec.
 // does only presentation forms B at the moment, but that should be enough for
 // simple display
 static const ushort arabicUnicodeMapping[256][2] = {
-    // base of shaped forms, and number-1 of them ( 0 for non shaping,
+    // base of tqshaped 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 shaped mappings in the presentation forms A.
+	// ### some glyphs do not have tqshaped 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 shape
+// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the tqshape
 // 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 shape,
+static inline int getShape( const TQChar * /* base */, uchar cell, int tqshape,
 			    const TQFontMetrics * /* fm */ )
 {
-    uint ch = arabicUnicodeMapping[cell][0] + shape;
+    uint ch = arabicUnicodeMapping[cell][0] + tqshape;
     /*
-    // we revert to the unshaped glyph in case the shaped version doesn't exist
+    // we revert to the untqshaped glyph in case the tqshaped version doesn't exist
     if ( fm && !fm->inFont( ch ) ) {
-    switch( shape ) {
+    switch( tqshape ) {
     case KoComplexText::XIsolated:
     break; // try base form
     case KoComplexText::XFinal:
@@ -551,7 +551,7 @@ static inline int getShape( const TQChar * /* base */, uchar cell, int shape,
     return ch;
 }
 
-TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm )
+TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm )
 {
     if( len < 0 )
 	len = uc.length() - from;
@@ -561,13 +561,13 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 
     // we have to ignore NSMs at the beginning and add at the end.
     int num = uc.length() - from - len;
-    const TQChar *ch = uc.unicode() + from + len;
+    const TQChar *ch = uc.tqunicode() + from + len;
     while ( num > 0 && ch->combiningClass() != 0 ) {
 	ch++;
 	num--;
 	len++;
     }
-    ch = uc.unicode() + from;
+    ch = uc.tqunicode() + from;
     while ( len > 0 && ch->combiningClass() != 0 ) {
 	ch++;
 	len--;
@@ -575,16 +575,16 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
     }
     if ( len == 0 ) return TQString();
 
-    if( !shapeBuffer || len > shapeBufSize ) {
-      if( shapeBuffer ) free( (void *) shapeBuffer );
-      shapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) );
-//        delete [] shapeBuffer;
-//        shapeBuffer = new TQChar[ len + 1];
-	shapeBufSize = len;
+    if( !tqshapeBuffer || len > tqshapeBufSize ) {
+      if( tqshapeBuffer ) free( (void *) tqshapeBuffer );
+      tqshapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) );
+//        delete [] tqshapeBuffer;
+//        tqshapeBuffer = new TQChar[ len + 1];
+	tqshapeBufSize = len;
     }
 
     int lenOut = 0;
-    TQChar *data = shapeBuffer;
+    TQChar *data = tqshapeBuffer;
     if ( dir == TQPainter::RTL )
 	ch += len - 1;
     for ( int i = 0; i < len; i++ ) {
@@ -601,8 +601,8 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 	    int pos = i + from;
 	    if ( dir == TQPainter::RTL )
 		pos = from + len - 1 - i;
-	    int shape = glyphVariantLogical( uc, pos );
-	    //kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl;
+	    int tqshape = glyphVariantLogical( uc, pos );
+	    //kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl;
 	    // take care of lam-alef ligatures (lam right of alef)
 	    ushort map;
 	    switch ( c ) {
@@ -615,7 +615,7 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 			    case 0x25:
 			    case 0x27:
 				//kdDebug() << " lam of lam-alef ligature" << endl;
-				map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][shape];
+				map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][tqshape];
 				goto next;
 			    default:
 				break;
@@ -627,7 +627,7 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 		case 0x23: // alef with hamza above
 		case 0x25: // alef with hamza below
 		case 0x27: // alef
-		    if ( prevChar( uc, pos )->unicode() == 0x0644 ) {
+		    if ( prevChar( uc, pos )->tqunicode() == 0x0644 ) {
 			// have a lam alef ligature
 			//kdDebug() << " alef of lam-alef ligature" << endl;
 			goto skip;
@@ -635,7 +635,7 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 		default:
 		    break;
 	    }
-	    map = getShape( ch, c, shape, fm );
+	    map = getShape( ch, c, tqshape, fm );
 	next:
 	    *data = map;
 	    data++;
@@ -649,11 +649,11 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
     }
 
     if ( dir == TQPainter::Auto && !uc.simpleText() ) {
-	return bidiReorderString( TQConstString( shapeBuffer, lenOut ).string() );
+	return bidiReorderString( TQConstString( tqshapeBuffer, lenOut ).string() );
     }
     if ( dir == TQPainter::RTL ) {
 	// reverses the non spacing marks to be again after the base char
-	TQChar *s = shapeBuffer;
+	TQChar *s = tqshapeBuffer;
 	int i = 0;
 	while ( i < lenOut ) {
 	    if ( s->combiningClass() != 0 ) {
@@ -684,17 +684,17 @@ TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPa
 	}
     }
 
-    return TQConstString( shapeBuffer, lenOut ).string();
+    return TQConstString( tqshapeBuffer, lenOut ).string();
 }
 
-TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm )
+TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm )
 {
-    const TQChar *ch = str.unicode() + pos;
+    const TQChar *ch = str.tqunicode() + pos;
     if ( ch->row() != 0x06 )
 	return *ch;
     else {
-	int shape = glyphVariantLogical( str, pos );
-	//kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl;
+	int tqshape = glyphVariantLogical( str, pos );
+	//kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl;
 	// lam aleph ligatures
 	switch ( ch->cell() ) {
 	    case 0x44: { // lam
@@ -705,7 +705,7 @@ TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFon
 			case 0x23:
 			case 0x25:
 			case 0x27:
-			    return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][shape]);
+			    return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][tqshape]);
 			default:
 			    break;
 		    }
@@ -716,13 +716,13 @@ TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFon
 	    case 0x23: // alef with hamza above
 	    case 0x25: // alef with hamza below
 	    case 0x27: // alef
-		if ( prevChar( str, pos )->unicode() == 0x0644 )
+		if ( prevChar( str, pos )->tqunicode() == 0x0644 )
 		    // have a lam alef ligature
 		    return TQChar(0);
 	    default:
 		break;
 	}
-	return TQChar( getShape( ch, ch->cell(), shape, fm ) );
+	return TQChar( getShape( ch, ch->cell(), tqshape, fm ) );
     }
 }
 
@@ -739,7 +739,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str
     if ( !nmarks )
 	return TQPointArray();
 
-    TQChar baseChar = KoComplexText::shapedCharacter( str, pos );
+    TQChar baseChar = KoComplexText::tqshapedCharacter( str, pos );
     TQRect baseRect = f->boundingRect( baseChar );
     int baseOffset = f->textWidth( str, pos, 1 );
 
@@ -842,7 +842,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str
 	    default:
 		break;
 	}
-	//kdDebug() << "char=" << mark.unicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl;
+	//kdDebug() << "char=" << mark.tqunicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl;
 	markRect.moveBy( p.x(), p.y() );
 	p += TQPoint( -baseOffset, 0 );
 	attachmentRect |= markRect;
@@ -864,7 +864,7 @@ static TQChar::Direction basicDirection(const TQString &str, int start = 0)
 {
     int len = str.length();
     int pos = start > len ? len -1 : start;
-    const TQChar *uc = str.unicode() + pos;
+    const TQChar *uc = str.tqunicode() + pos;
     while( pos < len ) {
 	switch( uc->direction() )
 	{
@@ -913,7 +913,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co
 	}
     }
 
-    KoBidiStatus status = control->status;
+    KoBiditqStatus status = control->status;
     TQChar::Direction dir = TQChar::DirON;
 
     int sor = start;
@@ -1406,8 +1406,8 @@ TQString KoComplexText::bidiReorderString( const TQString &str, TQChar::Directio
     int len = str.length();
     TQString visual;
     visual.setUnicode( 0, len );
-    TQChar *vch = (TQChar *)visual.unicode();
-    const TQChar *ch = str.unicode();
+    TQChar *vch = (TQChar *)visual.tqunicode();
+    const TQChar *ch = str.tqunicode();
     while( lineStart < len ) {
 	lineEnd = lineStart;
 	while( *ch != '\n' && lineEnd < len ) {
diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h
index 8a22d152b..72abfbed4 100644
--- a/lib/kotext/KoComplexText.h
+++ b/lib/kotext/KoComplexText.h
@@ -62,8 +62,8 @@
 #ifndef TQT_NO_COMPLEXTEXT
 
 // bidi helper classes. Internal to TQt
-struct TQ_EXPORT KoBidiStatus {
-    KoBidiStatus() {
+struct TQ_EXPORT KoBiditqStatus {
+    KoBiditqStatus() {
 	eor = TQChar::DirON;
 	lastStrong = TQChar::DirON;
 	last = TQChar:: DirON;
@@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared {
 
 struct TQ_EXPORT KoBidiControl {
     KoBidiControl() { context = 0; }
-    KoBidiControl( KoBidiContext *c, KoBidiStatus s)
+    KoBidiControl( KoBidiContext *c, KoBiditqStatus s)
     { context = c; if( context ) context->ref(); status = s; }
     ~KoBidiControl() { if ( context && context->deref() ) delete context; }
     void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); }
     KoBidiContext *context;
-    KoBidiStatus status;
+    KoBiditqStatus status;
 };
 
 struct TQ_EXPORT KoTextRun {
@@ -115,8 +115,8 @@ public:
     static Shape glyphVariant( const TQString &str, int pos);
     static Shape glyphVariantLogical( const TQString &str, int pos);
 
-    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);
+    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);
 
     // 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/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp
index fb7d9b9d8..e4b9f339e 100644
--- a/lib/kotext/KoCreateStyleDia.cpp
+++ b/lib/kotext/KoCreateStyleDia.cpp
@@ -33,7 +33,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent
     TQVBox *page = makeVBoxMainWidget();
     new TQLabel(i18n("Please specify a new style name:"), page);
     m_styleName = new TQLineEdit( page );
-    m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 );
+    m_styleName->setMinimumWidth( m_styleName->tqsizeHint().width() * 3 );
 
     connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &)));
     m_styleName->setFocus();
diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp
index f3b841212..aa74d133f 100644
--- a/lib/kotext/KoCustomVariablesDia.cpp
+++ b/lib/kotext/KoCustomVariablesDia.cpp
@@ -67,7 +67,7 @@ void KoVariableNameDia::init()
     row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Name:" ), row1 );
-    l->setFixedSize( l->sizeHint() );
+    l->setFixedSize( l->tqsizeHint() );
     names = new TQComboBox( TRUE, row1 );
     names->setFocus();
 
@@ -108,9 +108,9 @@ void KoCustomVariablesListItem::setup()
 {
     TQListViewItem::setup();
     setHeight( TQMAX( listView()->fontMetrics().height(),
-                     editWidget->sizeHint().height() ) );
-    //if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() )
-    //    listView()->setColumnWidth( 1, editWidget->sizeHint().width() );
+                     editWidget->tqsizeHint().height() ) );
+    //if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() )
+    //    listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() );
 }
 
 void KoCustomVariablesListItem::update()
@@ -297,13 +297,13 @@ void KoCustomVarDialog::init()
     TQHBox *row1 = new TQHBox( back );
     row1->setSpacing( KDialog::spacingHint() );
     TQLabel *ln = new TQLabel( i18n( "Name:" ), row1 );
-    ln->setFixedSize( ln->sizeHint() );
+    ln->setFixedSize( ln->tqsizeHint() );
     m_name = new KLineEdit( row1 );
 
     TQHBox *row2 = new TQHBox( back );
     row2->setSpacing( KDialog::spacingHint() );
     TQLabel *lv = new TQLabel( i18n( "Value:" ), row2 );
-    lv->setFixedSize( lv->sizeHint() );
+    lv->setFixedSize( lv->tqsizeHint() );
     m_value = new KLineEdit( row2 );
 }
 
diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp
index 1cab9dae2..327dbe53f 100644
--- a/lib/kotext/KoImportStyleDia.cpp
+++ b/lib/kotext/KoImportStyleDia.cpp
@@ -19,7 +19,7 @@
 
 #include <klocale.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
@@ -98,7 +98,7 @@ TQString KoImportStyleDia::generateStyleName( const TQString & templateName ) co
     int num = 1;
     bool exists;
     do {
-        name = templateName.arg( num );
+        name = templateName.tqarg( 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.arg( num );
+        name = templateName.tqarg( num );
         exists = m_currentCollection->findStyleByDisplayName( name ) != 0;
         ++num;
     } while ( exists );
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 9810e8b01..6126d6c5a 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;
-    invalidate();
+    tqinvalidate();
 }
 
 bool KoParagCounter::operator==( const KoParagCounter & c2 ) const
@@ -83,7 +83,7 @@ unsigned int KoParagCounter::depth() const
     return m_depth;
 }
 
-void KoParagCounter::invalidate()
+void KoParagCounter::tqinvalidate()
 {
     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");
-    invalidate();
+    tqinvalidate();
 }
 
 static int importCounterType( TQChar numFormat )
@@ -216,7 +216,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
         TQString bulletChar = listStyle.attributeNS( KoXmlNS::text, "bullet-char", TQString() );
         if ( !bulletChar.isEmpty() ) {
             // Reverse engineering, I found those codes:
-            switch( bulletChar[0].unicode() ) {
+            switch( bulletChar[0].tqunicode() ) {
             case 0x2022: // small disc -> circle
                 m_style = STYLE_CIRCLEBULLET;
                 break;
@@ -235,7 +235,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
                 m_style = STYLE_BOXBULLET;
                 break;
             default:
-                kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.unicode(), 16 ) << endl;
+                kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.tqunicode(), 16 ) << endl;
                 // fallback
             case 0x2794: // arrow
             case 0x2717: // cross
@@ -259,7 +259,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
             m_style = STYLE_DISCBULLET;
         }
     }
-    invalidate();
+    tqinvalidate();
 }
 
 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 alignment.
+        // text:min-label-distance, style:font-name (for bullets), image size and vertical tqalignment.
         listLevelWriter.endElement(); // style:list-level-properties
     }
 }
@@ -504,7 +504,7 @@ void KoParagCounter::save( TQDomElement & element )
     element.setAttribute( "depth", m_depth );
     if ( (Style)m_style == STYLE_CUSTOMBULLET )
     {
-        element.setAttribute( "bullet", m_customBulletChar.unicode() );
+        element.setAttribute( "bullet", m_customBulletChar.tqunicode() );
         if ( !m_customBulletFont.isEmpty() )
             element.setAttribute( "bulletfont", m_customBulletFont );
     }
@@ -531,66 +531,66 @@ void KoParagCounter::save( TQDomElement & element )
 void KoParagCounter::setCustom( TQString c )
 {
     m_custom = c;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setCustomBulletCharacter( TQChar c )
 {
     m_customBulletChar = c;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setCustomBulletFont( TQString f )
 {
     m_customBulletFont = f;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setDepth( unsigned int d )
 {
     m_depth = d;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setNumbering( Numbering n )
 {
     m_numbering = n;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setPrefix( TQString p )
 {
     m_prefix = p;
-    invalidate();
+    tqinvalidate();
 }
 void KoParagCounter::setStartNumber( int s )
 {
     m_startNumber = s;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setDisplayLevels( int l )
 {
     m_displayLevels = l;
-    invalidate();
+    tqinvalidate();
 }
 
-void KoParagCounter::setAlignment( int a )
+void KoParagCounter::tqsetAlignment( int a )
 {
     m_align = a;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setStyle( Style s )
 {
     m_style = s;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setSuffix( TQString s )
 {
     m_suffix = s;
-    invalidate();
+    tqinvalidate();
 }
 
 int KoParagCounter::startNumber() const
@@ -603,7 +603,7 @@ int KoParagCounter::displayLevels() const
     return m_displayLevels;
 }
 
-int KoParagCounter::alignment() const
+int KoParagCounter::tqalignment() const
 {
     return m_align;
 }
@@ -626,7 +626,7 @@ bool KoParagCounter::restartCounter() const
 void KoParagCounter::setRestartCounter( bool restart )
 {
     m_restartCounter = restart;
-    invalidate();
+    tqinvalidate();
 }
 
 // Return the text for that level only
@@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"};
 TQString KoParagCounter::makeRomanNumber( int n )
 {
     if ( n >= 0 )
-        return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] +
+        return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] +
                                     RNHundreds[ ( n / 100 ) % 10 ] +
                                     RNTens[ ( n / 10 ) % 10 ] +
                                     RNUnits[ ( n ) % 10 ] );
@@ -973,7 +973,7 @@ void KoParagCounter::printRTDebug( KoTextParag* parag )
     if ( restartCounter() )
         additionalInfo = "[restartCounter]";
     if ( m_style == STYLE_CUSTOMBULLET )
-        additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.unicode() )
+        additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.tqunicode() )
                           + " in font '" + m_customBulletFont + "']";
     static const char * const s_numbering[] = { "List", "Chapter", "None", "Footnote" };
     kdDebug(32500) << "  Counter style=" << style()
diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h
index d45b24353..dbedb3e85 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 invalidate();
+    void tqinvalidate();
 
     /** Return the current value of the counter as a number.
      */
@@ -172,10 +172,10 @@ public:
     TQString custom() const;
     void setCustom( TQString c );
 
-    /** Counter alignment
+    /** Counter tqalignment
      */
-    int alignment() const;
-    void setAlignment( int a );
+    int tqalignment() const;
+    void tqsetAlignment( int a );
 
     /**
      * Return the format to use for the counter.
diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui
index 131e1b0c1..4c93c261f 100644
--- a/lib/kotext/KoParagDecorationTab.ui
+++ b/lib/kotext/KoParagDecorationTab.ui
@@ -131,7 +131,7 @@ modified in the preview.&lt;/p&gt;</string>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>200</height>
@@ -361,7 +361,7 @@ regardless of the style of the preceeding and subsequent paragraphs.&lt;/p&gt;</
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>250</width>
                             <height>21</height>
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index ed7700e26..2bc0262df 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -50,7 +50,7 @@
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqapplication.h>
 #include <tqwidgetstack.h>
 
@@ -129,7 +129,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     grid->addWidget( spnStart, 2, 2);
 
     lAlignment = new TQLabel( gStyle, "lAlignment" );
-    lAlignment->setText( i18n( "Counter alignment:" ) );
+    lAlignment->setText( i18n( "Counter tqalignment:" ) );
     grid->addWidget( lAlignment, 2, 3 );
 
     cbAlignment = new KComboBox( gStyle, "cbAlignment" );
@@ -205,7 +205,7 @@ void KoCounterStyleWidget::alignmentChanged(const TQString& s)
         kdError()<<"Not Implemented"<<endl;
         return;
     }
-    m_counter.setAlignment(a);
+    m_counter.tqsetAlignment(a);
     emit sig_alignmentChanged(a);
 }
 
@@ -296,11 +296,11 @@ void KoCounterStyleWidget::displayStyle( KoParagCounter::Style style )
     spnStart->setValue( m_counter.startNumber() );
 
     cbRestart->setChecked( m_counter.restartCounter() );
-    if(m_counter.alignment()==TQt::AlignLeft)
+    if(m_counter.tqalignment()==TQt::AlignLeft)
         cbAlignment->setCurrentText(i18n("Align Left"));
-    else if(m_counter.alignment()==TQt::AlignRight)
+    else if(m_counter.tqalignment()==TQt::AlignRight)
         cbAlignment->setCurrentText(i18n("Align Right"));
-    else if(m_counter.alignment()==TQt::AlignAuto)
+    else if(m_counter.tqalignment()==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 );
-    repaint( true );
+    tqrepaint( true );
 }
 
 void KoStylePreview::setStyle( KoParagStyle * style )
 {
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( style );
-    repaint(true);
+    tqrepaint(true);
 }
 
 void KoStylePreview::drawContents( TQPainter *painter )
@@ -830,7 +830,7 @@ void KoStylePreview::drawContents( TQPainter *painter )
 
     TQRect whiteRect( r.x() + 10, r.y() + 10,
                      r.width() - 20, r.height() - 20 );
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     painter->fillRect( whiteRect, cg.brush( TQColorGroup::Base ) );
 
     KoTextParag * parag = m_textdoc->firstParag();
@@ -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->invalidate(0);
+        parag->tqinvalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag alignment working,
+    // Center vertically, but not horizontally, to keep the parag tqalignment 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")
-		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.arg(KoUnit::unitName(m_unit));
+		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.tqarg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
 
@@ -890,12 +890,12 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     TQLabel * lLimit = new TQLabel(length , indentFrame );
     if(frameWidth!=-1)
     {
-        lLimit->setAlignment( AlignRight );
+        lLimit->tqsetAlignment( AlignRight );
         indentGrid->addWidget( lLimit, 1,0 );
     }
 
     TQLabel * lLeft = new TQLabel( i18n("&Left:"), indentFrame );
-    lLeft->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lLeft->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lLeft, 1, 0 );
 
     eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit );
@@ -904,7 +904,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) );
 
     TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame );
-    lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lRight->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lRight, 2, 0 );
 
     eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit );
@@ -913,7 +913,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) );
 
     TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame );
-    lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lFirstLine->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lFirstLine, 3, 0 );
 
     eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, 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)" ).arg(unitName) ); // LS_CUSTOM
-    cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) );
-    cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED
+    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
 
     connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) );
     spacingGrid->addWidget( cSpacing, 1, 0 );
@@ -974,7 +974,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
                                                 KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel * lBefore = new TQLabel( i18n("Before:"), pSpaceFrame );
-    lBefore->setAlignment( AlignRight );
+    lBefore->tqsetAlignment( AlignRight );
     pSpaceGrid->addWidget( lBefore, 1, 0 );
 
     eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit );
@@ -983,7 +983,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     pSpaceGrid->addWidget( eBefore, 1, 1 );
 
     TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame );
-    lAfter->setAlignment( AlignRight );
+    lAfter->tqsetAlignment( AlignRight );
     pSpaceGrid->addWidget( lAfter, 2, 0 );
 
     eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit );
@@ -1273,7 +1273,7 @@ int KoParagAlignWidget::pageBreaking() const
 
 void KoParagAlignWidget::display( const KoParagLayout & lay )
 {
-    int align = lay.alignment;
+    int align = lay.tqalignment;
     prev2->setAlign( align );
 
     clearAligns();
@@ -1302,7 +1302,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay )
 
 void KoParagAlignWidget::save( KoParagLayout & lay )
 {
-    lay.alignment = align();
+    lay.tqalignment = align();
     lay.pageBreaking = pageBreaking();
 }
 
@@ -1605,10 +1605,10 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent,
     gNumbering = new TQButtonGroup( this, "numberingGroup" );
     gNumbering->setTitle( i18n( "Numbering" ) );
     gNumbering->setColumnLayout(0, Qt::Vertical );
-    gNumbering->layout()->setSpacing( 0 );
-    gNumbering->layout()->setMargin( 0 );
-    TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() );
-    numberingGroupLayout->setAlignment( TQt::AlignTop );
+    gNumbering->tqlayout()->setSpacing( 0 );
+    gNumbering->tqlayout()->setMargin( 0 );
+    TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() );
+    numberingGroupLayout->tqsetAlignment( TQt::AlignTop );
     numberingGroupLayout->setSpacing( KDialog::spacingHint() );
     numberingGroupLayout->setMargin( KDialog::marginHint() );
 
@@ -1705,7 +1705,7 @@ void KoParagCounterWidget::display( const KoParagLayout & lay ) {
 
 void KoParagCounterWidget::updatePreview() {
     preview->setCounter(m_counter);
-    preview->repaint(true);
+    preview->tqrepaint(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")
-		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.arg(KoUnit::unitName(m_unit));
+		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.tqarg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
     TQVBoxLayout* Form1Layout = new TQVBoxLayout( this );
@@ -1770,10 +1770,10 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     gPosition = new TQGroupBox( this, "gPosition" );
     gPosition->setTitle( i18n( "Po&sition" ) );
     gPosition->setColumnLayout(0, Qt::Vertical );
-    gPosition->layout()->setSpacing( 0 );
-    gPosition->layout()->setMargin( 0 );
-    TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() );
-    GroupBox2Layout->setAlignment( TQt::AlignTop );
+    gPosition->tqlayout()->setSpacing( 0 );
+    gPosition->tqlayout()->setMargin( 0 );
+    TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() );
+    GroupBox2Layout->tqsetAlignment( TQt::AlignTop );
     GroupBox2Layout->setSpacing( KDialog::spacingHint() );
     GroupBox2Layout->setMargin( KDialog::marginHint() );
 
@@ -1798,10 +1798,10 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     bgAlign = new TQButtonGroup( this );
     bgAlign->setTitle( i18n( "Alignment" ) );
     bgAlign->setColumnLayout(0, Qt::Vertical );
-    bgAlign->layout()->setSpacing( 0 );
-    bgAlign->layout()->setMargin( 0 );
-    TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() );
-    ButtonGroup1Layout->setAlignment( TQt::AlignTop );
+    bgAlign->tqlayout()->setSpacing( 0 );
+    bgAlign->tqlayout()->setMargin( 0 );
+    TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() );
+    ButtonGroup1Layout->tqsetAlignment( TQt::AlignTop );
     ButtonGroup1Layout->setSpacing( KDialog::spacingHint() );
     ButtonGroup1Layout->setMargin( KDialog::marginHint() );
 
@@ -1837,7 +1837,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     gTabLeader = new TQGroupBox( this, "gTabLeader" );
     gTabLeader->setTitle( i18n( "Tab Leader" ) );
     TQVBoxLayout* GroupBox5Layout = new TQVBoxLayout( gTabLeader );
-    GroupBox5Layout->setAlignment( TQt::AlignTop );
+    GroupBox5Layout->tqsetAlignment( TQt::AlignTop );
     GroupBox5Layout->setSpacing( KDialog::spacingHint() );
     GroupBox5Layout->setMargin( KDialog::marginHint() );
     GroupBox5Layout->addSpacing( fontMetrics().height() / 2 ); // groupbox title
@@ -1850,7 +1850,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
 
     TQLabel* TextLabel2 = new TQLabel( gTabLeader);
     TextLabel2->setText( i18n( "&Filling:" ) );
-    TextLabel2->setAlignment( AlignRight );
+    TextLabel2->tqsetAlignment( AlignRight );
     fillingGrid->addWidget( TextLabel2, 0, 0 );
 
     cFilling = new TQComboBox( FALSE, gTabLeader);
@@ -1864,7 +1864,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     fillingGrid->addWidget( cFilling, 0, 1 );
 
     TQLabel * TextLabel3 = new TQLabel( i18n("&Width:"), gTabLeader );
-    TextLabel3->setAlignment( AlignRight );
+    TextLabel3->tqsetAlignment( AlignRight );
     fillingGrid->addWidget( TextLabel3, 1, 0 );
 
     eWidth = new KoUnitDoubleSpinBox( gTabLeader );
@@ -2159,31 +2159,31 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name,
     {
         TQVBox * page = addVBoxPage( i18n( "Indent && S&pacing" ) );
         m_indentSpacingWidget = new KoIndentSpacingWidget( unit,_frameWidth,page, "indent-spacing" );
-        m_indentSpacingWidget->layout()->setMargin(0);
+        m_indentSpacingWidget->tqlayout()->setMargin(0);
     }
     if ( m_flags & PD_ALIGN )
     {
         TQVBox * page = addVBoxPage( i18n( "General &Layout" ) );
         m_alignWidget = new KoParagAlignWidget( breakLine, page, "align" );
-        m_alignWidget->layout()->setMargin(0);
+        m_alignWidget->tqlayout()->setMargin(0);
     }
     if ( m_flags & PD_DECORATION )
     {
         TQVBox * page = addVBoxPage( i18n( "D&ecorations" ) );
         m_decorationsWidget = new KoParagDecorationWidget( page, "decorations");
-        m_decorationsWidget->layout()->setMargin(0);
+        m_decorationsWidget->tqlayout()->setMargin(0);
     }
     if ( m_flags & PD_NUMBERING )
     {
         TQVBox * page = addVBoxPage( i18n( "B&ullets/Numbers" ) );
         m_counterWidget = new KoParagCounterWidget( disableAll , page, "numbers" );
-        m_counterWidget->layout()->setMargin(0);
+        m_counterWidget->tqlayout()->setMargin(0);
     }
     if ( m_flags & PD_TABS )
     {
         TQVBox * page = addVBoxPage( i18n( "&Tabulators" ) );
         m_tabulatorsWidget = new KoParagTabulatorsWidget( unit,_frameWidth, page, "tabs");
-        m_tabulatorsWidget->layout()->setMargin(0);
+        m_tabulatorsWidget->tqlayout()->setMargin(0);
     }
 
     connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset()));
@@ -2272,7 +2272,7 @@ KoParagLayout KoParagDia::paragLayout() const
     newLayout.setLineSpacingValue( lineSpacing() );
     newLayout.lineSpacingType = lineSpacingType();
     newLayout.setTabList( tabListTabulator() );
-    newLayout.alignment = align();
+    newLayout.tqalignment = 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 2f3cc7510..c4bbed925 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <KoRuler.h>
 #include <KoUnit.h>
 #include <KoUnitWidgets.h>
@@ -95,7 +95,7 @@ public:
     /**  return the (i18n-ed) name of the tab */
     virtual TQString tabName() = 0;
 
-    // Return the part of the paraglayout that this widget cares about
+    // Return the part of the paragtqlayout that this widget cares about
     int flag() const { return m_flag; }
 
 private:
@@ -147,7 +147,7 @@ private:
 };
 
 /**
- * The widget for editing paragraph alignment (tab 2)
+ * The widget for editing paragraph tqalignment (tab 2)
  */
 class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget
 {
@@ -369,7 +369,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b); }
     void depthChanged(int i) {m_counter.setDepth(i); updatePreview();}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();}
-    void alignmentChanged(int i) {m_counter.setAlignment(i); updatePreview();}
+    void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
     void slotChangeCustomBullet( const TQString & f, TQChar c);
     void styleChanged (KoParagCounter::Style st );
 
@@ -549,7 +549,7 @@ public:
     TQColor backgroundColor() const { return m_decorationsWidget->backgroundColor(); }
 
     // Support for "what has changed?"
-    bool isAlignChanged() const {return oldLayout.alignment!=align();}
+    bool isAlignChanged() const {return oldLayout.tqalignment!=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 48f77ea17..a1ca5737f 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; repaint( false ); }
+    { left = _left; tqrepaint( false ); }
     void setRight( double _right )
-    { right = _right; repaint( false ); }
+    { right = _right; tqrepaint( false ); }
     void setFirst( double _first )
-    { first = _first; repaint( false ); }
+    { first = _first; tqrepaint( false ); }
     void setSpacing( double _spacing )
-    { spacing = _spacing; repaint( false ); }
+    { spacing = _spacing; tqrepaint( false ); }
     void setBefore( double _before )
-    { before = _before; repaint( false ); }
+    { before = _before; tqrepaint( false ); }
     void setAfter( double _after )
-    { after = _after; repaint( false ); }
+    { after = _after; tqrepaint( false ); }
 
 protected:
     void drawContents( TQPainter* );
@@ -100,7 +100,7 @@ public:
     ~KPagePreview2() {}
 
     void setAlign( int _align )
-    { align = _align; repaint( false ); }
+    { align = _align; tqrepaint( false ); }
 
 protected:
     void drawContents( TQPainter* );
@@ -124,16 +124,16 @@ public:
 
     KoBorder leftBorder()const { return m_leftBorder; }
     void setLeftBorder( const KoBorder& _leftBorder ) 
-	{ m_leftBorder = _leftBorder; repaint( true ); }
+	{ m_leftBorder = _leftBorder; tqrepaint( true ); }
     KoBorder rightBorder() const { return m_rightBorder; }
     void setRightBorder( const KoBorder& _rightBorder )
-	{ m_rightBorder = _rightBorder; repaint( true ); }
+	{ m_rightBorder = _rightBorder; tqrepaint( true ); }
     KoBorder topBorder()const { return m_topBorder; }
     void setTopBorder( const KoBorder& _topBorder )
-	{ m_topBorder = _topBorder; repaint( true ); }
+	{ m_topBorder = _topBorder; tqrepaint( true ); }
     KoBorder bottomBorder()const { return m_bottomBorder; }
     void setBottomBorder( const KoBorder& _bottomBorder )
-	{ m_bottomBorder = _bottomBorder; repaint( true ); }
+	{ m_bottomBorder = _bottomBorder; tqrepaint( true ); }
 
     void setBorder( KoBorder::BorderType which, const KoBorder& border);
 
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index 37fbbfb50..fd1a94535 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -44,72 +44,72 @@ KoParagLayout::KoParagLayout()
     initialise();
 }
 
-void KoParagLayout::operator=( const KoParagLayout &layout )
+void KoParagLayout::operator=( const KoParagLayout &tqlayout )
 {
-    alignment = layout.alignment;
+    tqalignment = tqlayout.tqalignment;
     for ( int i = 0 ; i < 5 ; ++i )
-        margins[i] = layout.margins[i];
-    pageBreaking = layout.pageBreaking;
-    leftBorder = layout.leftBorder;
-    rightBorder = layout.rightBorder;
-    topBorder = layout.topBorder;
-    bottomBorder = layout.bottomBorder;
-    joinBorder = layout.joinBorder;
-    backgroundColor = layout.backgroundColor;
-    if ( layout.counter )
-        counter = new KoParagCounter( *layout.counter );
+        margins[i] = tqlayout.margins[i];
+    pageBreaking = tqlayout.pageBreaking;
+    leftBorder = tqlayout.leftBorder;
+    rightBorder = tqlayout.rightBorder;
+    topBorder = tqlayout.topBorder;
+    bottomBorder = tqlayout.bottomBorder;
+    joinBorder = tqlayout.joinBorder;
+    backgroundColor = tqlayout.backgroundColor;
+    if ( tqlayout.counter )
+        counter = new KoParagCounter( *tqlayout.counter );
     else
         counter = 0L;
-    lineSpacing = layout.lineSpacing;
-    lineSpacingType = layout.lineSpacingType;
-    style = layout.style;
-    direction = layout.direction;
-    setTabList( layout.tabList() );
+    lineSpacing = tqlayout.lineSpacing;
+    lineSpacingType = tqlayout.lineSpacingType;
+    style = tqlayout.style;
+    direction = tqlayout.direction;
+    setTabList( tqlayout.tabList() );
 }
 
-int KoParagLayout::compare( const KoParagLayout & layout ) const
+int KoParagLayout::compare( const KoParagLayout & tqlayout ) const
 {
     int flags = 0;
-    if ( alignment != layout.alignment )
+    if ( tqalignment != tqlayout.tqalignment )
         flags |= Alignment;
     for ( int i = 0 ; i < 5 ; ++i )
-        if ( margins[i] != layout.margins[i] )
+        if ( margins[i] != tqlayout.margins[i] )
         {
             flags |= Margins;
             break;
         }
-    if ( pageBreaking != layout.pageBreaking )
+    if ( pageBreaking != tqlayout.pageBreaking )
         flags |= PageBreaking;
-    if ( leftBorder != layout.leftBorder
-         || rightBorder != layout.rightBorder
-         || topBorder != layout.topBorder
-         || bottomBorder != layout.bottomBorder
-         || joinBorder != layout.joinBorder )
+    if ( leftBorder != tqlayout.leftBorder
+         || rightBorder != tqlayout.rightBorder
+         || topBorder != tqlayout.topBorder
+         || bottomBorder != tqlayout.bottomBorder
+         || joinBorder != tqlayout.joinBorder )
         flags |= Borders;
 
-    if ( layout.counter )
+    if ( tqlayout.counter )
     {
         if ( counter )
         {
-            if ( ! ( *layout.counter == *counter ) )
+            if ( ! ( *tqlayout.counter == *counter ) )
                 flags |= BulletNumber;
         } else
-            if ( layout.counter->numbering() != KoParagCounter::NUM_NONE )
+            if ( tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
                 flags |= BulletNumber;
     }
     else
         if ( counter && counter->numbering() != KoParagCounter::NUM_NONE )
             flags |= BulletNumber;
 
-    if ( lineSpacing != layout.lineSpacing
-        || lineSpacingType != layout.lineSpacingType )
+    if ( lineSpacing != tqlayout.lineSpacing
+        || lineSpacingType != tqlayout.lineSpacingType )
         flags |= LineSpacing;
-    //if ( style != layout.style )
+    //if ( style != tqlayout.style )
     //    flags |= Style;
-    if ( m_tabList != layout.m_tabList )
+    if ( m_tabList != tqlayout.m_tabList )
         flags |= Tabulator;
 
-    if ( backgroundColor != layout.backgroundColor)
+    if ( backgroundColor != tqlayout.backgroundColor)
         flags |= BackgroundColor;
 
     // This method is used for the GUI stuff only, so we don't have a flag
@@ -119,7 +119,7 @@ int KoParagLayout::compare( const KoParagLayout & layout ) const
 
 void KoParagLayout::initialise()
 {
-    alignment = TQt::AlignAuto;
+    tqalignment = TQt::AlignAuto;
     for ( int i = 0 ; i < 5 ; ++i ) // use memset ?
         margins[i] = 0;
     lineSpacingType = LS_SINGLE;
@@ -141,13 +141,13 @@ KoParagLayout::~KoParagLayout()
     delete counter;
 }
 
-void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion )
+void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion )
 {
-    // layout is an input and output parameter
+    // tqlayout is an input and output parameter
     // It can have been initialized already, e.g. by copying from a style
     // (we don't do that anymore though).
 
-    // Load the paragraph tabs - we load into a clean list, not mixing with those already in "layout"
+    // Load the paragraph tabs - we load into a clean list, not mixing with those already in "tqlayout"
     // We can't apply the 'default comes from the style' in this case, because
     // there is no way to differentiate between "I want no tabs in the parag"
     // and "use default from style".
@@ -171,15 +171,15 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
         }
     }
     qHeapSort( tabList );
-    layout.setTabList( tabList );
-    layout.alignment = TQt::AlignAuto;
-    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called alignment internally
+    tqlayout.setTabList( tabList );
+    tqlayout.tqalignment = TQt::AlignAuto;
+    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
     if ( !element.isNull() )
     {
         TQString flow = element.attribute( "align" ); // KWord-1.0 DTD
         if ( !flow.isEmpty() )
         {
-            layout.alignment = flow=="right" ? TQt::AlignRight :
+            tqlayout.tqalignment = flow=="right" ? TQt::AlignRight :
                          flow=="center" ? TQt::AlignHCenter :
                          flow=="justify" ? TQt::AlignJustify :
                          flow=="left" ? TQt::AlignLeft : TQt::AlignAuto;
@@ -187,9 +187,9 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
             TQString dir = element.attribute( "dir" ); // KWord-1.2
             if ( !dir.isEmpty() ) {
                 if ( dir == "L" )
-                    layout.direction = TQChar::DirL;
+                    tqlayout.direction = TQChar::DirL;
                 else if ( dir == "R" )
-                    layout.direction = TQChar::DirR;
+                    tqlayout.direction = TQChar::DirR;
                 else
                     kdWarning() << "Unexpected value for paragraph direction: " << dir << endl;
             }
@@ -197,7 +197,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, 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 )
-                layout.alignment = flow2align[flow.toInt()];
+                tqlayout.tqalignment = flow2align[flow.toInt()];
         }
     }
 
@@ -205,34 +205,34 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
     {
         element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
-            layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 );
+            tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 );
 
         element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
-            layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 );
+            tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 );
 
         element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
-            layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 );
+            tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 );
 
         element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
-            layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 );
+            tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 );
     }
 
     // KWord-1.0 DTD
     element = parentElem.namedItem( "INDENTS" ).toElement();
     if ( !element.isNull() )
     {
-        layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 );
-        layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 );
-        layout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 );
+        tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 );
+        tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 );
+        tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 );
     }
     element = parentElem.namedItem( "OFFSETS" ).toElement();
     if ( !element.isNull() )
     {
-        layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 );
-        layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 );
+        tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 );
+        tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 );
     }
 
     if ( docVersion < 2 )
@@ -240,8 +240,8 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
         element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
         {
-            layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-            layout.lineSpacing = getAttribute( element, "pt", 0.0 );
+            tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+            tqlayout.lineSpacing = getAttribute( element, "pt", 0.0 );
         }
     }
 
@@ -254,18 +254,18 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
             TQString value = element.attribute( "value" );
             if ( value == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.lineSpacing = 0;
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.lineSpacing = 0;
             }
             else if ( value == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.lineSpacing = 0;
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.lineSpacing = 0;
             }
             else
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.lineSpacing = value.toDouble();
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.lineSpacing = value.toDouble();
             }
         }
         else
@@ -273,36 +273,36 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
             TQString type = element.attribute( "type" );
             if ( type == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.lineSpacing = 0;
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.lineSpacing = 0;
             }
             else if ( type == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.lineSpacing = 0;
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.lineSpacing = 0;
             }
             else if ( type == "custom" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
             }
             else if ( type == "atleast" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
-                layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
+                tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
+                tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
             }
             else if ( type == "multiple" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
-                layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
+                tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
+                tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
             }
             else if ( type == "fixed" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_FIXED;
-                layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
+                tqlayout.lineSpacingType = KoParagLayout::LS_FIXED;
+                tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble();
             }
             else if ( type == "single" ) // not used; just in case future versions use it.
-                layout.lineSpacingType = KoParagLayout::LS_SINGLE;
+                tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE;
         }
     }
 
@@ -323,37 +323,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement&
         if ( !element.isNull() )
             pageBreaking |= KoParagLayout::HardFrameBreakBefore;
     }
-    layout.pageBreaking = pageBreaking;
+    tqlayout.pageBreaking = pageBreaking;
 
     element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.leftBorder = KoBorder::loadBorder( element );
+        tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
-        layout.leftBorder.setPenWidth(0);
+        tqlayout.leftBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.rightBorder = KoBorder::loadBorder( element );
+        tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
-        layout.rightBorder.setPenWidth(0);
+        tqlayout.rightBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.topBorder = KoBorder::loadBorder( element );
+        tqlayout.topBorder = KoBorder::loadBorder( element );
     else
-        layout.topBorder.setPenWidth(0);
+        tqlayout.topBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.bottomBorder = KoBorder::loadBorder( element );
+        tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
-        layout.bottomBorder.setPenWidth(0);
+        tqlayout.bottomBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
-        layout.counter = new KoParagCounter;
-        layout.counter->load( element );
+        tqlayout.counter = new KoParagCounter;
+        tqlayout.counter->load( element );
     }
 
     // Compatibility with KOffice-1.2
@@ -425,38 +425,38 @@ TQt::AlignmentFlags KoParagLayout::loadOasisAlignment( const TQCString& str )
 }
 
 //static
-TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags alignment )
+TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags tqalignment )
 {
-   return alignment == TQt::AlignLeft ? "left" :
-       alignment == TQt::AlignRight ? "right" :
-       alignment == TQt::AlignHCenter ? "center" :
-       alignment == TQt::AlignJustify ? "justify" :
+   return tqalignment == TQt::AlignLeft ? "left" :
+       tqalignment == TQt::AlignRight ? "right" :
+       tqalignment == TQt::AlignHCenter ? "center" :
+       tqalignment == TQt::AlignJustify ? "justify" :
        "start"; // i.e. direction-dependent
 }
 
-void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context )
+void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context )
 {
     context.styleStack().setTypeProperties( "paragraph" );
-    // layout is an input and output parameter
+    // tqlayout is an input and output parameter
     // It can have been initialized already, e.g. by copying from a style
 
     // code from OoWriterImport::writeLayout
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-align" ) ) {
         TQCString align = context.styleStack().attributeNS( KoXmlNS::fo, "text-align" ).latin1();
-        layout.alignment = loadOasisAlignment( align );
+        tqlayout.tqalignment = loadOasisAlignment( align );
     }
 
     if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { // http://web4.w3.org/TR/xsl/slice7.html#writing-mode
         // LTR is lr-tb. RTL is rl-tb
         TQString writingMode = context.styleStack().attributeNS( KoXmlNS::style, "writing-mode" );
-        layout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL;
+        tqlayout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL;
     }
 
     // Indentation (margins)
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-left" ) || // 3.11.19
          context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-right" ) ) {
-        layout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) );
-        layout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) );
+        tqlayout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) );
+        tqlayout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) );
         // *text-indent must always be bound to either margin-left or margin-right
         double first = 0;
         if ( context.styleStack().attributeNS( KoXmlNS::style, "auto-text-indent") == "true" ) // style:auto-text-indent takes precedence
@@ -467,14 +467,14 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
         else if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-indent") )
             first = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "text-indent") );
 
-        layout.margins[TQStyleSheetItem::MarginFirstLine] = first;
+        tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = first;
     }
 
     // Offset before and after paragraph
     if( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-top") || // 3.11.22
         context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-bottom")) {
-        layout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) );
-        layout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) );
+        tqlayout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) );
+        tqlayout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) );
     }
 
     // Line spacing
@@ -483,23 +483,23 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
         TQString value = context.styleStack().attributeNS( KoXmlNS::fo, "line-height" );
         if ( value != "normal" ) {
             if ( value == "100%" )
-                layout.lineSpacingType = KoParagLayout::LS_SINGLE;
+                tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE;
             else if( value=="150%")
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
             else if( value=="200%")
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
             else if ( value.find('%') > -1 )
             {
                 value = value.remove( '%' );
                 double percent = value.toDouble();
-                layout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
-                layout.lineSpacing = percent / 100.0;
-                kdDebug(33001) << "line-height =" << percent << ", " << layout.lineSpacing << ", " << percent/100 << endl;
+                tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
+                tqlayout.lineSpacing = percent / 100.0;
+                kdDebug(33001) << "line-height =" << percent << ", " << tqlayout.lineSpacing << ", " << percent/100 << endl;
             }
             else // fixed value
             {
-                layout.lineSpacingType = KoParagLayout::LS_FIXED;
-                layout.lineSpacing = KoUnit::parseValue( value );
+                tqlayout.lineSpacingType = KoParagLayout::LS_FIXED;
+                tqlayout.lineSpacing = KoUnit::parseValue( value );
             }
         }
     }
@@ -512,8 +512,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
         // Did we make the wrong choice in kotext?
         //kdWarning() << "Unimplemented support for style:line-height-at-least: " << value << endl;
         // Well let's see if this makes a big difference.
-        layout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
-        layout.lineSpacing = KoUnit::parseValue( value );
+        tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
+        tqlayout.lineSpacing = KoUnit::parseValue( value );
     }
     // Line-spacing is mutually exclusive with line-height and line-height-at-least
     else if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "line-spacing") ) // 3.11.3
@@ -521,8 +521,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
         double value = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::style, "line-spacing" ) );
         if ( value != 0.0 )
         {
-            layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-            layout.lineSpacing = value;
+            tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+            tqlayout.lineSpacing = value;
         }
     }
 
@@ -530,7 +530,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
     KoTabulatorList tabList;
     if ( context.styleStack().hasChildNodeNS( KoXmlNS::style, "tab-stops" ) ) { // 3.11.10
         TQDomElement tabStops = context.styleStack().childNodeNS( KoXmlNS::style, "tab-stops" );
-        //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
+        //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl;
         TQDomElement tabStop;
         forEachElement( tabStop, tabStops )
         {
@@ -540,7 +540,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
             KoTabulator tab;
             tab.ptPos = KoUnit::parseValue( tabStop.attributeNS( KoXmlNS::style, "position", TQString() ) );
             // Tab stop positions in the XML are relative to the left-margin
-            tab.ptPos += layout.margins[TQStyleSheetItem::MarginLeft];
+            tab.ptPos += tqlayout.margins[TQStyleSheetItem::MarginLeft];
             if ( type == "center" )
                 tab.type = T_CENTER;
             else if ( type == "right" )
@@ -549,7 +549,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
                 TQString delimiterChar = tabStop.attributeNS( KoXmlNS::style, "char", TQString() ); // single character
                 if ( !delimiterChar.isEmpty() )
                     tab.alignChar = delimiterChar[0];
-                tab.type = T_DEC_PNT; // "alignment on decimal point"
+                tab.type = T_DEC_PNT; // "tqalignment on decimal point"
             }
             else //if ( type == "left" )
                 tab.type = T_LEFT;
@@ -573,7 +573,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
             }
             else
             {
-                // Fallback: convert leaderChar's unicode value
+                // Fallback: convert leaderChar's tqunicode value
                 TQString leaderChar = tabStop.attributeNS( KoXmlNS::style, "leader-text", TQString() );
                 if ( !leaderChar.isEmpty() )
                 {
@@ -594,27 +594,27 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
         } //for
     }
     qHeapSort( tabList );
-    layout.setTabList( tabList );
+    tqlayout.setTabList( tabList );
 
-    layout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" );
+    tqlayout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" );
 
     // Borders
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","left") )
-        layout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") );
+        tqlayout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") );
     else
-        layout.leftBorder.setPenWidth(0);
+        tqlayout.leftBorder.setPenWidth(0);
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","right") )
-        layout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") );
+        tqlayout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") );
     else
-        layout.rightBorder.setPenWidth(0);
+        tqlayout.rightBorder.setPenWidth(0);
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","top") )
-        layout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") );
+        tqlayout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") );
     else
-        layout.topBorder.setPenWidth(0);
+        tqlayout.topBorder.setPenWidth(0);
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","bottom") )
-        layout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") );
+        tqlayout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") );
     else
-        layout.bottomBorder.setPenWidth(0);
+        tqlayout.bottomBorder.setPenWidth(0);
 
 
     // Page breaking
@@ -647,148 +647,148 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext&
                 pageBreaking |= KoParagLayout::KeepWithNext;
         }
     }
-    layout.pageBreaking = pageBreaking;
+    tqlayout.pageBreaking = pageBreaking;
 
     // Paragraph background color -  fo:background-color
     // The background color for parts of a paragraph that have no text underneath
     if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "background-color" ) ) {
         TQString bgColor = context.styleStack().attributeNS( KoXmlNS::fo, "background-color");
         if (bgColor != "transparent")
-            layout.backgroundColor.setNamedColor( bgColor );
+            tqlayout.backgroundColor.setNamedColor( bgColor );
     }
 }
 
-void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment ) const
+void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const
 {
-    const KoParagLayout& layout = *this; // code moved from somewhere else;)
+    const KoParagLayout& tqlayout = *this; // code moved from somewhere else;)
     TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
     parentElem.appendChild( element );
-    if ( layout.style )
-        element.setAttribute( "value", layout.style->displayName() );
+    if ( tqlayout.style )
+        element.setAttribute( "value", tqlayout.style->displayName() );
     //else
     //    kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl;
 
     element = doc.createElement( "FLOW" );
     parentElem.appendChild( element );
 
-    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.
+    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.
 
-    if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirR )
+    if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirR )
         element.setAttribute( "dir", "R" );
     else
-	if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirL )
+	if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirL )
             element.setAttribute( "dir", "L" );
 
-    if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginRight] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
-            element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] );
-        if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 )
-            element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] );
-        if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 )
-            element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
+            element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
+            element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
+            element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] );
     }
 
-    if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 )
-            element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] );
-        if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
-            element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
+            element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+            element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] );
     }
-    if ( layout.lineSpacingType != LS_SINGLE )
+    if ( tqlayout.lineSpacingType != LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
         parentElem.appendChild( element );
-        if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )  {
+        if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )  {
             element.setAttribute( "type", "oneandhalf" );
             element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) {
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) {
             element.setAttribute( "type", "double" );
             element.setAttribute( "value", "double" ); //compatibility with koffice 1.2
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM )
         {
             element.setAttribute( "type", "custom" );
-            element.setAttribute( "spacingvalue", layout.lineSpacing);
-            element.setAttribute( "value", layout.lineSpacing ); //compatibility with koffice 1.2
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacing);
+            element.setAttribute( "value", tqlayout.lineSpacing ); //compatibility with koffice 1.2
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
         {
             element.setAttribute( "type", "atleast" );
-            element.setAttribute( "spacingvalue", layout.lineSpacing);
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacing);
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
         {
             element.setAttribute( "type", "multiple" );
-            element.setAttribute( "spacingvalue", layout.lineSpacing);
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacing);
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_FIXED )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_FIXED )
         {
             element.setAttribute( "type", "fixed" );
-            element.setAttribute( "spacingvalue", layout.lineSpacing);
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacing);
         }
         else
             kdDebug()<<" error in lineSpacing Type\n";
     }
 
-    if ( layout.pageBreaking != 0 )
+    if ( tqlayout.pageBreaking != 0 )
     {
         element = doc.createElement( "PAGEBREAKING" );
         parentElem.appendChild( element );
-        if ( layout.pageBreaking & KoParagLayout::KeepLinesTogether )
+        if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether )
             element.setAttribute( "linesTogether",  "true" );
-        if ( layout.pageBreaking & KoParagLayout::HardFrameBreakBefore )
+        if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore )
             element.setAttribute( "hardFrameBreak", "true" );
-        if ( layout.pageBreaking & KoParagLayout::HardFrameBreakAfter )
+        if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakAfter )
             element.setAttribute( "hardFrameBreakAfter", "true" );
     }
 
-    if ( layout.leftBorder.penWidth() > 0 )
+    if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
         parentElem.appendChild( element );
-        layout.leftBorder.save( element );
+        tqlayout.leftBorder.save( element );
     }
-    if ( layout.rightBorder.penWidth() > 0 )
+    if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
         parentElem.appendChild( element );
-        layout.rightBorder.save( element );
+        tqlayout.rightBorder.save( element );
     }
-    if ( layout.topBorder.penWidth() > 0 )
+    if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
         parentElem.appendChild( element );
-        layout.topBorder.save( element );
+        tqlayout.topBorder.save( element );
     }
-    if ( layout.bottomBorder.penWidth() > 0 )
+    if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
         parentElem.appendChild( element );
-        layout.bottomBorder.save( element );
+        tqlayout.bottomBorder.save( element );
     }
-    if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE )
+    if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
         parentElem.appendChild( element );
-        if ( layout.counter )
-            layout.counter->save( element );
+        if ( tqlayout.counter )
+            tqlayout.counter->save( element );
     }
 
-    KoTabulatorList tabList = layout.tabList();
+    KoTabulatorList tabList = tqlayout.tabList();
     KoTabulatorList::ConstIterator it = tabList.begin();
     for ( ; it != tabList.end() ; it++ )
     {
@@ -806,7 +806,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment )
 
 void KoParagLayout::saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const
 {
-    gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)alignment ).data() );
+    gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)tqalignment ).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:  // "alignment on decimal point"
+        case T_DEC_PNT:  // "tqalignment 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 975fdaf04..2c9b9dea3 100644
--- a/lib/kotext/KoParagLayout.h
+++ b/lib/kotext/KoParagLayout.h
@@ -40,7 +40,7 @@ class KOTEXT_EXPORT KoParagLayout
 {
 public:
     KoParagLayout();
-    KoParagLayout( const KoParagLayout &layout ) { operator=( layout ); }
+    KoParagLayout( const KoParagLayout &tqlayout ) { operator=( tqlayout ); }
 
     ~KoParagLayout();
 
@@ -96,7 +96,7 @@ public:
     char pageBreaking;    // Page breaking flags
     char direction;       // TQChar::Direction
     /// Alignment flag (AlignAuto/AlignLeft/AlignRight/AlignJustify)
-    char alignment; // TQt::AlignmentFlags
+    char tqalignment; // TQt::AlignmentFlags
     KoBorder leftBorder, rightBorder, topBorder, bottomBorder;
 
     /// The background color of the paragraph
@@ -122,39 +122,39 @@ public:
     const KoTabulatorList& tabList() const { return m_tabList; }
 
     //! Assignment operator for KoParagLayout
-    /** Copy a paragraph layout.
+    /** Copy a paragraph tqlayout.
      *
      *  If you're modifying this, you might also need to modify
      * KoTextParag::setParagLayout
      */
     void operator=( const KoParagLayout & );
 
-    /** Return a set of flags showing the differences between this and 'layout' */
-    int compare( const KoParagLayout & layout ) const;
+    /** Return a set of flags showing the differences between this and 'tqlayout' */
+    int compare( const KoParagLayout & tqlayout ) const;
 
-    /** Save this parag layout to XML.
+    /** 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 alignment ) const;
+    void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const;
 
-    /** Load this parag layout from XML.
+    /** Load this parag tqlayout from XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    static void loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion = 2 );
+    static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 );
 
-    /// Load this parag layout from Oasis XML
-    static void loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context );
-    /// Save this parag layout to Oasis XML
+    /// Load this parag tqlayout from Oasis XML
+    static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context );
+    /// Save this parag tqlayout to Oasis XML
     /// @param savingStyle true if this is saved as part of a user style,
     ///                    false when saving a paragraph
     /// @param gs the style where all the properties will be saved to
     /// @param context the current context
     void saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const;
 
-    /// Convert an alignment string into an alignment flag (load)
+    /// Convert an tqalignment string into an tqalignment flag (load)
     static TQt::AlignmentFlags loadOasisAlignment( const TQCString& str );
-    /// Convert an alignment flag into an alignment string (save)
-    static TQCString saveOasisAlignment( TQt::AlignmentFlags alignment );
+    /// Convert an tqalignment flag into an tqalignment string (save)
+    static TQCString saveOasisAlignment( TQt::AlignmentFlags tqalignment );
 
 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 fcae882c3..a68c6768c 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.alignment );
+    m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment );
 
     if ( followingStyle() )
     {
@@ -103,12 +103,12 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem )
 
 void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion )
 {
-    KoParagLayout layout;
-    KoParagLayout::loadParagLayout( layout, parentElem, docVersion );
+    KoParagLayout tqlayout;
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion );
 
     // This way, KoTextParag::setParagLayout also sets the style pointer, to this style
-    layout.style = this;
-    m_paragLayout = layout;
+    tqlayout.style = this;
+    m_paragLayout = tqlayout;
 
     // Load name
     TQDomElement nameElem = parentElem.namedItem("NAME").toElement();
@@ -138,8 +138,8 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
 
     context.styleStack().save();
     context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance.
-    KoParagLayout layout;
-    KoParagLayout::loadOasisParagLayout( layout, context );
+    KoParagLayout tqlayout;
+    KoParagLayout::loadOasisParagLayout( tqlayout, context );
 
     // loadOasisParagLayout doesn't load the counter. It's modelled differently for parags and for styles.
     int level = 0;
@@ -172,15 +172,15 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
         const TQDomElement listStyle = context.listStyleStack().currentListStyle();
         // The tag is either text:list-level-style-number or text:list-level-style-bullet
         const bool ordered = listStyle.localName() == "list-level-style-number";
-        Q_ASSERT( !layout.counter );
-        layout.counter = new KoParagCounter;
-        layout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true );
+        Q_ASSERT( !tqlayout.counter );
+        tqlayout.counter = new KoParagCounter;
+        tqlayout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true );
         context.listStyleStack().pop();
     }
 
     // This way, KoTextParag::setParagLayout also sets the style pointer, to this style
-    layout.style = this;
-    m_paragLayout = layout;
+    tqlayout.style = this;
+    m_paragLayout = tqlayout;
 
     m_format.load( context );
 
@@ -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" ).arg( m_displayName ) );
+                                    i18n( "Numbering Style for %1" ).tqarg( 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.alignment = m_parentStyle->paragLayout().alignment;
+        m_paragLayout.tqalignment = m_parentStyle->paragLayout().tqalignment;
     if ( !(paragLayoutFlag & KoParagLayout::Margins) )
         for ( int i = 0 ; i < 5 ; ++i )
             m_paragLayout.margins[i] = m_parentStyle->paragLayout().margins[i];
@@ -269,9 +269,9 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ )
 #if 0
     if ( paragLayoutFlag == KoParagLayout::All )
     {
-        setDirection( static_cast<TQChar::Direction>(layout.direction) );
+        setDirection( static_cast<TQChar::Direction>(tqlayout.direction) );
         // Don't call applyStyle from here, it would overwrite any paragraph-specific settings
-        setStyle( layout.style );
+        setStyle( tqlayout.style );
     }
 #endif
     // TODO a flag for the "is outline" bool? Otherwise we have no way to inherit
diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h
index 0e396b64c..190ad345f 100644
--- a/lib/kotext/KoParagStyle.h
+++ b/lib/kotext/KoParagStyle.h
@@ -49,7 +49,7 @@ protected:
 
 /**
  * A paragraph style is a combination of a character style
- * and paragraph-layout attributes, all grouped under a name.
+ * and paragraph-tqlayout attributes, all grouped under a name.
  */
 class KOTEXT_EXPORT KoParagStyle : public KoCharStyle
 {
@@ -71,10 +71,10 @@ public:
     KoParagStyle *followingStyle() const { return m_followingStyle; }
     void setFollowingStyle( KoParagStyle *fst );
 
-    /// Saves the name, layout, the following style and the outline bool. Not the format.
+    /// Saves the name, tqlayout, the following style and the outline bool. Not the format.
     /// @deprecated  (1.3 format)
     void saveStyle( TQDomElement & parentElem );
-    /// Loads the name, layout and the outline bool. Not the "following style" nor the format.
+    /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format.
     /// (1.3 format)
     void loadStyle( TQDomElement & parentElem, int docVersion = 2 );
 
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index cfce5f311..42e8d2b0d 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -47,7 +47,7 @@
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <textengine_p.h>
+#include <tqtextengine_p.h>
 
 //#define DEBUG_COLLECTION
 //#define DEBUG_TABLE_RENDERING
@@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c )
     if ( !p )
 	return c;
     while ( p ) {
-	p->setAlignment( newAlign );
+	p->tqsetAlignment( newAlign );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
@@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c )
     int i = 0;
     while ( p ) {
 	if ( i < (int)oldAligns.size() )
-	    p->setAlignment( oldAligns.at( i ) );
+	    p->tqsetAlignment( oldAligns.at( i ) );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
@@ -375,7 +375,7 @@ bool KoTextCursor::operator==( const KoTextCursor &c ) const
 
 void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<KoTextStringChar> *formatting )
 {
-    string->invalidate( idx );
+    string->tqinvalidate( 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->invalidate( 0 );
+                string->tqinvalidate( 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->invalidate( 0 );
+	    p->tqinvalidate( 0 );
 	    p = p->next();
 	}
     }
@@ -963,7 +963,7 @@ bool KoTextCursor::remove()
 	    KoTextParag *p = string->next();
 	    delete string;
 	    string = p;
-	    string->invalidate( 0 );
+	    string->tqinvalidate( 0 );
             //// kotext
             string->invalidateCounters();
             ////
@@ -1332,7 +1332,7 @@ TQString KoTextString::toString( const TQMemArray<KoTextStringChar> &data )
     int l = data.size();
     s.setUnicode( 0, l );
     KoTextStringChar *c = data.data();
-    TQChar *uc = (TQChar *)s.unicode();
+    TQChar *uc = (TQChar *)s.tqunicode();
     while ( l-- ) {
 	*uc = c->c;
 	uc++;
@@ -1348,7 +1348,7 @@ TQString KoTextString::toReverseString() const
     int l = length();
     s.setUnicode(0, l);
     KoTextStringChar *c = data.data() + (l-1);
-    TQChar *uc = (TQChar *)s.unicode();
+    TQChar *uc = (TQChar *)s.tqunicode();
     while ( l-- ) {
 	*uc = c->c;
 	uc++;
@@ -1505,7 +1505,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
     str.setUnicode( 0, last - start + 1 );
     // fill string with logically ordered chars.
     KoTextStringChar *ch = startChar;
-    TQChar *qch = (TQChar *)str.unicode();
+    TQChar *qch = (TQChar *)str.tqunicode();
     while ( ch <= lastChar ) {
 	*qch = ch->c;
 	qch++;
@@ -1520,7 +1520,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
     // now construct the reordered string out of the runs...
 
     int numSpaces = 0;
-    // set the correct alignment. This is a bit messy....
+    // set the correct tqalignment. This is a bit messy....
     if( align == TQt::AlignAuto ) {
 	// align according to directionality of the paragraph...
 	if ( text->isRightToLeft() )
@@ -1562,7 +1562,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
 		c->rightToLeft = TRUE;
 		c->startOfRun = FALSE;
 		int ww = 0;
-		if ( c->c.unicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) {
+		if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) {
 		    ww = c->width;
 		} else {
 		    ww = c->format()->width( ' ' );
@@ -1589,7 +1589,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para
 		c->rightToLeft = FALSE;
 		c->startOfRun = FALSE;
 		int ww = 0;
-		if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) {
+		if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->isCustom() ) {
 		    ww = c->width;
 		} else {
 		    ww = c->format()->width( ' ' );
diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h
index 8e82bd9cb..44c360d5b 100644
--- a/lib/kotext/KoRichText.h
+++ b/lib/kotext/KoRichText.h
@@ -45,7 +45,7 @@
 #include <tqsize.h>
 #include <tqvaluelist.h>
 #include <tqobject.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqpainter.h>
 #include "KoComplexText.h"
 
@@ -93,7 +93,7 @@ public:
 
     // this is the same struct as in qtextengine_p.h. Don't change!
     uchar softBreak      :1;     // Potential linebreak point
-    uchar whiteSpace     :1;     // A unicode whitespace character, except NBSP, ZWNBSP
+    uchar whiteSpace     :1;     // A tqunicode whitespace character, except NBSP, ZWNBSP
     uchar charStop       :1;     // Valid cursor position (for left/right arrow)
     uchar wordStop       :1;     // Valid cursor position (for ctrl + left/right arrow) (TODO: use)
     //uchar nobreak        :1;
@@ -477,13 +477,13 @@ public:
     KoTextTableCell( KoTextTable* table, int row, int column );
     virtual ~KoTextTableCell();
 
-    TQSize sizeHint() const ;
-    TQSize minimumSize() const ;
-    TQSize maximumSize() const ;
+    TQSize tqsizeHint() const ;
+    TQSize tqminimumSize() const ;
+    TQSize tqmaximumSize() const ;
     TQSizePolicy::ExpandData expanding() const;
     bool isEmpty() const;
     void setGeometry( const TQRect& ) ;
-    TQRect geometry() const;
+    TQRect tqgeometry() 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 invalidate();
+    virtual void tqinvalidate();
 
     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 invalidate();
+    virtual void tqinvalidate();
     /// ## 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 );
@@ -564,12 +564,12 @@ public:
 
     TQString richText() const;
 
-    int minimumWidth() const { return layout ? layout->minimumSize().width() : 0; }
-    int widthHint() const { return ( layout ? layout->sizeHint().width() : 0 ) + 2 * outerborder; }
+    int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; }
+    int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; }
 
     TQPtrList<KoTextTableCell> tableCells() const { return cells; }
 
-    TQRect geometry() const { return layout ? layout->geometry() : TQRect(); }
+    TQRect tqgeometry() const { return tqlayout ? tqlayout->tqgeometry() : TQRect(); }
     bool isStretching() const { return stretch; }
 
 private:
@@ -577,7 +577,7 @@ private:
     void addCell( KoTextTableCell* cell );
 
 private:
-    TQGridLayout* layout;
+    TQGridLayout* tqlayout;
     TQPtrList<KoTextTableCell> cells;
     TQPainter* painter;
     int cachewidth;
@@ -697,7 +697,7 @@ struct KoTextParagLineStart
 #endif
     {  }
 #ifndef TQT_NO_COMPLEXTEXT
-    KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0),
+    KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0),
                                                                lineSpacing( 0 ), hyphenated( false ),
 	status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); }
 #endif
@@ -728,7 +728,7 @@ public:
     short lineSpacing;
     bool hyphenated;
 #ifndef TQT_NO_COMPLEXTEXT
-    KoBidiStatus status;
+    KoBiditqStatus status;
 #endif
     int w;
 
diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index 955b3f1cc..a41de932c 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -39,7 +39,7 @@
 #include <tqradiobutton.h>
 #include <tqregexp.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KoSearchContext::KoSearchContext()
 {
@@ -382,8 +382,8 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex,
     {
         replaceWithAttribut( &cursor, index );
     }
-    // Don't repaint if we're doing batch changes
-    bool repaint = options() & KReplaceDialog::PromptOnReplace;
+    // Don't tqrepaint if we're doing batch changes
+    bool tqrepaint = 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,
-        repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint );
+        tqrepaint ? 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 alignment:" ), page );
+    m_checkVertAlign = new TQCheckBox( i18n( "Vertical tqalignment:" ), page );
 
     m_familyItem = new KFontCombo(page);
     m_familyItem->setCurrentFont(m_ctx->m_family);
@@ -605,25 +605,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC
 
     TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page );
     grpBold->setRadioButtonExclusive( TRUE );
-    grpBold->layout();
+    grpBold->tqlayout();
     m_boldYes=new TQRadioButton( i18n("Yes"), grpBold );
     m_boldNo=new TQRadioButton( i18n("No"), grpBold );
 
     TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page );
     grpItalic->setRadioButtonExclusive( TRUE );
-    grpItalic->layout();
+    grpItalic->tqlayout();
     m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic );
     m_italicNo=new TQRadioButton( i18n("No"), grpItalic );
 
     TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page );
     grpShadow->setRadioButtonExclusive( TRUE );
-    grpShadow->layout();
+    grpShadow->tqlayout();
     m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow );
     m_shadowNo=new TQRadioButton( i18n("No"), grpShadow );
 
     TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page );
     grpWordByWord->setRadioButtonExclusive( TRUE );
-    grpWordByWord->layout();
+    grpWordByWord->tqlayout();
     m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord );
     m_wordByWordNo=new TQRadioButton( i18n("No"), grpWordByWord );
 
diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp
index fa0818d88..f8c93f01f 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().alignment] << endl;
+        kdDebug() << "  align: " << s_align[(TQt::AlignmentFlags)style->paragLayout().tqalignment] << endl;
         if ( style->paragLayout().counter )
             kdDebug() << "  counter level=" << style->paragLayout().counter->depth() << endl;
 
diff --git a/lib/kotext/KoStyleCollection.h b/lib/kotext/KoStyleCollection.h
index 811bbaea5..66a244e5c 100644
--- a/lib/kotext/KoStyleCollection.h
+++ b/lib/kotext/KoStyleCollection.h
@@ -68,7 +68,7 @@ public:
      * Overloaded for convenience.
      */
     KoParagStyle* findStyle( const TQString & name ) const {
-        return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::fromLatin1( "Standard" ) ) );
+        return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::tqfromLatin1( "Standard" ) ) );
     }
 
     /**
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index 871b8f987..e5a7dbfa2 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -33,7 +33,7 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 /******************************************************************/
 /* Class: KoStyleManager                                          */
@@ -86,7 +86,7 @@ KoStyleManager::KoStyleManager( TQWidget *_parent, KoUnit::Unit unit,
 
     newTab = new KoStyleParagTab( m_tabs );
     KoParagLayoutWidget *decorations = new KoParagDecorationWidget( newTab );
-    decorations->layout()->setMargin(KDialog::marginHint());
+    decorations->tqlayout()->setMargin(KDialog::marginHint());
     newTab->setWidget( decorations );
     addTab( newTab );
 
@@ -122,7 +122,7 @@ void KoStyleManager::addTab( KoStyleManagerTab * tab )
 {
     m_tabsList.append( tab );
     m_tabs->insertTab( tab, tab->tabName() );
-    tab->layout()->activate();
+    tab->tqlayout()->activate();
 }
 
 void KoStyleManager::setupWidget(const KoStyleCollection& styleCollection)
@@ -185,15 +185,15 @@ void KoStyleManager::addGeneralTab( int flags ) {
     tabLayout->setMargin( KDialog::marginHint() );
 
     m_nameString = new TQLineEdit( tab );
-    m_nameString->resize(m_nameString->sizeHint() );
+    m_nameString->resize(m_nameString->tqsizeHint() );
     connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) );
 
     tabLayout->addWidget( m_nameString, 0, 1 );
 
     TQLabel *nameLabel = new TQLabel( tab );
     nameLabel->setText( i18n( "Name:" ) );
-    nameLabel->resize(nameLabel->sizeHint());
-    nameLabel->setAlignment( AlignRight | AlignVCenter );
+    nameLabel->resize(nameLabel->tqsizeHint());
+    nameLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( nameLabel, 0, 0 );
 
@@ -203,7 +203,7 @@ void KoStyleManager::addGeneralTab( int flags ) {
 
     TQLabel *nextStyleLabel = new TQLabel( tab );
     nextStyleLabel->setText( i18n( "Next style:" ) );
-    nextStyleLabel->setAlignment( AlignRight | AlignVCenter );
+    nextStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( nextStyleLabel, 1, 0 );
 
@@ -212,7 +212,7 @@ void KoStyleManager::addGeneralTab( int flags ) {
 
     TQLabel *inheritStyleLabel = new TQLabel( tab );
     inheritStyleLabel->setText( i18n( "Inherit style:" ) );
-    inheritStyleLabel->setAlignment( AlignRight | AlignVCenter );
+    inheritStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( inheritStyleLabel, 2, 0 );
 
@@ -345,7 +345,7 @@ void KoStyleManager::updateGUI() {
 void KoStyleManager::updatePreview()
 {
     d->preview->setStyle(m_currentStyle);
-    d->preview->repaint(true);
+    d->preview->tqrepaint(true);
 }
 
 void KoStyleManager::save() {
@@ -408,7 +408,7 @@ TQString KoStyleManager::generateUniqueName()
 void KoStyleManager::addStyle() {
     save();
 
-    TQString str = i18n( "New Style Template (%1)" ).arg(numStyles++);
+    TQString str = i18n( "New Style Template (%1)" ).tqarg(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 b562e1f65..af848e1d2 100644
--- a/lib/kotext/KoStyleManager.h
+++ b/lib/kotext/KoStyleManager.h
@@ -137,7 +137,7 @@ protected:
     KoParagStyle *m_style;
 };
 
-// A tab to edit parts of the parag-layout of the style
+// A tab to edit parts of the parag-tqlayout of the style
 // Acts as a wrapper around KoParagLayoutWidget [which doesn't know about styles].
 class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab
 {
@@ -181,7 +181,7 @@ private:
 Font            simple font dia
 Color           simple color dia
 Spacing and Indents     paragraph spacing dia (KWParagDia)
-alignments      KoParagDia alignment tab
+alignments      KoParagDia tqalignment 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 875c1e71e..fb4968363 100644
--- a/lib/kotext/KoTextCommand.cpp
+++ b/lib/kotext/KoTextCommand.cpp
@@ -96,7 +96,7 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c )
     while ( p ) {
         if ( lit != m_oldParagLayouts.end() )
         {
-            kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paraglayout to parag " << p->paragId() << endl;
+            kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paragtqlayout to parag " << p->paragId() << endl;
             p->setParagLayout( *lit );
         }
         else
@@ -211,7 +211,7 @@ KoTextCursor * KoParagFormatCommand::execute( KoTextCursor *c )
     }
     while ( p ) {
         p->setFormat( m_newFormat );
-        p->invalidate(0);
+        p->tqinvalidate(0);
         if ( p->paragId() == lastParag )
             break;
         p = p->next();
diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h
index 7df4d5155..d232bedcd 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 invalidate() {};
+    virtual void tqinvalidate() {};
 
     virtual bool isNested() const { return FALSE; }
     virtual int minimumWidth() const { return 0; }
@@ -69,7 +69,7 @@ public:
     int width;
     int height;
 
-    TQRect geometry() const { return TQRect( xpos, ypos, width, height ); }
+    TQRect tqgeometry() 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 35adf8143..b3f24708a 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->alignment();
-	p->setAlignment( TQt::AlignLeft );
-	p->invalidate( 0 );
+	int a = p->tqalignment();
+	p->tqsetAlignment( TQt::AlignLeft );
+	p->tqinvalidate( 0 );
 	p->format();
 	w = TQMAX( w, p->rect().width() );
-	p->setAlignment( a );
-	p->invalidate( 0 );
+	p->tqsetAlignment( a );
+	p->tqinvalidate( 0 );
 	p = p->next();
     }
     return w;
@@ -247,11 +247,11 @@ TQString KoTextDocument::plainText() const
     return buffer;
 }
 
-void KoTextDocument::invalidate()
+void KoTextDocument::tqinvalidate()
 {
     KoTextParag *s = fParag;
     while ( s ) {
-	s->invalidate( 0 );
+	s->tqinvalidate( 0 );
 	s = s->next();
     }
 }
@@ -729,7 +729,7 @@ void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags )
     if ( !hasSelection( id ) )
 	return;
 
-    TQApplication::clipboard()->setText( selectedText( id ) );
+    TQApplication::tqclipboard()->setText( selectedText( id ) );
 #endif
 }*/
 
@@ -785,9 +785,9 @@ void KoTextDocument::removeSelectedText( int id, KoTextCursor *cursor )
 	p->move( dy );
         //// kotext
         if ( p->paragLayout().counter )
-            p->paragLayout().counter->invalidate();
+            p->paragLayout().counter->tqinvalidate();
         ////
-	p->invalidate( 0 );
+	p->tqinvalidate( 0 );
 	//p->setEndState( -1 );
 	p = p->next();
     }
@@ -1217,7 +1217,7 @@ void KoTextDocument::drawWithoutDoubleBuffer( TQPainter *p, const TQRect &cr, co
         TQRect pr( parag->pixelRect( zoomHandler ) );
         pr.setLeft( 0 );
         pr.setWidth( TQWIDGETSIZE_MAX );
-        // The cliprect is checked in layout units, in KoTextParag::paint
+        // The cliprect is checked in tqlayout units, in KoTextParag::paint
         TQRect crect_lu( parag->rect() );
 
         if ( !cr.isNull() && !cr.intersects( pr ) ) {
@@ -1295,7 +1295,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     // The test on mat is almost like isIdentity(), but allows for translation.
     //// ##### The way to fix this: initialize the pixmap to be fully transparent instead
     // of being white.
-    TQWMatrix mat = p->worldMatrix();
+    TQWMatrix mat = p->tqworldMatrix();
     if ( ( mat.m11() != 1.0 || mat.m22() != 1.0 || mat.m12() != 0.0 || mat.m21() != 0.0 )
          && brush.style() != TQt::SolidPattern )
         useDoubleBuffer = FALSE;
@@ -1350,7 +1350,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
 #endif
     //painter->setBrushOrigin( painter->brushOrigin() + rect.topLeft() - ir.topLeft() );
 
-    // The cliprect is checked in layout units, in KoTextParag::paint
+    // The cliprect is checked in tqlayout units, in KoTextParag::paint
     TQRect crect_lu( zoomHandler->pixelToLayoutUnit( crect ) );
 #ifdef DEBUG_PAINTING
     kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG crect_lu=" << crect_lu << endl;
diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h
index 8cf9fd4d1..8cdc1b524 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 invalidate();
+    void tqinvalidate();
 
     //void setPreProcessor( KoTextPreProcessor *sh );
     //KoTextPreProcessor *preProcessor() const;
@@ -189,8 +189,8 @@ public:
 
     //bool focusNextPrevChild( bool next );
 
-    int alignment() const;
-    void setAlignment( int a );
+    int tqalignment() const;
+    void tqsetAlignment( int a );
 
     int *tabArray() const;
     int tabStopWidth() const;
@@ -535,12 +535,12 @@ inline KoTextFormatCollection *KoTextDocument::formatCollection() const
     return fCollection;
 }
 
-inline int KoTextDocument::alignment() const
+inline int KoTextDocument::tqalignment() const
 {
     return align;
 }
 
-inline void KoTextDocument::setAlignment( int a )
+inline void KoTextDocument::tqsetAlignment( int a )
 {
     align = a;
 }
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 2554d4eea..24214ae4b 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(); // invalidate key, recalc at the next key() call
+    m_key = TQString(); // tqinvalidate key, recalc at the next key() call
     assert( d );
     d->clearCache(); // i.e. recalc at the next screenFont[Metrics]() call
 }
@@ -1179,8 +1179,8 @@ TQFont KoTextFormat::smallCapsFont( const KoTextZoomHandler* zh, bool applyZoom
 int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const KoTextStringChar* c,
                              const KoTextParag* parag, int i ) const
 {
-    ushort unicode = c->c.unicode();
-    if ( !c->charStop || unicode == 0xad || unicode == 0x2028 )
+    ushort tqunicode = c->c.tqunicode();
+    if ( !c->charStop || tqunicode == 0xad || tqunicode == 0x2028 )
 	 return 0;
     Q_ASSERT( !c->isCustom() ); // actually it's a bit stupid to call this for custom items
     if( c->isCustom() ) {
@@ -1209,13 +1209,13 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const
                 pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) );
 	    } else {
                 // Use the m_screenWidths[] array when possible, even faster
-                Q_ASSERT( unicode < 256 );
-		pixelww = d->m_screenWidths[ unicode ];
+                Q_ASSERT( tqunicode < 256 );
+		pixelww = d->m_screenWidths[ tqunicode ];
                 // Not in cache yet -> calculate
                 if ( pixelww == 0 ) {
                     pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) );
                     Q_ASSERT( pixelww < 65535 );
-                    d->m_screenWidths[ unicode ] = pixelww;
+                    d->m_screenWidths[ tqunicode ] = pixelww;
                 }
 	    }
         }
@@ -1319,7 +1319,7 @@ TQString KoTextFormat::displayedString( const TQString& str )const
 
 TQChar KoTextFormat::displayedChar( TQChar c )const
 {
-    if ( c.unicode() == 0xa0 ) // nbsp
+    if ( c.tqunicode() == 0xa0 ) // nbsp
         return ' ';
     switch ( m_attributeFont ) {
     case ATT_NONE:
diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h
index 4c155b912..0e7c1a13a 100644
--- a/lib/kotext/KoTextFormat.h
+++ b/lib/kotext/KoTextFormat.h
@@ -75,7 +75,7 @@ public:
     // caching for speedup when formatting
     TQFont* m_screenFont; // font to be used when painting (zoom-dependent)
     TQFontMetrics* m_screenFontMetrics; // font metrics on screen (zoom-dependent)
-    TQFont* m_refFont; // font to be used when formatting text for layout units
+    TQFont* m_refFont; // font to be used when formatting text for tqlayout units
     TQFontMetrics* m_refFontMetrics; // font metrics for m_refFontMetrics
     int m_refAscent;
     int m_refDescent;
@@ -308,7 +308,7 @@ public:
 
     /**
      * @return the reference font, i.e. with the size specified by the user.
-     * This is used at text layout time (e.g. kotextformatter)
+     * This is used at text tqlayout time (e.g. kotextformatter)
      */
     TQFont refFont() const;
 
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 552bcf27d..7bdfbc0cf 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()->alignment() == TQt::AlignLeft ||
-              parag->counter()->alignment() == TQt::AlignAuto ) )
+            ( parag->counter()->tqalignment() == TQt::AlignLeft ||
+              parag->counter()->tqalignment() == TQt::AlignAuto ) )
             left += parag->counterWidth(); // in LU pixels
     }
     return left;
@@ -196,7 +196,7 @@ bool KoTextFormatterCore::format()
     // but with counters/margins this might be different). This is why
     // we call determineCharWidth() again from within the loop.
     TQPair<int, int> widths = determineCharWidth();
-    int ww = widths.first; // width in layout units
+    int ww = widths.first; // width in tqlayout units
 #ifndef REF_IS_LU
     int pixelww = widths.second; // width in pixels
 #endif
@@ -251,9 +251,9 @@ bool KoTextFormatterCore::format()
     bool lastWasNonInlineCustom = FALSE;
     bool abort = false;
 
-    int align = parag->alignment();
-    if ( align == TQt::AlignAuto && doc && doc->alignment() != TQt::AlignAuto )
-        align = doc->alignment();
+    int align = parag->tqalignment();
+    if ( align == TQt::AlignAuto && doc && doc->tqalignment() != TQt::AlignAuto )
+        align = doc->tqalignment();
 
     int col = 0;
 
@@ -516,11 +516,11 @@ bool KoTextFormatterCore::format()
                     spaceAfterLine -= c->width;
 
                     //else
-                    if ( c->c.unicode() == 0xad || hyphenated ) // soft hyphen or hyphenation
+                    if ( c->c.tqunicode() == 0xad || hyphenated ) // soft hyphen or hyphenation
                     {
                         // Recalculate its width, the hyphen will appear finally (important for the parag rect)
                         int width = KoTextZoomHandler::ptToLayoutUnitPt( c->format()->refFontMetrics().width( TQChar(0xad) ) );
-                        if ( c->c.unicode() == 0xad )
+                        if ( c->c.tqunicode() == 0xad )
                             c->width = width;
                         spaceAfterLine -= width;
                     }
@@ -810,7 +810,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
         if (space < 0)
             space = 0;
 
-        // do alignment Auto == Left in this case
+        // do tqalignment Auto == Left in this case
         if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) {
             if ( align & TQt::AlignHCenter )
                 space /= 2;
@@ -934,7 +934,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
     str.setUnicode( 0, last - start + 1 );
     // fill string with logically ordered chars.
     KoTextStringChar *ch = startChar;
-    TQChar *qch = (TQChar *)str.unicode();
+    TQChar *qch = (TQChar *)str.tqunicode();
     while ( ch <= lastChar ) {
         *qch = ch->c;
         qch++;
@@ -949,7 +949,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
     // now construct the reordered string out of the runs...
 
     int numSpaces = 0;
-    // set the correct alignment. This is a bit messy....
+    // set the correct tqalignment. 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 afd18909f..30bf6dd35 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -564,7 +564,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c
                 undoRedoInfo.oldParagLayouts << parag->paragLayout();
             }
             if ( cursor->atParagEnd() ) {
-                // Get paraglayout from next parag (next can't be 0 here)
+                // Get paragtqlayout from next parag (next can't be 0 here)
                 KoParagLayout paragLayout = parag->next()->paragLayout();
                 if ( cursor->remove() )
                 {
@@ -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 repaint = ( insertFlags & DoNotRepaint ) == 0;
+    const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0;
     //kdDebug(32500) << "KoTextObject::insert txt=" << txt << endl;
     bool tinyRepaint = !checkNewLine;
-    if ( repaint )
+    if ( tqrepaint )
         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
-    // invalidate the next parag, only format the current one
+    // tqinvalidate 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 repaint from current line
+    // Speed optimization: if we only type a char, only tqrepaint from current line
     // (In fact the one before. When typing a space, a word could move up to the
-    // line before, we need to repaint it too...)
+    // line before, we need to tqrepaint 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 ( repaint ) {
+    if ( tqrepaint ) {
         emit repaintChanged( this );
         emit ensureCursorVisible();
         emit showCursor();
-        // 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 )
+        // 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 )
             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 ) && repaint )
-            selectionChangedNotify(); // does the repaint
+        if ( textdoc->removeSelection( selectionId ) && tqrepaint )
+            selectionChangedNotify(); // does the tqrepaint
     }
     if ( !customItemsMap.isEmpty()
          && !commandName.isNull() /* see replace-selection; #139890 */ ) {
@@ -748,7 +748,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe
     kdDebug(32500) << "KoTextObject::pasteText cursor parag=" << cursor->parag()->paragId() << endl;
     TQString t = text;
     // Need to convert CRLF to NL
-    TQRegExp crlf( TQString::fromLatin1("\r\n") );
+    TQRegExp crlf( TQString::tqfromLatin1("\r\n") );
     t.replace( crlf, TQChar('\n') );
     // Convert non-printable chars
     for ( int i=0; (uint) i<t.length(); i++ ) {
@@ -1066,7 +1066,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat *
             if ( cursor->parag()->length() == 1 ) {
                 newFormat->addRef();
                 cursor->parag()->setFormat( newFormat );
-                cursor->parag()->invalidate(0);
+                cursor->parag()->tqinvalidate(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()->alignment() == align )
+         (int)cursor->parag()->tqalignment() == 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.alignment = align;
+    undoRedoInfo.newParagLayout.tqalignment = 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 repaint )
+KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint )
 {
     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 ( repaint )
+    if ( tqrepaint )
         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 repaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace
-    if ( repaint )
+    const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace
+    if ( tqrepaint )
         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, repaint );
+    KCommand* removeSelCmd = removeSelectedTextCommand( cursor, selectionId, tqrepaint );
     if ( removeSelCmd )
         macroCmd->addCommand( removeSelCmd );
 
@@ -1625,7 +1625,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ
     format->removeRef();
 
     setLastFormattedParag( c1.parag() );
-    if ( repaint )
+    if ( tqrepaint )
     {
         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 repaint )
+void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint )
 {
     if ( !m_highlightSelectionAdded )
     {
@@ -1656,20 +1656,20 @@ void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length,
         m_highlightSelectionAdded = true;
     }
 
-    removeHighlight(repaint); // remove previous highlighted selection
+    removeHighlight(tqrepaint); // 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 ( repaint ) {
+    if ( tqrepaint ) {
         parag->setChanged( true );
         emit repaintChanged( this );
     }
 }
 
-void KoTextObject::removeHighlight(bool repaint)
+void KoTextObject::removeHighlight(bool tqrepaint)
 {
     if ( textdoc->hasSelection( KoTextDocument::HighlightSelection, true ) )
     {
@@ -1677,7 +1677,7 @@ void KoTextObject::removeHighlight(bool repaint)
         oldParag->setChanged( true );
         textdoc->removeSelection( KoTextDocument::HighlightSelection );
     }
-    if ( repaint )
+    if ( tqrepaint )
         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)").arg(m_lastFormatted->paragId());
+    if ( m_lastFormatted ) id = TQString(" (%1)").tqarg(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.at(i)!=' ')
+                if(text.tqat(i)!=' ')
                 {
-                    TQChar prev = text.at(TQMAX(i-1,0));
+                    TQChar prev = text.tqat(TQMAX(i-1,0));
                     if(i==0 || prev  == ' ' || prev == '\n' || prev == '\t')
-                        text=text.replace(i, 1, text.at(i).upper() );
+                        text=text.replace(i, 1, text.tqat(i).upper() );
                     else
-                        text=text.replace(i, 1, text.at(i).lower() );
+                        text=text.replace(i, 1, text.tqat(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.at(i)!=text.at(i).upper())
+                if(text.tqat(i)!=text.tqat(i).upper())
                     repl=repl.upper();
-                else if(text.at(i).lower()!=text.at(i))
+                else if(text.tqat(i).lower()!=text.tqat(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.at(i).upper() );
+                        text=text.replace(i, 1, text.tqat(i).upper() );
                 }
             }
             break;
@@ -2167,7 +2167,7 @@ KoTextCursor KoTextObject::pasteOasisText( const TQDomElement &bodyElem, KoOasis
                 context.styleStack().restore();
 
                 lastParagraph->setChanged( true );
-                lastParagraph->invalidate( 0 );
+                lastParagraph->tqinvalidate( 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.alignment=align;
+    format.tqalignment=align;
     return setParagLayoutFormatCommand(&format,KoParagLayout::Alignment);
 }
 
diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h
index 7970a323f..155740754 100644
--- a/lib/kotext/KoTextObject.h
+++ b/lib/kotext/KoTextObject.h
@@ -64,11 +64,11 @@ public:
      */
     virtual KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false ) = 0;
 
-    /** Interface for accessing the current parag layout */
+    /** Interface for accessing the current parag tqlayout */
     virtual const KoParagLayout * currentParagLayoutFormat() const = 0;
 
-    /** Interface for changing the paragraph layout.
-     * @param newLayout pointer to the new layout to apply
+    /** Interface for changing the paragraph tqlayout.
+     * @param newLayout pointer to the new tqlayout to apply
      * @param flags one of the KoParagLayout flags
      * @param marginIndex type of margin. Only used if flags==KoParagLayout::Margins
      */
@@ -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 repaint in insert(), this allows to turn it off
+        DoNotRepaint = 8         ///< usually we tqrepaint 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 repaint = true );
+    KCommand * removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint = 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 repaint );
-    void removeHighlight( bool repaint );
+    void highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint );
+    void removeHighlight( bool tqrepaint );
 
     /** Implementation of setFormatCommand from KoTextFormatInterface - apply change to the whole document */
     KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false );
@@ -345,7 +345,7 @@ public:
      * @param cursor the current cursor; used if there is no selection. Can be 0L if there is one.
      * @param style the KoParagStyle to apply
      * @param selectionId the id of the selection, usually Standard or Temp
-     * @param paragLayoutFlags which settings from the paragraph layout to apply
+     * @param paragLayoutFlags which settings from the paragraph tqlayout to apply
      * @param formatFlags which settings from the text format to apply
      * @param createUndoRedo if true, an undo/redo command will be created and emitted
      * @param interactive if true, the text will be reformatted/repainted to show the new style
@@ -429,7 +429,7 @@ public:
     /**
      * Abort the current formatMore() loop, or prevent the next one from starting.
      * Use with care. This is e.g. for KWFootNoteVariable, so that it can do
-     * a frame layout before formatting the main text again.
+     * a frame tqlayout before formatting the main text again.
      * It is important to make sure that formatMore will be called again ;)
      */
     void abortFormatting();
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index cc1aecb91..23754c285 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::invalidate( int /*chr, ignored*/ )
+void KoTextParag::tqinvalidate( 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() );
-    invalidate( index );
+    tqinvalidate( index );
     //needPreProcess = TRUE;
 }
 
@@ -209,7 +209,7 @@ void KoTextParag::remove( int index, int len )
 	}
     }
     str->remove( index, len );
-    invalidate( 0 );
+    tqinvalidate( 0 );
     //needPreProcess = TRUE;
 }
 
@@ -252,7 +252,7 @@ void KoTextParag::join( KoTextParag *s )
 	extraData()->join( s->extraData() );
         }*/
     delete s;
-    invalidate( 0 );
+    tqinvalidate( 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 -> invalidate and stop moving down
-                s->invalidate( 0 ); // (there is no point in moving down a parag that has a frame break...)
+            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...)
                 break;
             }
 	    if ( !s->isFullWidth() )
 		makeInvalid = TRUE;
 	    if ( makeInvalid )
-		s->invalidate( 0 );
+		s->tqinvalidate( 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()
                  ) ) {
-	    invalidate( 0 );
+	    tqinvalidate( 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 );
-	invalidate( 0 );
+	tqinvalidate( 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::alignment() const
+uint KoTextParag::tqalignment() const
 {
     return align;
 }
@@ -946,66 +946,66 @@ 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()->invalidate(0);     // for top margin (post-1.1: remove this, not necessary anymore)
-    invalidate(0);
+        prev()->tqinvalidate(0);     // for top margin (post-1.1: remove this, not necessary anymore)
+    tqinvalidate(0);
 }
 
 void KoTextParag::setMargins( const double * margins )
 {
     for ( int i = 0 ; i < 5 ; ++i )
         m_layout.margins[i] = margins[i];
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setAlign( int align )
 {
     Q_ASSERT( align <= TQt::AlignJustify );
     align &= TQt::AlignHorizontal_Mask;
-    setAlignment( align );
-    m_layout.alignment = align;
+    tqsetAlignment( align );
+    m_layout.tqalignment = align;
 }
 
 int KoTextParag::resolveAlignment() const
 {
-    if ( (int)m_layout.alignment == TQt::AlignAuto )
+    if ( (int)m_layout.tqalignment == TQt::AlignAuto )
         return str->isRightToLeft() ? TQt::AlignRight : TQt::AlignLeft;
-    return m_layout.alignment;
+    return m_layout.tqalignment;
 }
 
 void KoTextParag::setLineSpacing( double _i )
 {
     m_layout.setLineSpacingValue(_i);
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setLineSpacingType( KoParagLayout::SpacingType _type )
 {
     m_layout.lineSpacingType = _type;
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setTopBorder( const KoBorder & _brd )
 {
     m_layout.topBorder = _brd;
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setBottomBorder( const KoBorder & _brd )
 {
     m_layout.bottomBorder = _brd;
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setJoinBorder( bool join )
 {
     m_layout.joinBorder = join;
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setBackgroundColor ( const TQColor& color )
 {
     m_layout.backgroundColor = color;
-    invalidate(0);
+    tqinvalidate(0);
 }
 
 void KoTextParag::setNoCounter()
@@ -1060,17 +1060,17 @@ void KoTextParag::invalidateCounters()
 {
     // Invalidate this paragraph and all the following ones
     // (Numbering may have changed)
-    invalidate( 0 );
+    tqinvalidate( 0 );
     if ( m_layout.counter )
-        m_layout.counter->invalidate();
+        m_layout.counter->tqinvalidate();
     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->invalidate...
+    // This is only true if nobody else calls counter->tqinvalidate...
     while ( s ) {
         if ( s->m_layout.counter )
-            s->m_layout.counter->invalidate();
-        s->invalidate( 0 );
+            s->m_layout.counter->tqinvalidate();
+        s->tqinvalidate( 0 );
         s = s->next();
     }
 }
@@ -1290,13 +1290,13 @@ int KoTextParag::rightMargin() const
     KoTextZoomHandler * zh = textDocument()->formattingZoomHandler();
     int cw=0;
     if( m_layout.counter && str->isRightToLeft() &&
-    	(( m_layout.counter->alignment() == TQt::AlignRight ) || ( m_layout.counter->alignment() == TQt::AlignAuto )))
+    	(( m_layout.counter->tqalignment() == TQt::AlignRight ) || ( m_layout.counter->tqalignment() == TQt::AlignAuto )))
 	    cw = counterWidth();
 
     return zh->ptToLayoutUnitPixX(
         m_layout.margins[ TQStyleSheetItem::MarginRight ]
         + m_layout.rightBorder.width() )
-        + cw; /* in layout units already */
+        + cw; /* in tqlayout units already */
 }
 
 int KoTextParag::firstLineMargin() const
@@ -1597,13 +1597,13 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText
 	    // we flush before and after tabs
 	    flush = flush || ( chr->c == '\t' || nextchr->c == '\t' );
 	    // we flush on soft hypens
-	    flush = flush || ( chr->c.unicode() == 0xad );
+	    flush = flush || ( chr->c.tqunicode() == 0xad );
 	    // we flush on custom items
 	    flush = flush || chr->isCustom();
 	    // we flush before custom items
 	    flush = flush || nextchr->isCustom();
 	    // when painting justified we flush on spaces
-	    if ((alignment() & TQt::AlignJustify) == TQt::AlignJustify )
+	    if ((tqalignment() & 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
@@ -1847,7 +1847,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s
 
     // 3) Paint
     TQString str( s );
-    if ( str[ (int)str.length() - 1 ].unicode() == 0xad )
+    if ( str[ (int)str.length() - 1 ].tqunicode() == 0xad )
         str.remove( str.length() - 1, 1 );
     painter.setPen( TQPen( textColor ) );
     painter.setFont( font );
@@ -1877,7 +1877,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s
     }
     KoTextParag::drawFontEffects( &painter, format, zh, font, textColor, startX, baseLine, bw, lastY, h, str[start] );
 
-    if ( str[ start ] != '\t' && str[ start ].unicode() != 0xad ) {
+    if ( str[ start ] != '\t' && str[ start ].tqunicode() != 0xad ) {
         str = format->displayedString( str ); // #### This converts the whole string, instead of from start to start+len!
 	if ( format->vAlign() == KoTextFormat::AlignNormal ) {
             int posY = lastY + baseLine;
@@ -1965,7 +1965,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s
 #ifdef DEBUG_PAINT
         //kdDebug(32500) << "we are drawing the end of line " << line << ". Auto-hyphenated: " << lineHyphenated( line ) << endl;
 #endif
-        bool drawHyphen = at( start+len-1 )->c.unicode() == 0xad;
+        bool drawHyphen = at( start+len-1 )->c.tqunicode() == 0xad;
         drawHyphen = drawHyphen || lineHyphenated( line );
         if ( drawHyphen ) {
 #ifdef DEBUG_PAINT
@@ -2059,7 +2059,7 @@ void KoTextParag::copyParagData( KoTextParag *parag )
     //else
     //    kdWarning() << "Paragraph has no style " << paragId() << endl;
 
-    // No "following style" setting, or same style -> copy layout & format of previous paragraph
+    // No "following style" setting, or same style -> copy tqlayout & format of previous paragraph
     if (!styleApplied)
     {
         setParagLayout( parag->paragLayout() );
@@ -2082,7 +2082,7 @@ void KoTextParag::copyParagData( KoTextParag *parag )
     // Note: we don't call the original KoTextParag::copyParagData on purpose.
     // We don't want setListStyle to get called - it ruins our stylesheetitems
     // And we don't care about copying the stylesheetitems directly,
-    // applying the parag layout will create them
+    // applying the parag tqlayout will create them
 }
 
 void KoTextParag::setTabList( const KoTabulatorList &tabList )
@@ -2104,7 +2104,7 @@ void KoTextParag::setTabList( const KoTabulatorList &tabList )
     {
         setTabArray( 0 );
     }
-    invalidate( 0 );
+    tqinvalidate( 0 );
 }
 
 /** "Reimplemented" (compared to nextTabDefault) to implement non-left-aligned tabs */
@@ -2240,43 +2240,43 @@ void KoTextParag::applyStyle( KoParagStyle *style )
     setFormat( newFormat );
 }
 
-void KoTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex )
+void KoTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex )
 {
     //kdDebug(32500) << "KoTextParag::setParagLayout flags=" << flags << endl;
     if ( flags & KoParagLayout::Alignment )
-        setAlign( layout.alignment );
+        setAlign( tqlayout.tqalignment );
     if ( flags & KoParagLayout::Margins ) {
         if ( marginIndex == -1 )
-            setMargins( layout.margins );
+            setMargins( tqlayout.margins );
         else
-            setMargin( (TQStyleSheetItem::Margin)marginIndex, layout.margins[marginIndex] );
+            setMargin( (TQStyleSheetItem::Margin)marginIndex, tqlayout.margins[marginIndex] );
     }
     if ( flags & KoParagLayout::LineSpacing )
     {
-        setLineSpacingType( layout.lineSpacingType );
-        setLineSpacing( layout.lineSpacingValue() );
+        setLineSpacingType( tqlayout.lineSpacingType );
+        setLineSpacing( tqlayout.lineSpacingValue() );
     }
     if ( flags & KoParagLayout::Borders )
     {
-        setLeftBorder( layout.leftBorder );
-        setRightBorder( layout.rightBorder );
-        setTopBorder( layout.topBorder );
-        setBottomBorder( layout.bottomBorder );
-        setJoinBorder( layout.joinBorder );
+        setLeftBorder( tqlayout.leftBorder );
+        setRightBorder( tqlayout.rightBorder );
+        setTopBorder( tqlayout.topBorder );
+        setBottomBorder( tqlayout.bottomBorder );
+        setJoinBorder( tqlayout.joinBorder );
     }
     if ( flags & KoParagLayout::BackgroundColor )
     {
-        setBackgroundColor( layout.backgroundColor );
+        setBackgroundColor( tqlayout.backgroundColor );
     }
     if ( flags & KoParagLayout::BulletNumber )
-        setCounter( layout.counter );
+        setCounter( tqlayout.counter );
     if ( flags & KoParagLayout::Tabulator )
-        setTabList( layout.tabList() );
+        setTabList( tqlayout.tabList() );
     if ( flags == KoParagLayout::All )
     {
-        setDirection( static_cast<TQChar::Direction>(layout.direction) );
+        setDirection( static_cast<TQChar::Direction>(tqlayout.direction) );
         // Don't call applyStyle from here, it would overwrite any paragraph-specific settings
-        setStyle( layout.style );
+        setStyle( tqlayout.style );
     }
 }
 
@@ -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
-    invalidate( 0 );
+    tqinvalidate( 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[alignment()] << "  resolveAlignment: " << s_align[resolveAlignment()]
+        kdDebug(32500) << "  align: " << s_align[tqalignment()] << "  resolveAlignment: " << s_align[resolveAlignment()]
                   << "  isRTL:" << str->isRightToLeft()
                   << "  dir: " << s_dir[direction()] << endl;
         TQRect pixr = pixelRect( textDocument()->paintingZoomHandler() );
@@ -2421,7 +2421,7 @@ void KoTextParag::printRTDebug( int info )
             attrs.truncate( attrs.length() - 1 );
 
             kdDebug(32500) << i << ": '" << TQString(ch.c).rightJustify(2)
-                           << "' (" << TQString::number( ch.c.unicode() ).rightJustify(3) << ")"
+                           << "' (" << TQString::number( ch.c.tqunicode() ).rightJustify(3) << ")"
                       << " x(LU)=" << ch.x
                       << " w(LU)=" << ch.width//s->width(i)
                       << " x(PIX)=" << pixelx
@@ -2849,7 +2849,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& con
 
 KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleCollection *styleCollection, bool findStyle )
 {
-    KoParagLayout layout;
+    KoParagLayout tqlayout;
 
     // Only when loading paragraphs, not when loading styles
     if ( findStyle )
@@ -2877,17 +2877,17 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl
             style = styleCollection->findStyle( "Standard" );
         }
         Q_ASSERT(style);
-        layout.style = style;
+        tqlayout.style = style;
     }
 
-    KoParagLayout::loadOasisParagLayout( layout, context );
+    KoParagLayout::loadOasisParagLayout( tqlayout, context );
 
-    return layout;
+    return tqlayout;
 }
 
 void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos )
 {
-    // First load layout from style
+    // First load tqlayout from style
     KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true );
     setParagLayout( paragLayout );
 
@@ -2906,7 +2906,7 @@ void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context
     setFormat( len - 1, 1, paragFormat(), TRUE );
 
     setChanged( true );
-    invalidate( 0 );
+    tqinvalidate( 0 );
 }
 
 void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
@@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
 {
     KoGenStyles& mainStyles = context.mainStyles();
 
-    // Write paraglayout to styles (with parent == the parag's style)
+    // Write paragtqlayout to styles (with parent == the parag's style)
     TQString parentStyleName;
     if ( m_layout.style )
         parentStyleName = m_layout.style->name();
@@ -2924,11 +2924,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
     paragFormat()->save( autoStyle, context );
     m_layout.saveOasis( autoStyle, context, false );
 
-    // First paragraph is special, it includes page-layout info (for word-processing at least)
+    // First paragraph is special, it includes page-tqlayout info (for word-processing at least)
     if ( !prev() ) {
         if ( context.variableSettings() )
             autoStyle.addProperty( "style:page-number", context.variableSettings()->startingPageNumber() );
-        // Well we support only one page layout, so the first parag always points to "Standard".
+        // Well we support only one page tqlayout, so the first parag always points to "Standard".
         autoStyle.addAttribute( "style:master-page-name", "Standard" );
     }
 
@@ -3212,7 +3212,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
 #endif
             if ( ch.isCustom() )
                 continue;
-            if ( (ch.c == ' ' || ch.c.unicode() == 0x00a0U)
+            if ( (ch.c == ' ' || ch.c.tqunicode() == 0x00a0U)
                  && (whichFormattingChars & FormattingSpace))
             {
                 // Don't use ch.pixelwidth here. We want a square with
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index d8e0c29b9..e27a9afc5 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 invalidate( int chr /*ignored*/ = 0 );
+    void tqinvalidate( int chr /*ignored*/ = 0 );
     /// Returns false if format() needs to be called on this paragraph
     bool isValid() const;
 
@@ -130,9 +130,9 @@ public:
 
     void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 );
 
-    void setAlignment( uint a );
-    void setAlignmentDirect( uint a ) { align = a; }
-    uint alignment() const;
+    void tqsetAlignment( uint a );
+    void tqsetAlignmentDirect( uint a ) { align = a; }
+    uint tqalignment() const;
 
     virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
                        int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc
@@ -214,7 +214,7 @@ public:
 
     /** Sets all or some parameters from a paragLayout struct.
      * @param flags selects which settings to apply, see KoParagLayout's enum. */
-    virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All,
+    virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All,
                                  int marginIndex = -1 );
 
     const KoParagLayout & paragLayout() { return m_layout; }
@@ -235,9 +235,9 @@ public:
     void setLineSpacingType( KoParagLayout::SpacingType _type );
 
 
-    /** Use this to change the paragraph alignment, not KoTextParag::setAlignment ! */
+    /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */
     void setAlign( int align );
-    /** Return the real alignment: Auto is resolved to either Left or Right */
+    /** Return the real tqalignment: 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 children.
+     * @param parent the xml element that has content as tqchildren.
      * @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 children.
+     * @param parent the xml element that has content as tqchildren.
      * @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
@@ -520,18 +520,18 @@ inline KoTextDocument *KoTextParag::document() const
     return doc;
 }
 
-inline void KoTextParag::setAlignment( uint a )
+inline void KoTextParag::tqsetAlignment( uint a )
 {
     if ( a == align )
 	return;
     align = a;
-    invalidate( 0 );
+    tqinvalidate( 0 );
 }
 
 /*inline void KoTextParag::setListStyle( TQStyleSheetItem::ListStyle ls )
 {
     lstyle = ls;
-    invalidate( 0 );
+    tqinvalidate( 0 );
 }
 
 inline TQStyleSheetItem::ListStyle KoTextParag::listStyle() const
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index aadeff06e..32e82b73c 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -41,7 +41,7 @@
 
 #include <tqapplication.h>
 #include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 class KoTextView::KoTextViewPrivate
 {
@@ -291,7 +291,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ
         break;
     }
     default: {
-            //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].unicode() << " state=" << e->state() << endl;
+            //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].tqunicode() << " state=" << e->state() << endl;
             if (e->key() == TQt::Key_Tab)
             {
                 if (doToolTipCompletion(m_cursor, m_cursor->parag(), m_cursor->index() - 1, e->key()) )
@@ -331,7 +331,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ
                     // Bidi support: need to reverse mirrored chars (e.g. parenthesis)
                     KoTextParag *p = m_cursor->parag();
                     if ( p && p->string() && p->string()->isRightToLeft() ) {
-                        TQChar *c = (TQChar *)text.unicode();
+                        TQChar *c = (TQChar *)text.tqunicode();
                         int l = text.length();
                         while( l-- ) {
                             if ( c->mirrored() )
@@ -611,7 +611,7 @@ KoTextCursor KoTextView::selectWordUnderCursor( const KoTextCursor& cursor, int
         const bool isWordDelimiter = ch.isSpace()
                                    || ch.category() == TQChar::Punctuation_Open // e.g. '('
                                    || ch.category() == TQChar::Punctuation_Close // e.g. ')'
-                                   || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/unicode/category/Po/list.htm
+                                   || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/tqunicode/category/Po/list.htm
                                    ;
 
         if( !beginFound && !isWordDelimiter )
@@ -643,9 +643,9 @@ KoTextCursor KoTextView::selectParagUnderCursor( const KoTextCursor& cursor, int
     {
         textObject()->selectionChangedNotify();
         // Copy the selection.
-        TQApplication::clipboard()->setSelectionMode( true );
+        TQApplication::tqclipboard()->setSelectionMode( true );
         emit copy();
-        TQApplication::clipboard()->setSelectionMode( false );
+        TQApplication::tqclipboard()->setSelectionMode( false );
     }
     return c2;
 }
@@ -808,9 +808,9 @@ void KoTextView::handleMouseReleaseEvent()
         textObject()->selectionChangedNotify();
 
         // Copy the selection.
-        TQApplication::clipboard()->setSelectionMode( true );
+        TQApplication::tqclipboard()->setSelectionMode( true );
         emit copy();
-        TQApplication::clipboard()->setSelectionMode( false );
+        TQApplication::tqclipboard()->setSelectionMode( false );
     }
 
     inDoubleClick = FALSE;
@@ -831,9 +831,9 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i
     *m_cursor = selectWordUnderCursor( *m_cursor );
     textObject()->selectionChangedNotify();
     // Copy the selection.
-    TQApplication::clipboard()->setSelectionMode( true );
+    TQApplication::tqclipboard()->setSelectionMode( true );
     emit copy();
-    TQApplication::clipboard()->setSelectionMode( false );
+    TQApplication::tqclipboard()->setSelectionMode( false );
 
     possibleTripleClick=true;
 
@@ -900,8 +900,8 @@ bool KoTextView::insertParagraph(const TQPoint &pos)
         if ( pos.x() + f->width(' ') >= textDocument()->width())
         {
             //FIXME me bidi.
-            //change parag alignment => right alignment
-            last->setAlignment( TQt::AlignRight );
+            //change parag tqalignment => right tqalignment
+            last->tqsetAlignment( TQt::AlignRight );
         }
         else
         {
@@ -1207,7 +1207,7 @@ bool KoTextView::openLink( KoLinkVariable* variable )
     }
     else
     {
-        KMessageBox::sorry( 0, i18n("%1 is not a valid link.").arg( variable->url() ) );
+        KMessageBox::sorry( 0, i18n("%1 is not a valid link.").tqarg( variable->url() ) );
         return false;
     }
 }
@@ -1450,10 +1450,10 @@ void KoTextView::copyTextOfComment()
     {
         KURL::List lst;
         lst.append( var->note() );
-        TQApplication::clipboard()->setSelectionMode(true);
-        TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) );
-        TQApplication::clipboard()->setSelectionMode(false);
-        TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) );
+        TQApplication::tqclipboard()->setSelectionMode(true);
+        TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) );
+        TQApplication::tqclipboard()->setSelectionMode(false);
+        TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) );
     }
 }
 
@@ -1476,13 +1476,13 @@ KoParagStyle * KoTextView::createStyleFromSelection(const TQString & name)
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
         cursor = textDocument()->selectionStartCursor( KoTextDocument::Standard );
     KoParagStyle * style = new KoParagStyle (name);
-    KoParagLayout layout(cursor.parag()->paragLayout());
-    layout.style = style;
+    KoParagLayout tqlayout(cursor.parag()->paragLayout());
+    tqlayout.style = style;
     style->setFollowingStyle( style );
     style->format() = *(cursor.parag()->at(cursor.index())->format());
 
-    style->paragLayout() = layout;
-    // Select this new style - hmm only the parag layout, we don't want to erase any text-formatting
+    style->paragLayout() = tqlayout;
+    // Select this new style - hmm only the parag tqlayout, we don't want to erase any text-formatting
     cursor.parag()->setParagLayout( style->paragLayout() );
     return style;
 }
@@ -1500,7 +1500,7 @@ void KoTextView::updateStyleFromSelection( KoParagStyle* style )
 
 void KoTextView::addBookmarks(const TQString &url)
 {
-    TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+    TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
     KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,false );
     KBookmarkGroup group = bookManager->root();
     group.addBookmark( bookManager, url, KURL( url));
@@ -1515,10 +1515,10 @@ void KoTextView::copyLink()
     {
         KURL::List lst;
         lst.append( var->url() );
-        TQApplication::clipboard()->setSelectionMode(true);
-        TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) );
-        TQApplication::clipboard()->setSelectionMode(false);
-        TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) );
+        TQApplication::tqclipboard()->setSelectionMode(true);
+        TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) );
+        TQApplication::tqclipboard()->setSelectionMode(false);
+        TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) );
     }
 }
 
diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h
index d1bc6025f..f8c2ef124 100644
--- a/lib/kotext/KoTextZoomHandler.h
+++ b/lib/kotext/KoTextZoomHandler.h
@@ -33,7 +33,7 @@ public:
 
     //// Support for WYSIWYG text layouting /////
 
-    /** The "[zoomed] view pixel" -> "layout unit pixel" conversions. */
+    /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */
     int pixelToLayoutUnitX( int x ) const;
     int pixelToLayoutUnitY( int y ) const;
     TQPoint pixelToLayoutUnit( const TQPoint &p ) const
@@ -43,7 +43,7 @@ public:
     { return TQRect( pixelToLayoutUnit( r.topLeft() ),
                     pixelToLayoutUnit( r.bottomRight() ) ); }
 
-    /** The "layout unit pixel" -> "[zoomed] view pixel" conversions. */
+    /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */
     int layoutUnitToPixelX( int lupix ) const;
     int layoutUnitToPixelY( int lupix ) const;
 
@@ -89,26 +89,26 @@ public:
     }
 
     /**
-     * Given the font size for the font in layout units, in pt (use pointSize())
+     * Given the font size for the font in tqlayout units, in pt (use pointSize())
      * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()),
      */
     double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const;
 
-    // Note: For converting fontsizes from/to layout units and zoom-independent
+    // Note: For converting fontsizes from/to tqlayout units and zoom-independent
     // pt sizes (like the one the user sees, e.g. 12pt),
     // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize.
 
 
-    // The conversions below convert between an internal text layout resolution of
+    // The conversions below convert between an internal text tqlayout resolution of
     // ~1440 DPI (by default) and the point-size for the fonts (those known by the user).
     // Those conversions don't depend on the zoom level.
 
     /** Change the factor that converts between pointsizes
-     * and layout units (by default 20 - for 1440 DPI at 72 DPI) */
+     * and tqlayout units (by default 20 - for 1440 DPI at 72 DPI) */
     static void setPtToLayoutUnitFactor( int factor ) { m_layoutUnitFactor = factor; }
 
     /** Not zoom dependent. Simply convert a pt value (e.g. a frame)
-     * to high-resolution layout unit coordinates (in pt). */
+     * to high-resolution tqlayout unit coordinates (in pt). */
     static double ptToLayoutUnitPt( double pt )
     { return pt * static_cast<double>( m_layoutUnitFactor ); }
     /** Same thing for integer values, e.g. a font size in pt */
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 489752f0d..fa1b03feb 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -123,7 +123,7 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const
     settingsWriter.addConfigItem( "displayfieldcode", m_displayFieldCode);
     // m_startingPageNumber isn't saved to OASIS. Applications must use either
     // style:page-number in the first parag of a page (see KoTextParag), or
-    // style:first-page-number in style:page-layout, for spreadsheets etc.
+    // style:first-page-number in style:page-tqlayout, for spreadsheets etc.
     if ( d->m_lastPrintingDate.isValid())
         settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate));
 
@@ -532,7 +532,7 @@ TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type)
             if ( parag )
             {
                 //kdDebug(32500) << "KoDoc::recalcVariables -> invalidating parag " << parag->paragId() << endl;
-                parag->invalidate( 0 );
+                parag->tqinvalidate( 0 );
                 parag->setChanged( true );
             }
         }
@@ -896,7 +896,7 @@ void KoVariable::recalcAndRepaint()
     if ( parag )
     {
         //kdDebug(32500) << "KoVariable::recalcAndRepaint -> invalidating parag " << parag->paragId() << endl;
-        parag->invalidate( 0 );
+        parag->tqinvalidate( 0 );
         parag->setChanged( true );
     }
     textDocument()->emitRepaintChanged();
@@ -978,7 +978,7 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
     //p->drawText( x, posY, str );
     // We can't just drawText, it wouldn't use the same kerning as the one
     // that resize() planned for [which is zoom-independent].
-    // We need to do the layout using layout units instead, so for simplicity
+    // We need to do the tqlayout using tqlayout units instead, so for simplicity
     // I just draw every char individually (whereas KoTextFormatter/KoTextParag
     // detect runs of text that can be drawn together)
     const int len = str.length();
@@ -988,9 +988,9 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
     {
         const TQChar ch = str[i];
         p->drawText( x, posY, TQString(ch) );
-        // Do like KoTextFormatter: do the layout in layout units.
+        // Do like KoTextFormatter: do the tqlayout in tqlayout units.
         xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) );
-        // And then compute the X position in pixels from the layout unit X.
+        // And then compute the X position in pixels from the tqlayout unit X.
         x = zh->layoutUnitToPixelX( xLU );
     }
 
@@ -1211,7 +1211,7 @@ void KoDateVariable::resize()
 void KoDateVariable::recalc()
 {
     if ( m_subtype == VST_DATE_CURRENT )
-        m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
+        m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
     else if ( m_subtype == VST_DATE_LAST_PRINTING )
         m_varValue = m_varColl->variableSetting()->lastPrintingDate();
     else if ( m_subtype == VST_DATE_CREATE_FILE )
@@ -1222,7 +1222,7 @@ void KoDateVariable::recalc()
     {
         // Only if never set before (i.e. upon insertion)
         if ( m_varValue.isNull() )
-            m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
+            m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
     }
     resize();
 }
@@ -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" ).arg( KGlobal::locale()->dateFormat() ).arg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormat() ).tqarg( KGlobal::locale()->timeFormat() );
         else if ( value.lower() == "localedatetimeshort" )
-            value =  TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormatShort() ).arg( KGlobal::locale()->timeFormat() );
+            value =  TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormatShort() ).tqarg( KGlobal::locale()->timeFormat() );
         klocaleFormat = true;
     }
     writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisDateStyle(context.mainStyles(), value, klocaleFormat ) );
@@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h
 /******************************************************************/
 KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl )
     : KoVariable( textdoc, varFormat,_varColl )
-    , m_createdNoteDate( TQDate::currentDate() )
+    , m_createdNoteDate( TQDate::tqcurrentDate() )
 {
     m_varValue = TQVariant( _note );
 }
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index fce8fc2df..88f179752 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 repaint itself
+     * Ask this variable to recalculate and to tqrepaint 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/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui
index 7c8896b5f..cd8f17f2c 100644
--- a/lib/kotext/kodecorationtabbase.ui
+++ b/lib/kotext/kodecorationtabbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQGroupBox">
             <property name="name">
-                <cstring>colorGroupBox</cstring>
+                <cstring>tqcolorGroupBox</cstring>
             </property>
             <property name="title">
                 <string>Colors</string>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui
index b2b4ce26a..27be07027 100644
--- a/lib/kotext/kohighlightingtabbase.ui
+++ b/lib/kotext/kohighlightingtabbase.ui
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index 723c50c25..d8a0374e8 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqstring.h>
 
 #include <klocale.h>
@@ -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").arg(lang) );
+                throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) );
         }
         else
-            throw KoHyphenatorException( TQString("No dictionary for %1").arg(lang) );
+            throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(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").arg(lang) ));
+                throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) ));
             }
         }
         else
-            throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").arg(lang) ));
+            throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) ));
     }
     return dicts[lang];
 }
diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui
index 0fbd54420..a90735847 100644
--- a/lib/kotext/kolanguagetabbase.ui
+++ b/lib/kotext/kolanguagetabbase.ui
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>171</height>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index 646bc7952..471607d4d 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -94,7 +94,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>
@@ -103,7 +103,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -225,7 +225,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 356b01589..5d5fbe5e1 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -11,14 +11,14 @@ class MyWidget : public TQWidget
 public:
     MyWidget( KoZoomHandler* _zh, TQWidget* parent )
         : TQWidget( parent ), m_zh(_zh) {
-        setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+        tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
     }
 
-    TQSize sizeHint() const {
+    TQSize tqsizeHint() const {
         return TQSize( 150, 150 );
     }
-    TQSize minimumSizeHint() const {
-        return sizeHint();
+    TQSize tqminimumSizeHint() const {
+        return tqsizeHint();
     }
 
     KoBorder m_leftBorder;
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 6721f771c..b6138315b 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->invalidate(0);
+      parag->tqinvalidate(0);
       parag->format();
     }
     doc->clear(false);
@@ -205,8 +205,8 @@ int main (int argc, char ** argv)
     KApplication app(argc, argv, "KoTextFormatter test");
 
     // Don't let locale settings lead to different hyphenation output
-    KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
-    KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
+    KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) );
+    KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) );
 
     KoTextFormatterTest test;
     //test.speedTest();
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index ded1c9066..830b3bdb3 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -38,7 +38,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -59,7 +59,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -113,7 +113,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -137,7 +137,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -175,7 +175,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>
diff --git a/lib/kross/api/callable.cpp b/lib/kross/api/callable.cpp
index b85aa4cdd..f095f5960 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_children.contains(name);
+    return m_tqchildren.contains(name);
 }
 
 Object::Ptr Callable::getChild(const TQString& name) const
 {
-    return m_children[name];
+    return m_tqchildren[name];
 }
 
 TQMap<TQString, Object::Ptr> Callable::getChildren() const
 {
-    return m_children;
+    return m_tqchildren;
 }
 
 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'")
-        .arg(name).arg(object->getClassName()) );
+        .tqarg(name).tqarg(object->getClassName()) );
 #endif
-    m_children.replace(name, Object::Ptr(object));
+    m_tqchildren.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'").arg(name) );
+    krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").tqarg(name) );
 #endif
-    m_children.remove(name);
+    m_tqchildren.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_children.clear();
+    m_tqchildren.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").arg(name).arg(getName()).arg(args ? args->toString() : TQString("")) );
+    krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").tqarg(name).tqarg(getName()).tqarg(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'").arg(getName()).arg(s)) );
+            throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").tqarg(getName()).tqarg(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> children = getChildren();
-        TQMap<TQString, Object::Ptr>::Iterator it( children.begin() );
-        for(; it != children.end(); ++it)
+        TQMap<TQString, Object::Ptr> tqchildren = getChildren();
+        TQMap<TQString, Object::Ptr>::Iterator it( tqchildren.begin() );
+        for(; it != tqchildren.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'.").arg(getName()).arg(name) );
+    krossdebug( TQString("Object '%1' has no callable object named '%2'.").tqarg(getName()).tqarg(name) );
     return 0;
 }
diff --git a/lib/kross/api/callable.h b/lib/kross/api/callable.h
index 0e3dd3a6c..63edb0671 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 children.
+             * Return all tqchildren.
              *
-             * \return A \a ObjectMap of children this Object has.
+             * \return A \a ObjectMap of tqchildren this Object has.
              */
             TQMap<TQString, Object::Ptr> getChildren() const;
 
@@ -125,7 +125,7 @@ namespace Kross { namespace Api {
             void removeChild(const TQString& name);
 
             /**
-             * Remove all children.
+             * Remove all tqchildren.
              */
             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_children;
+            TQMap<TQString, Object::Ptr> m_tqchildren;
     };
 
 }}
diff --git a/lib/kross/api/class.h b/lib/kross/api/class.h
index 6224a61ae..de1d898c6 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)").arg(name) );
+                krossdebug( TQString("Class::call(%1)").tqarg(name) );
                 return Event<T>::call(name, arguments);
             }
             */
diff --git a/lib/kross/api/event.h b/lib/kross/api/event.h
index b75107f75..26a921179 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'").arg(name).arg(getName()) );
+                krossdebug( TQString("Event::call() name='%1' getName()='%2'").tqarg(name).tqarg(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.").arg(name) );
+                    krossdebug( TQString("Event::call() name='%1' is a builtin function.").tqarg(name) );
 #endif
                     return function->call(arguments);
                 }
diff --git a/lib/kross/api/eventscript.cpp b/lib/kross/api/eventscript.cpp
index f9fe9f9a9..43c4c1cb8 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").arg(name).arg(arguments->toString()) );
+    krossdebug( TQString("EventScript::call() name=%1 arguments=%2").tqarg(name).tqarg(arguments->toString()) );
     //TODO
     return 0;
 }
diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp
index 8f4d2c50b..e3a8e54fc 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").arg(m_signal).arg(arguments->toString()) );
+    krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").tqarg(m_signal).tqarg(arguments->toString()) );
 #endif
 
     TQString n = m_signal;
@@ -54,9 +54,9 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen
     if(n.startsWith("2")) // Remove prefix of SIGNAL-macros
         n.remove(0,1);
 
-    int signalid = m_sender->metaObject()->findSignal(n.latin1(), false);
+    int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false);
     if(signalid < 0)
-        throw new Exception(TQString("No such signal '%1'.").arg(n));
+        throw new Exception(TQString("No such signal '%1'.").tqarg(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 3f6482db5..fd566d318 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").arg(m_slot).arg(arguments->toString()) );
+    krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").tqarg(m_slot).tqarg(arguments->toString()) );
 #endif
 
     TQString n = m_slot; //TODO name; //Variant::toString(args->item(0));
@@ -54,9 +54,9 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments)
     if(n.startsWith("1")) // Remove prefix of SLOT-macros
         n.remove(0,1);
 
-    int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false);
+    int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false);
     if(slotid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(n)) );
+        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(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.").arg(signal) );
+        krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").tqarg(signal) );
         return TQCString();
     }
     TQString signalname = signature.left(startpos);
@@ -80,16 +80,16 @@ TQCString EventSlot::getSlot(const TQCString& signal)
     //TQStringList paramlist = TQStringList::split(",", params);
     TQCString slot = TQString("callback(" + params + ")").latin1(); //normalizeSignalSlot();
 
-    TQMetaObject* mo = metaObject();
+    TQMetaObject* mo = tqmetaObject();
     int slotid = mo->findSlot(slot, false);
     if(slotid < 0) {
-        krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").arg(signal).arg(slot) );
+        krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(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.").arg(signal).arg(slot) );
+        krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").tqarg(signal).tqarg(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")
-        .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) );
+        .tqarg(signal).tqarg(slot).tqarg(slotid).tqarg(params).tqarg(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 !!!").arg(senderobj->name()).arg(signal).arg(function) );
+        krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").tqarg(senderobj->name()).tqarg(signal).tqarg(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.").arg(senderobj->name()).arg(signal).arg(function) );
+            krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) );
             return false;
         }
-        krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").arg(senderobj->name()).arg(signal).arg(function) );
+        krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").tqarg(senderobj->name()).tqarg(signal).tqarg(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'")
-                 .arg(m_sender->name()).arg(m_signal).arg(m_function) );
+                 .tqarg(m_sender->name()).tqarg(m_signal).tqarg(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'").arg(variant.toString()).arg(e.type()).arg(e.description()) );
+        krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").tqarg(variant.toString()).tqarg(e.type()).tqarg(e.description()) );
     }
 }
 
diff --git a/lib/kross/api/exception.cpp b/lib/kross/api/exception.cpp
index cb0125c46..c6a0198fd 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'").arg(m_error).arg(m_lineno) );
+    krosswarning( TQString("Kross::Api::Exception error='%1' lineno='%3'").tqarg(m_error).tqarg(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").arg(m_lineno).arg(m_error)
-        : TQString("Exception: %1").arg(m_error);
+        ? TQString("Exception at line %1: %2").tqarg(m_lineno).tqarg(m_error)
+        : TQString("Exception: %1").tqarg(m_error);
 }
 
 const TQString Exception::getError() const
diff --git a/lib/kross/api/interpreter.cpp b/lib/kross/api/interpreter.cpp
index 86eae4796..8d2669306 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").arg(m_interpretername) );
+    krossdebug( TQString("Loading the interpreter library for %1").tqarg(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.").arg(m_library).arg(m_interpretername) )
+            new Exception( 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) );
+        krosswarning( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").tqarg(m_library).tqarg(m_interpretername) );
         return 0;
     }
 
diff --git a/lib/kross/api/list.cpp b/lib/kross/api/list.cpp
index 9e2baf528..3d894116a 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.").arg(idx) );
-        throw Exception::Ptr( new Exception(TQString("List-index %1 out of bounds.").arg(idx)) );
+        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)) );
     }
     return list[idx];
 }
diff --git a/lib/kross/api/module.h b/lib/kross/api/module.h
index f27bdf5c1..3e58305ab 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").arg(name) );
+                krossdebug( TQString("Kross::Api::Module %1 created").tqarg(name) );
             }
 
             /**
@@ -59,7 +59,7 @@ namespace Kross { namespace Api {
              */
             virtual ~Module()
             {
-                krossdebug( TQString("Kross::Api::Module %1 destroyed").arg(getName()) );
+                krossdebug( TQString("Kross::Api::Module %1 destroyed").tqarg(getName()) );
             }
 
             /**
diff --git a/lib/kross/api/object.cpp b/lib/kross/api/object.cpp
index 43fa8b4bb..06ec55d52 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'").arg(m_name).arg(_KShared_count()) );
+    krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) );
 #endif
 }
 
 Object::~Object()
 {
 #ifdef KROSS_API_OBJECT_DTOR_DEBUG
-    krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) );
+    krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) );
 #endif
     //removeAllChildren(); // not needed cause we use KShared to handle ref-couting and freeing.
 }
 
 const TQString Object::toString()
 {
-    return TQString("%1").arg(getClassName());
+    return TQString("%1").tqarg(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").arg(name).arg(getName()).arg(getClassName()) );
+    krossdebug( TQString("Kross::Api::Object::call(%1) name=%2 class=%3").tqarg(name).tqarg(getName()).tqarg(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'").arg(name)) );
+    throw Exception::Ptr( new Exception(TQString("No callable object named '%2'").tqarg(name)) );
 }
 
diff --git a/lib/kross/api/object.h b/lib/kross/api/object.h
index f23a6179b..87bd21326 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.").arg(object ? object->getClassName() : "")) );
+        throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").tqarg(object ? object->getClassName() : "")) );
     return t;
 }
 
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 5fc1a36a0..243f05033 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -42,13 +42,13 @@ QtObject::QtObject(TQObject* object, const TQString& name)
     // Walk through the signals and slots the TQObject has
     // and attach them as events to this QtObject.
 
-    TQStrList slotnames = m_object->metaObject()->slotNames(false);
+    TQStrList slotnames = m_object->tqmetaObject()->slotNames(false);
     for(char* c = slotnames.first(); c; c = slotnames.next()) {
         TQCString s = c;
         addChild(s, new EventSlot(s, object, s) );
     }
 
-    TQStrList signalnames = m_object->metaObject()->signalNames(false);
+    TQStrList signalnames = m_object->tqmetaObject()->signalNames(false);
     for(char* c = signalnames.first(); c; c = signalnames.next()) {
         TQCString s = c;
         addChild(s, new EventSignal(s, object, s) );
@@ -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'").arg(signature)) );
+        throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").tqarg(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").arg(argcount).arg(t) );
+//krossdebug( TQString("1 ---------------------: (%1) %2").tqarg(argcount).tqarg(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").arg(s));
+            //krossdebug(TQString("EventSlot::toTQUObject s=%1").tqarg(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'.").arg(paramlist[i]).arg(signature)) );
+            throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").tqarg(paramlist[i]).tqarg(signature)) );
         }
     }
 
@@ -129,13 +129,13 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
 Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-        TQStringList::fromStrList(m_object->metaObject()->propertyNames(false)));
+        TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-        m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
+        m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false));
 }
 
 Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args)
@@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           TQStringList::fromStrList(m_object->metaObject()->slotNames(false)));
+           TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->metaObject()->slotNames(false).find(
+           bool(m_object->tqmetaObject()->slotNames(false).find(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
@@ -173,9 +173,9 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
 {
 //TODO just call the child event ?!
     TQString name = Kross::Api::Variant::toString(args->item(0));
-    int slotid = m_object->metaObject()->findSlot(name.latin1(), false);
+    int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false);
     if(slotid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(name)) );
+        throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) );
 
     TQUObject* uo = QtObject::toTQUObject(name, args);
     m_object->qt_invoke(slotid, uo);
@@ -187,13 +187,13 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args)
 Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr)
 {
     return new Kross::Api::Variant(
-           TQStringList::fromStrList(m_object->metaObject()->signalNames(false)));
+           TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false)));
 }
 
 Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args)
 {
     return new Kross::Api::Variant(
-           bool(m_object->metaObject()->signalNames(false).find(
+           bool(m_object->tqmetaObject()->signalNames(false).find(
                Kross::Api::Variant::toString(args->item(0)).latin1()
            ) != -1));
 }
@@ -201,9 +201,9 @@ Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args)
 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);
+    int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false);
     if(signalid < 0)
-        throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").arg(name)) );
+        throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(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").arg(signalname);
+    TQString signalsignatur = TQString("2%1").tqarg(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'.").arg(obj->getName())) );
+        throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").tqarg(obj->getName())) );
 
     TQString slotname = Kross::Api::Variant::toString(args->item(2));
-    TQString slotsignatur = TQString("1%1").arg(slotname);
+    TQString slotsignatur = TQString("1%1").tqarg(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 54e8ed7e1..e8d8bc1bf 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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::String expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Int expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::UInt expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Double expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::LLONG expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::ULLONG expected, but got %1.").tqarg(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.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Bool expected, but got %1.").tqarg(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'.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(TQString("Kross::Api::Variant::StringList expected, but got '%1'.").tqarg(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'.").arg(variant.typeName()).latin1()) );
+        throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::List expected, but got '%1'.").tqarg(variant.typeName()).latin1()) );
     return variant.toList();
 }
diff --git a/lib/kross/main/mainmodule.cpp b/lib/kross/main/mainmodule.cpp
index 8c29180ff..dde745026 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'").arg(name).arg(signal.data()) );
+        krosswarning( TQString("Failed to add signal name='%1' signature='%2'").tqarg(name).tqarg(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'").arg(name).arg(slot.data()) );
+        krosswarning( TQString("Failed to add slot name='%1' signature='%2'").tqarg(name).tqarg(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'").arg(object->name()) );
+        krosswarning( TQString("Failed to add TQObject name='%1'").tqarg(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'").arg(action->name()) );
+        krosswarning( TQString("Failed to add KAction name='%1'").tqarg(action->name()) );
         return 0;
     }
     return event;
diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp
index 156eb2ace..646a87464 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'").arg(interpretername)) );
+        setException( new Exception(i18n("No such interpreter '%1'").tqarg(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!").arg(modulename) );
+            krossdebug( TQString("Manager::loadModule(%1) =======> Modulename registered, but module is invalid!").tqarg(modulename) );
     }
 
     KLibLoader* loader = KLibLoader::self();
     KLibrary* lib = loader->globalLibrary( modulename.latin1() );
     if(! lib) {
-        krosswarning( TQString("Failed to load module '%1': %2").arg(modulename).arg(loader->lastErrorMessage()) );
+        krosswarning( TQString("Failed to load module '%1': %2").tqarg(modulename).tqarg(loader->lastErrorMessage()) );
         return 0;
     }
-    krossdebug( TQString("Successfully loaded module '%1'").arg(modulename) );
+    krossdebug( TQString("Successfully loaded module '%1'").tqarg(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'").arg(modulename) );
+        krosswarning( TQString("Failed to determinate init function in module '%1'").tqarg(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'").arg(modulename) );
+        krosswarning( TQString("Failed to load module '%1'").tqarg(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'").arg(modulename).arg(module->toString()) );
+    //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").tqarg(modulename).tqarg(module->toString()) );
     return module;
 }
 
diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp
index c98cc97c0..b658a0b14 100644
--- a/lib/kross/main/scriptaction.cpp
+++ b/lib/kross/main/scriptaction.cpp
@@ -20,7 +20,7 @@
 #include "scriptaction.h"
 #include "manager.h"
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -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").arg(text.isEmpty() ? name : text).arg(file);
+            description = TQString("%1<br>%2").tqarg(text.isEmpty() ? name : text).tqarg(file);
         else
-            description += TQString("<br>%1").arg(file);
+            description += TQString("<br>%1").tqarg(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")
-                   .arg( TQStyleSheet::escape(errormessage) )
-                   .arg( TQStyleSheet::escape(tracedetails) );
+                   .tqarg( TQStyleSheet::escape(errormessage) )
+                   .tqarg( TQStyleSheet::escape(tracedetails) );
         emit failed(errormessage, tracedetails);
     }
     else {
diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp
index 7f7f980ed..a345dd02f 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'").arg(name) );
+    //krossdebug( TQString("ScriptContainer::ScriptContainer() Ctor name='%1'").tqarg(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'").arg(d->name) );
+    //krossdebug( TQString("ScriptContainer::~ScriptContainer() Dtor name='%1'").tqarg(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").arg(name).arg(value.toString()) );
-    } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such interpreterinfo").arg(name).arg(value.toString()) );
+        } 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()) );
     return false;
 }
 
@@ -244,19 +244,19 @@ bool ScriptContainer::initialize()
     finalize();
 
     if(! d->scriptfile.isNull()) {
-        krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").arg(d->scriptfile) );
+        krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").tqarg(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'").arg(d->scriptfile)) );
+                setException( new Exception(i18n("Failed to determinate interpreter for scriptfile '%1'").tqarg(d->scriptfile)) );
                 return false;
             }
         }
 
         TQFile f( d->scriptfile );
         if(! f.open(IO_ReadOnly)) {
-            setException( new Exception(i18n("Failed to open scriptfile '%1'").arg(d->scriptfile)) );
+            setException( new Exception(i18n("Failed to open scriptfile '%1'").tqarg(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'").arg(d->interpretername)) );
+        setException( new Exception(i18n("Unknown interpreter '%1'").tqarg(d->interpretername)) );
         return false;
     }
 
     d->script = interpreter->createScript(this);
     if(! d->script) {
-        setException( new Exception(i18n("Failed to create script for interpreter '%1'").arg(d->interpretername)) );
+        setException( new Exception(i18n("Failed to create script for interpreter '%1'").tqarg(d->interpretername)) );
         return false;
     }
     if(d->script->hadException()) {
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 88877f5a4..b3b29bda3 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").arg(scriptpackagefile) );
+    krossdebug( TQString("Install script package: %1").tqarg(scriptpackagefile) );
     KTar archive( scriptpackagefile );
     if(! archive.open(IO_ReadOnly)) {
-        KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").arg(scriptpackagefile));
+        KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").tqarg(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?" ).arg(packagename),
+            i18n("A script package with the name \"%1\" already exists. Replace this package?" ).tqarg(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\".").arg(destination));
+            KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(destination));
             return false;
         }
     }
 
-    krossdebug( TQString("Copy script-package to destination directory: %1").arg(destination) );
+    krossdebug( TQString("Copy script-package to destination directory: %1").tqarg(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\".").arg(scriptpackagepath));
+        KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(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").arg(scriptconfigfile) );
+    krossdebug( TQString("ScriptGUIClient::loadScriptConfig file=%1").tqarg(scriptconfigfile) );
 
     TQDomDocument domdoc;
     TQFile file(scriptconfigfile);
     if(! file.open(IO_ReadOnly)) {
-        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").arg(scriptconfigfile) );
+        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").tqarg(scriptconfigfile) );
         return false;
     }
     bool ok = domdoc.setContent(&file);
     file.close();
     if(! ok) {
-        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").arg(scriptconfigfile) );
+        krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").tqarg(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...").arg(action->name()) );
+                    krosswarning( TQString("Kross::Api::ScriptGUIClient::loadScriptConfigDocument: There exists already a scriptaction with name \"%1\". Added anyway...").tqarg(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'").arg(file) );
+    krossdebug( TQString("Kross::Api::ScriptGUIClient::executeScriptFile() file='%1'").tqarg(file) );
 
     ScriptAction::Ptr action = new ScriptAction(file);
     return executeScriptAction(action);
@@ -377,7 +377,7 @@ void ScriptGUIClient::showScriptManager()
     KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close);
     WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog);
     dialog->setMainWidget(wsm);
-    dialog->resize( TQSize(360, 320).expandedTo(dialog->minimumSizeHint()) );
+    dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) );
     dialog->show();
 }
 
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index e521023e9..488b7409d 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -93,9 +93,9 @@ class ToolTip : public TQToolTip
         virtual void maybeTip(const TQPoint& p) {
             ListItem* item = dynamic_cast<ListItem*>( m_parent->itemAt(p) );
             if(item) {
-                TQRect r( m_parent->itemRect(item) );
+                TQRect r( m_parent->tqitemRect(item) );
                 if(r.isValid() && item->action()) {
-                    tip(r, TQString("<qt>%1</qt>").arg(item->action()->toolTip()));
+                    tip(r, TQString("<qt>%1</qt>").tqarg(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\"?")
-            .arg(item->action()->text()).arg(packagepath),
+            .tqarg(item->action()->text()).tqarg(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").arg(appname);
+    const TQString type = TQString("%1/script").tqarg(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").arg(appname));
+    p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").tqarg(appname));
     d->exec();
 #endif
 }
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 1140e8489..379fb2dbc 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -56,7 +56,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -66,7 +66,7 @@
                     <property name="name">
                         <cstring>btnExec</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -97,7 +97,7 @@
                     <property name="name">
                         <cstring>btnLoad</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -114,7 +114,7 @@
                     <property name="name">
                         <cstring>btnUnload</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -145,7 +145,7 @@
                     <property name="name">
                         <cstring>btnInstall</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -162,7 +162,7 @@
                     <property name="name">
                         <cstring>btnUninstall</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -193,7 +193,7 @@
                     <property name="name">
                         <cstring>btnNewStuff</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 416483206..900a347bb 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 children we must maintain this behavior.
+	// valid pointer to a Python object. In tqchildren 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>.
@@ -1470,8 +1470,8 @@ namespace Py
 	// Python strings return strings as individual elements.
 	// I'll try having a class Char which is a String of length 1
 	//
-	typedef std::basic_string<Py_UNICODE> unicodestring;
-	extern Py_UNICODE unicode_null_string[1];
+	typedef std::basic_string<Py_UNICODE> tqunicodestring;
+	extern Py_UNICODE tqunicode_null_string[1];
 
 	class Char: public Object
 		{
@@ -1535,7 +1535,7 @@ namespace Py
 			return *this;
 			}
 
-		Char& operator= (const unicodestring& v)
+		Char& operator= (const tqunicodestring& v)
 			{
 			set(PyUnicode_FromUnicode (const_cast<Py_UNICODE*>(v.data()),1), true);
 			return *this;
@@ -1650,7 +1650,7 @@ namespace Py
 					static_cast<int>( v.length() ) ), true );
 			return *this;
 			}
-		String& operator= (const unicodestring& v)
+		String& operator= (const tqunicodestring& v)
 			{
 			set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ),
 					static_cast<int>( v.length() ) ), true );
@@ -1706,16 +1706,16 @@ namespace Py
 			}
 			}
 
-		unicodestring as_unicodestring() const
+		tqunicodestring as_tqunicodestring() const
 			{
 			if( isUnicode() )
 			{
-				return unicodestring( PyUnicode_AS_UNICODE( ptr() ),
+				return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ),
 					static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) );
 			}
 			else
 			{
-				throw TypeError("can only return unicodestring from Unicode object");
+				throw TypeError("can only return tqunicodestring from Unicode object");
 			}
 			}
 		};
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index 46d065bb7..7213ad706 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -62,7 +62,7 @@ integrates Python with C++ in these ways: </p>
 
 <p>Download PyCXX from <a href="http://sourceforge.net/projects/cxx/">http://sourceforge.net/projects/cxx/</a>.</p>
 
-<p>The distribution layout is:</p>
+<p>The distribution tqlayout is:</p>
 <table>
 <tr><th>Directory</th><th>Description</th></tr>
 <tr><td class=code>.</td><td>Makefile for Unix and Windows, Release documentation</td>
@@ -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 children acquire a new reference when constructed from a
+<p>Usually, <cite>Object</cite> and its tqchildren 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>
 
@@ -1188,8 +1188,8 @@ sequence.</p>
     <td class=code>as_std_string() const</td>
   </tr>
   <tr>
-    <td class=code>unicodestring</td>
-    <td class=code>as_unicodestring() const</td>
+    <td class=code>tqunicodestring</td>
+    <td class=code>as_tqunicodestring() const</td>
   </tr>
 </table>
 
@@ -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 children</h3>
+<h3>Class Exception and its tqchildren</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 children of class Exception</td>
+    <td>Constructors for other tqchildren of class Exception</td>
   </tr>
   <tr>
     <td class=code> </td>
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx
index 61329b604..b7bcaa0ae 100644
--- a/lib/kross/python/cxx/cxxsupport.cxx
+++ b/lib/kross/python/cxx/cxxsupport.cxx
@@ -6,7 +6,7 @@
 #include "Objects.hxx"
 namespace Py {
 
-Py_UNICODE unicode_null_string[1] = { 0 };
+Py_UNICODE tqunicode_null_string[1] = { 0 };
 
 Type Object::type () const
 	{ 
diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp
index dbbe9bf6c..f13cf93af 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'").arg(m_object->getName()).arg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(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'").arg(m_object->getName()).arg(m_object->getClassName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(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'").arg(n) );
+    krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").tqarg(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'").arg(n).arg(*it) );
+                krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").tqarg(n).tqarg(*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> children = callable->getChildren();
-                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( children.begin() );
-                for(; it != children.end(); ++it) {
+                TQMap<TQString, Kross::Api::Object::Ptr> tqchildren = callable->getChildren();
+                TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( tqchildren.begin() );
+                for(; it != tqchildren.end(); ++it) {
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").arg(n).arg(it.key()) );
+                    krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").tqarg(n).tqarg(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__").arg(n) ); return Py::None(); }
-        //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").arg(n) ); return Py::None(); }
+        //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(); }
 
 #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG
-        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").arg(n) );
+        krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").tqarg(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").arg(n) );
+    krossdebug( TQString("PythonExtension::getattr_methods name=%1").tqarg(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").arg(name).arg(value.as_string().c_str()) );
+    krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").tqarg(name).tqarg(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'").arg(object.as_string().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").tqarg(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'").arg(type->tp_name) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").tqarg(type->tp_name) );
 #endif
     if(type == &PyInt_Type)
         return new Kross::Api::Variant(int(Py::Int(object)));
@@ -206,7 +206,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object)
 #ifdef Py_USING_UNICODE
         /* TODO
         if(type == &PyUnicode_Type) {
-            Py::unicodestring u = Py::String(object).as_unicodestring();
+            Py::tqunicodestring u = Py::String(object).as_tqunicodestring();
             std::string s;
             std::copy(u.begin(), u.end(), std::back_inserter(s));
             return new Kross::Api::Variant(s.c_str());
@@ -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'").arg(variant.typeName()) );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").tqarg(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.").arg(variant.typeName()) );
+            krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").tqarg(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").arg(v.toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").tqarg(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").arg(object->getClassName()) );
+    krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").tqarg(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'").arg(list ? list->getName() : "NULL") );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").tqarg(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'").arg(methodname).arg(arguments->toString()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").tqarg(methodname).tqarg(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'.").arg(methodname).arg(self->m_object->getName()) );
+            krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").tqarg(methodname).tqarg(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'.").arg(methodname).arg(self->m_object->getName()) );
+        krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").tqarg(methodname).tqarg(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").arg(err) );
+        krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(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").arg(err) );
+        krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(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 ded5dbc93..23f4b8fb4 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").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));
+    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));
 
     // 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").arg(errobj.as_string().c_str())) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to prepare the __main__ module: %1").tqarg(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 48131bb8d..24b431592 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'").arg(name().c_str()) );
+    krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").tqarg(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").arg(modname) );
+            krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").tqarg(modname) );
 #endif
             if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
-                krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) );
+                krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(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.").arg(modname) );
+                krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) );
             }
 
         }
diff --git a/lib/kross/python/pythonobject.cpp b/lib/kross/python/pythonobject.cpp
index e72ad0bb9..9689d2225 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)").arg( (*i).str().as_string().c_str() ).arg(t) );
+        krossdebug( TQString("PythonObject::PythonObject() method '%1' (%2)").tqarg( (*i).str().as_string().c_str() ).tqarg(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)").arg(name) );
+    krossdebug( TQString("PythonObject::call(%1)").tqarg(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").arg(name).arg(errobj.as_string().c_str())) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to call method '%1': %2").tqarg(name).tqarg(errobj.as_string().c_str())) );
         }
         Py::Object result(r, true);
 
-        //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").arg(name).arg(result.as_string().c_str()) );
+        //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").tqarg(name).tqarg(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 8887e13d9..2329a1d1b 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'").arg( m_scriptcontainer->getName() )) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid scripting code for script '%1'").tqarg( 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'").arg( m_scriptcontainer->getName() )) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize local module context for script '%1'").tqarg( m_scriptcontainer->getName() )) );
 
 #ifdef KROSS_PYTHON_SCRIPT_INIT_DEBUG
-        krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) );
+        krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(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").arg(m_scriptcontainer->getName()).arg(restricted) );
+        krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").tqarg(m_scriptcontainer->getName()).tqarg(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").arg(err) );
+        Kross::Api::Exception::Ptr exception = toException( TQString("Failed to compile python code: %1").tqarg(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'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) );
+        krossdebug( TQString("PythonScript::finalize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(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").arg(err) );
+            krosswarning( TQString("Kross::Python::PythonScript::toException() Failed to fetch a traceback: %1").tqarg(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\"").arg(filename).arg(lineno).arg(name) );
+            //errorlist.append( TQString("%1#%2: \"%3\"").tqarg(filename).tqarg(lineno).tqarg(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").arg(result.as_string().c_str()) );
+        krossdebug( TQString("PythonScript::execute() result=%1").tqarg(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.").arg(vt.first.as_string().c_str()) );
+                krossdebug( TQString("PythonScript::execute() class '%1' added.").tqarg(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.").arg(vt.first.as_string().c_str()) );
+                krossdebug( TQString("PythonScript::execute() function '%1' added.").tqarg(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").arg(err) );
+            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(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").arg(err) );
+            Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(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)")
-                 .arg(name)
-                 .arg(args ? TQString::number(args->count()) : TQString("NULL")) );
+                 .tqarg(name)
+                 .tqarg(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'.").arg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg(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").arg(err)) );
+        setException( new Kross::Api::Exception(TQString("Python Exception: %1").tqarg(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'.").arg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").tqarg(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'.").arg(name)) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to create instance of class '%1'.").tqarg(name)) );
 
         Py::Object classobject(pyobj, true);
 
 #ifdef KROSS_PYTHON_SCRIPT_CLASSINSTANCE_DEBUG
-        krossdebug( TQString("PythonScript::classInstance() inst='%1'").arg(classobject.as_string().c_str()) );
+        krossdebug( TQString("PythonScript::classInstance() inst='%1'").tqarg(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 9a7712cbd..941ed0c6f 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").arg(err) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize PythonSecurity module: %1").tqarg(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'.").arg("compile_restricted")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg("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.").arg("compile_restricted")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' is not callable.").tqarg("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").arg( ml[mi].str().as_string().c_str() ) );
-            //krossdebug( TQString("dir().dir() = %1").arg( Py::Object(ml[mi]).dir().as_string().c_str() ) );
+            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() ) );
         }
         */
 
         Py::Object code(pycode);
-        krossdebug( TQString("%1 callable=%2").arg(code.as_string().c_str()).arg(PyCallable_Check(code.ptr())) );
+        krossdebug( TQString("%1 callable=%2").tqarg(code.as_string().c_str()).tqarg(PyCallable_Check(code.ptr())) );
         Py::List l = code.dir();
         for(Py::List::size_type i = 0; i < l.length(); ++i) {
-            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() ) );
+            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() ) );
         }
 
         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").arg("compile_restricted").arg(err) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' failed with python exception: %2").tqarg("compile_restricted").tqarg(err) ) );
     }
 }
 
diff --git a/lib/kross/python/scripts/RestrictedPython/Guards.py b/lib/kross/python/scripts/RestrictedPython/Guards.py
index 4fbdcad1c..295ba7913 100644
--- a/lib/kross/python/scripts/RestrictedPython/Guards.py
+++ b/lib/kross/python/scripts/RestrictedPython/Guards.py
@@ -24,7 +24,7 @@ for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable',
              'chr', 'cmp', 'complex', 'divmod', 'float', 'hash',
              'hex', 'id', 'int', 'isinstance', 'issubclass', 'len',
              'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round',
-             'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']:
+             'str', 'tuple', 'unichr', 'tqunicode', 'xrange', 'zip']:
 
     safe_builtins[name] = __builtins__[name]
 
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index 9b8e0f8c4..7461447a5 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -190,9 +190,9 @@ class QtDialog:
 			def __init__(self, parent = None, name = None, modal = 0, fl = 0):
 				qt.QDialog.__init__(self, parent, name, modal, fl)
 				qt.QDialog.accept = self.accept
-				self.layout = qt.QVBoxLayout(self)
-				self.layout.setSpacing(6)
-				self.layout.setMargin(11)
+				self.tqlayout = qt.QVBoxLayout(self)
+				self.tqlayout.setSpacing(6)
+				self.tqlayout.setMargin(11)
 				
 		class Label(qt.QLabel):
 			def __init__(self, dialog, parent, caption):
@@ -323,7 +323,7 @@ class QtDialog:
 
 		self.widget = qt.QVBox(self.dialog)
 		self.widget.setSpacing(6)
-		self.dialog.layout.addWidget(self.widget)
+		self.dialog.tqlayout.addWidget(self.widget)
 
 		self.Frame = Frame
 		self.Label = Label
diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp
index 98474bf65..6c2cb40f8 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.").arg(funcname).arg(argc-1));
+    krossdebug(TQString("Building arguments list for function: %1 there are %2 arguments.").tqarg(funcname).tqarg(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'.").arg(funcname).arg(object->getName()) );
+                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing name='%1' is a child object of '%2'.").tqarg(funcname).tqarg(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'.").arg(funcname).arg(object->getName()) );
+                krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing try to call function with name '%1' in object '%2'.").tqarg(funcname).tqarg(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").arg(TYPE(value)));
+    krossdebug(TQString("RubyExtension::toObject of type %1").tqarg(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").arg(TYPE(value)));
+            krosswarning(TQString("This ruby type '%1' cannot be converted to a Kross::Api::Object").tqarg(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.").arg(variant.typeName()) );
+            krosswarning( TQString("Kross::Ruby::RubyExtension::toVALUE(TQVariant) Not possible to convert the TQVariant type '%1' to a VALUE.").tqarg(variant.typeName()) );
             return Qundef;
         }
     }
diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp
index 6af8ecbe7..4a4df32f5 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").arg(modname) );
+        krossdebug( TQString("RubyInterpreter::require() module=%1").tqarg(modname) );
         if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) {
-            krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) );
+            krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(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.").arg(modname) );
+            krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) );
         }
     } else {
         return rb_f_require(obj, name);
diff --git a/lib/kross/ruby/rubymodule.cpp b/lib/kross/ruby/rubymodule.cpp
index 948a10ee9..73012b896 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").arg(modname));
+    krossdebug(TQString("Module: %1").tqarg(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").arg(funcname));
+    krossdebug(TQString("Function %1 missing in a module").tqarg(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 370d4aa7e..dc0fbb162 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").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
+        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
         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").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error
+            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
         }
     }
 
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index 1093a47b7..570e2610a 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").arg(tracedetails).arg(errormessage).latin1() << std::endl;
+            std::cerr << TQString("%2\n%1").tqarg(tracedetails).tqarg(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").arg(e->toString()).latin1() << std::endl;
+        std::cerr << TQString("EXCEPTION %1").tqarg(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 7f304ba6a..421982014 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'").arg( instancecallresult.toString() ) );
+            //krossdebug( TQString("testClass.testClassFunction1 returnvalue => '%1'").tqarg( 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").arg(e->toString()).latin1() << std::endl;
+        std::cout << TQString("EXCEPTION %1").tqarg(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'").arg(e.type()).arg(e.description()) );
+        krossdebug( TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) );
     }
     //delete sc2;
 */
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
         }
     }
     else {
-        Kross::krosswarning( TQString("Failed to load scriptfile: %1").arg(scriptfilename) );
+        Kross::krosswarning( TQString("Failed to load scriptfile: %1").tqarg(scriptfilename) );
         result = -1;
     }
 
diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py
index f1540201e..9fa58bc25 100644
--- a/lib/kross/test/testcase.py
+++ b/lib/kross/test/testcase.py
@@ -79,8 +79,8 @@ class TestPlugin(unittest.TestCase):
 		self.assert_( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" )
 
 		#TODO
-		#self.assert_( self.pluginobject1.stringfunc( unicode(" Unicode test ") ) == " Unicode test " )
-		#self.assert_( self.pluginobject1.stringfunc(unicode(" Another Test! ")) == unicode(" Another Test! ") )
+		#self.assert_( self.pluginobject1.stringfunc( tqunicode(" Unicode test ") ) == " Unicode test " )
+		#self.assert_( self.pluginobject1.stringfunc(tqunicode(" Another Test! ")) == tqunicode(" Another Test! ") )
 
 		self.assert_( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" )
 		self.assert_( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 )
diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py
index 22b6f04b9..6a629c66e 100644
--- a/lib/kross/test/testgui.py
+++ b/lib/kross/test/testgui.py
@@ -89,27 +89,27 @@ class QtTest:
 				qt.QDialog.__init__(self, parent, name, modal, fl)
 				qt.QDialog.accept = self.accept
 				self.setCaption("Export to HTML")
-				#self.layout()
+				#self.tqlayout()
 				
-				self.layout = qt.QVBoxLayout(self)
-				self.layout.setSpacing(6)
-				self.layout.setMargin(11)
+				self.tqlayout = qt.QVBoxLayout(self)
+				self.tqlayout.setSpacing(6)
+				self.tqlayout.setMargin(11)
 
 				infolabel = qt.QLabel("Export the data of a table or a query to a HTML-file.", self)
-				self.layout.addWidget(infolabel)
+				self.tqlayout.addWidget(infolabel)
 
 				source = ComboBox(self, "Datasource:")
-				self.layout.addWidget(source)
+				self.tqlayout.addWidget(source)
 
 				self.exporttype = ComboBox(self, "Style:", ["Plain","Paper","Desert","Blues"])
-				self.layout.addWidget(self.exporttype)
+				self.tqlayout.addWidget(self.exporttype)
 
 				self.filechooser = FileChooser(self)
-				self.layout.addWidget(self.filechooser)
+				self.tqlayout.addWidget(self.filechooser)
 
 				buttonbox = qt.QHBox(self)
 				buttonbox.setSpacing(6)
-				self.layout.addWidget(buttonbox)
+				self.tqlayout.addWidget(buttonbox)
 
 				savebutton = Button("Save", buttonbox)
 				qt.QObject.connect(savebutton, qt.SIGNAL("clicked()"), self, qt.SLOT("accept()"))
diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp
index 884e7e370..eb687d02a 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").arg(i) );
+    Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").tqarg(i) );
     return i;
 }
 
 void TestObject::func2(TQString s, int i)
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").tqarg(s).tqarg(i));
 }
 
 TQString TestObject::func3(TQString s, int i)
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").tqarg(s).tqarg(i));
     return s;
 }
 
 const TQString& TestObject::func4(const TQString& s, int i) const
 {
-    Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").arg(s).arg(i));
+    Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").tqarg(s).tqarg(i));
     return s;
 }
 
@@ -83,13 +83,13 @@ void TestObject::testSlot2()
 
 void TestObject::stdoutSlot(const TQString& s)
 {
-    Kross::krossdebug(TQString("stdout: %1").arg(s));
+    Kross::krossdebug(TQString("stdout: %1").tqarg(s));
     //std::cout << "<stdout> " << s.latin1() << std::endl;
 }
 
 void TestObject::stderrSlot(const TQString& s)
 {
-    Kross::krossdebug(TQString("stderr: %1").arg(s));
+    Kross::krossdebug(TQString("stderr: %1").tqarg(s));
     //std::cout << "<stderr> " << s.latin1() << std::endl;
 }
 
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index ec2960b00..5aa339584 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").arg(file));
+    Kross::krossdebug(TQString("XML-file: %1").tqarg(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").arg(m_scriptcontainer->getException()->toString()) );
+        Kross::krossdebug( TQString("EXCEPTION => %1").tqarg(m_scriptcontainer->getException()->toString()) );
     }
     else {
         TQString s = result ? result->toString() : TQString();
-        Kross::krossdebug( TQString("DONE => %1").arg(s) );
+        Kross::krossdebug( TQString("DONE => %1").tqarg(s) );
     }
 }
 
diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cc
index 430672731..97a6e0332 100644
--- a/lib/kwmf/kowmfpaint.cc
+++ b/lib/kwmf/kowmfpaint.cc
@@ -249,7 +249,7 @@ void KoWmfPaint::drawPolyline( const TQPointArray &pa ) {
 
 
 void KoWmfPaint::drawPolygon( const TQPointArray &pa, bool winding ) {
-    mPainter.drawPolygon( pa, winding );
+    mPainter.tqdrawPolygon( pa, winding );
 }
 
 
@@ -276,7 +276,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding
     if ( mPainter.pen().style() != TQt::NoPen ) {
         mPainter.setBrush( TQt::NoBrush );
         for ( pa = listPa.first() ; pa ; pa = listPa.next() ) {
-            mPainter.drawPolygon( *pa, winding );
+            mPainter.tqdrawPolygon( *pa, winding );
         }
     }
 
diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h
index d71af5c6e..ff8fa9be2 100644
--- a/lib/kwmf/kowmfread.h
+++ b/lib/kwmf/kowmfread.h
@@ -19,7 +19,7 @@
 #define _KOWMFREAD_H_
 
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfont.h>
 #include <tqcolor.h>
 #include <tqrect.h>
diff --git a/lib/kwmf/kowmfreadprivate.h b/lib/kwmf/kowmfreadprivate.h
index feebe0b31..ea95e5633 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 alignment
+    /// set text tqalignment
     void setTextAlign( TQ_UINT32 size, TQDataStream& stream );
     /// draw text
     void textOut( TQ_UINT32 size, TQDataStream& stream );
diff --git a/lib/kwmf/kowmfstack.h b/lib/kwmf/kowmfstack.h
index af906d553..876318abf 100644
--- a/lib/kwmf/kowmfstack.h
+++ b/lib/kwmf/kowmfstack.h
@@ -22,7 +22,7 @@
 #include <tqpen.h>
 #include <tqcolor.h>
 #include <tqfont.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpixmap.h>
 
 class KoWmfRead;
diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h
index 84281f4e4..d94a9d795 100644
--- a/lib/kwmf/kowmfstruct.h
+++ b/lib/kwmf/kowmfstruct.h
@@ -57,7 +57,7 @@ struct WmfEnhMetaHeader
   TQ_UINT16  numHandles;       // Number of handles in the handle table
   // Handle index zero is reserved.
   TQ_UINT16  reserved;         // always 0
-  TQ_UINT32  sizeOfDescription;   // Number of chars in the unicode description string
+  TQ_UINT32  sizeOfDescription;   // Number of chars in the tqunicode description string
                                  // This is 0 if there is no description string
   TQ_UINT32  offsetOfDescription; // Offset to the metafile description record.
                                  // This is 0 if there is no description string
diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h
index 728566d0c..bc3e1411f 100644
--- a/lib/kwmf/kowmfwrite.h
+++ b/lib/kwmf/kowmfwrite.h
@@ -19,7 +19,7 @@
 #define _KOWMFWRITE_H_
 
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqrect.h>
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc
index 38d520db6..0a0d2c120 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cc
@@ -351,7 +351,7 @@ bool KWmf::parse(
     bool isPlaceable;
     bool isEnhanced;
 
-    startedAt = stream.device()->at();
+    startedAt = stream.tqdevice()->at();
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
 
     for (int i = 0; i < s_maxHandles; i++)
@@ -400,7 +400,7 @@ bool KWmf::parse(
         S16 nHandles;               // Number of handles in the handle table
                                     // Handle index zero is reserved.
         S16 sReserved;              // Reserved.  Must be zero.
-        S32 nDescription;           // Number of chars in the unicode description string
+        S32 nDescription;           // Number of chars in the tqunicode description string
                                     // This is 0 if there is no description string
         S32 offDescription;         // Offset to the metafile description record.
                                     // This is 0 if there is no description string
@@ -477,7 +477,7 @@ bool KWmf::parse(
     }
     else
     {
-        stream.device()->at(startedAt);
+        stream.tqdevice()->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.device()->at();
+    fileAt = stream.tqdevice()->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.device()->at(fileAt);
+        stream.tqdevice()->at(fileAt);
         stream >> header.mtType;
         stream >> header.mtHeaderSize;
         stream >> header.mtVersion;
@@ -558,7 +558,7 @@ bool KWmf::parse(
         */
     }
 
-    walk((size - (stream.device()->at() - startedAt)) / 2, stream);
+    walk((size - (stream.tqdevice()->at() - startedAt)) / 2, stream);
     return true;
 }
 
diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc
index aabe40211..a7451b46b 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.begin( const_cast<TQPaintDevice*>(aTarget) );
+    mPainter.tqbegin( const_cast<TQPaintDevice*>(aTarget) );
     if ( TQWMF_DEBUG )  {
         kdDebug() << "Bounding box : " << mBBox.left()
         << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -482,7 +482,7 @@ void QWinMetaFile::polygon( long, short* parm )
     TQPointArray* pa;
 
     pa = pointArray( parm[ 0 ], &parm[ 1 ] );
-    mPainter.drawPolygon( *pa, mWinding );
+    mPainter.tqdrawPolygon( *pa, mWinding );
 }
 
 
@@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // alignment
+    // tqalignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
diff --git a/lib/kwmf/qwmf.h b/lib/kwmf/qwmf.h
index cf05d617f..3bc668c99 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 alignment */
+    /** set text tqalignment */
     void setTextAlign( long num, short* parms );
     /** draw text */
     void textOut( long num, short* parms );
diff --git a/lib/kwmf/wmfstruct.h b/lib/kwmf/wmfstruct.h
index 7400e896e..33a4a67c2 100644
--- a/lib/kwmf/wmfstruct.h
+++ b/lib/kwmf/wmfstruct.h
@@ -53,7 +53,7 @@ struct WmfEnhMetaHeader
     WORD    nHandles;           // Number of handles in the handle table
     // Handle index zero is reserved.
     WORD    sReserved;          // Reserved.  Must be zero.
-    DWORD   nDescription;       // Number of chars in the unicode description string
+    DWORD   nDescription;       // Number of chars in the tqunicode description string
     // This is 0 if there is no description string
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string
diff --git a/lib/store/KoDirectoryStore.cpp b/lib/store/KoDirectoryStore.cpp
index 894a7b392..76e5aa72a 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->open( iomode ) )
+    if ( !m_stream->tqopen( iomode ) )
     {
         delete m_stream;
         m_stream = 0L;
diff --git a/lib/store/KoStoreDrag.h b/lib/store/KoStoreDrag.h
index e35709e79..cbd8c40de 100644
--- a/lib/store/KoStoreDrag.h
+++ b/lib/store/KoStoreDrag.h
@@ -27,7 +27,7 @@
  * This allows to drag-n-drop and copy-paste complex koffice objects.
  * As per usual with dragobjects, an instance of KoStoreDrag must be
  * created on the "sending" side (dragging or copying). The "receiving"
- * side (dropping or pasting) only uses provides()/canDecode() and encodedData().
+ * side (dropping or pasting) only uses provides()/canDecode() and tqencodedData().
  *
  * To create the data in memory, create a TQBuffer,
  * then KoStore::createStore( theBuffer, .... ), save the
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index 6c3459f41..f35686060 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 children
+    // Tell parent that it has tqchildren
     bool parentIndent = prepareForChild();
 
     m_tags.push( Tag( tagName, parentIndent && indentInside ) );
@@ -387,7 +387,7 @@ void KoXmlWriter::addTextSpan( const TQString& text, const TQMap<int, int>& tabC
             nrSpaces = 0;
             leadingSpace = false;
         }
-        switch ( ch.unicode() ) {
+        switch ( ch.tqunicode() ) {
         case '\t':
             if ( !str.isEmpty() )
                 addTextNode( str );
diff --git a/lib/store/KoXmlWriter.h b/lib/store/KoXmlWriter.h
index eaf453d22..5261dd5fb 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 children
+        bool hasChildren; ///< element or text tqchildren
         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 f4b215bac..9da8d2d8f 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -1,10 +1,10 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <KoStore.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqstringlist.h>
 #include <tqbuffer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 class StoreDropTest : public TQTextBrowser
 {
@@ -65,7 +65,7 @@ void StoreDropTest::keyPressEvent( TQKeyEvent * e )
 void StoreDropTest::paste()
 {
     qDebug( "paste" );
-    TQMimeSource* m = TQApplication::clipboard()->data();
+    TQMimeSource* m = TQApplication::tqclipboard()->data();
     if ( !m )
         return;
     processMimeSource( m );
@@ -88,7 +88,7 @@ bool StoreDropTest::processMimeSource( TQMimeSource* ev )
         formats += fmt;
         bool oasis = TQString( fmt ).startsWith( acceptMimeType );
         if ( oasis || TQString( fmt ) == "application/x-kpresenter" ) {
-            TQByteArray data = ev->encodedData( fmt );
+            TQByteArray data = ev->tqencodedData( fmt );
             showZipContents( data, fmt, oasis );
             return true;
         }
@@ -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" ).arg( fileName );
+        return TQString( "%1 not found\n" ).tqarg( fileName );
 
     TQByteArray data = store->device()->readAll();
     store->close();
-    TQString txt = TQString( "Found %1: \n" ).arg( fileName );
+    TQString txt = TQString( "Found %1: \n" ).tqarg( fileName );
     txt += TQString::fromUtf8( data.data(), data.size() );
     txt += "\n";
     return txt;
diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp
index e4280cec1..28bd3b088 100644
--- a/lib/store/tests/xmlwritertest.cpp
+++ b/lib/store/tests/xmlwritertest.cpp
@@ -14,7 +14,7 @@ void speedTest()
     TQString paragText = TQString::fromUtf8( "This is the text of the paragraph. I'm including a euro sign to test encoding issues: €" );
     TQCString styleName = "Heading 1";
 
-    TQFile out( TQString::fromLatin1( "out5.xml" ) );
+    TQFile out( TQString::tqfromLatin1( "out5.xml" ) );
     if ( out.open(IO_WriteOnly) )
     {
         KoXmlWriter writer( &out );
@@ -78,7 +78,7 @@ int main( int argc, char** argv ) {
 
     TEST_BEGIN( 0, 0 );
     writer.startElement( "p", false /*no indent*/ );
-    writer.addTextSpan( TQString::fromLatin1( "   \t\n foo  " ) );
+    writer.addTextSpan( TQString::tqfromLatin1( "   \t\n foo  " ) );
     writer.endElement();
     TEST_END( "textspan test", "<r>\n"
               " <p><text:s text:c=\"3\"/><text:tab/><text:line-break/> foo<text:s text:c=\"2\"/></p>\n"
@@ -97,14 +97,14 @@ int main( int argc, char** argv ) {
     TEST_BEGIN( 0, 0 );
     writer.startElement( "p", false /*no indent*/ );
     writer.addProcessingInstruction( "opendocument foobar" );
-    writer.addTextSpan( TQString::fromLatin1( "foo" ) );
+    writer.addTextSpan( TQString::tqfromLatin1( "foo" ) );
     writer.endElement();
     TEST_END( "processinginstruction test", "<r>\n"
               " <p><?opendocument foobar?>foo</p>\n"
               "</r>\n" );
 
     TEST_BEGIN( 0, 0 );
-    writer.addManifestEntry( TQString::fromLatin1( "foo/bar/blah" ), TQString::fromLatin1( "mime/type" ) );
+    writer.addManifestEntry( TQString::tqfromLatin1( "foo/bar/blah" ), TQString::tqfromLatin1( "mime/type" ) );
     TEST_END( "addManifestEntry", "<r>\n <manifest:file-entry manifest:media-type=\"mime/type\" manifest:full-path=\"foo/bar/blah\"/>\n</r>\n" );
 
     int sz = 15000;  // must be more than KoXmlWriter::s_escapeBufferLen
@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
 
     TQString longPath;
     for ( uint i = 0 ; i < 1000 ; ++i )
-        longPath += TQString::fromLatin1( "M10 10L20 20 " );
+        longPath += TQString::tqfromLatin1( "M10 10L20 20 " );
     expected = "<r a=\"";
     expected += longPath.utf8() + "\"/>\n";
     TEST_BEGIN( 0, 0 );
@@ -131,9 +131,9 @@ int main( int argc, char** argv ) {
     bool val = true;
     int num = 1;
     double numdouble = 5.0;
-    writer.addConfigItem( TQString::fromLatin1( "TestConfigBool" ), val );
-    writer.addConfigItem( TQString::fromLatin1( "TestConfigInt" ), num );
-    writer.addConfigItem( TQString::fromLatin1( "TestConfigDouble" ), numdouble );
+    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigBool" ), val );
+    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigInt" ), num );
+    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigDouble" ), numdouble );
     TEST_END( "test config", "<r>\n"
                              " <config:config-item config:name=\"TestConfigBool\" config:type=\"boolean\">true</config:config-item>\n"
                              " <config:config-item config:name=\"TestConfigInt\" config:type=\"int\">1</config:config-item>\n"
diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h
index 12011c033..cdafe8a55 100644
--- a/lib/store/tests/xmlwritertest.h
+++ b/lib/store/tests/xmlwritertest.h
@@ -34,8 +34,8 @@
             TQCString s2 = expectedFull; \
             if ( s1.length() != s2.length() ) \
                 qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \
-            s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
-            s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
+            s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
+            s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
             qDebug( "%s", s1.data() ); \
             qDebug( "Expected:\n%s", s2.data() ); \
             return 1; /*exit*/ \
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 27e914260..2639301e3 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -56,7 +56,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u
     manager->setBatchMode( batch );
 
     TQCString mime( outputFormat.latin1() );
-    KoFilter::ConversionStatus status = manager->exp0rt( uOut.path(), mime );
+    KoFilter::ConversiontqStatus status = manager->exp0rt( uOut.path(), mime );
     progressObj.slotProgress(-1);
 
     delete manager;
@@ -117,17 +117,17 @@ 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!").arg(uIn.prettyURL()) << endl;
+            kdError() << i18n("Mimetype for input file %1 not found!").tqarg(uIn.prettyURL()) << endl;
             return 1;
         }
         KMimeType::Ptr outputMimetype;
         if ( args->isSet("mimetype") )
         {
-            TQString mime = TQString::fromLatin1( args->getOption("mimetype") );
+            TQString mime = TQString::tqfromLatin1( args->getOption("mimetype") );
             outputMimetype = KMimeType::mimeType( mime );
             if ( outputMimetype->name() == KMimeType::defaultMimeType() )
             {
-                kdError() << i18n("Mimetype not found %1").arg(mime) << endl;
+                kdError() << i18n("Mimetype not found %1").tqarg(mime) << endl;
                 return 1;
             }
         }
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index b5c3d5d05..fc6ca9c3a 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.at(pos).latin1()) {
+		switch (txt.tqat(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").arg(hours).arg(minutes, 2).arg(seconds,2 ));
+		   i18n("%1:%2.%3").tqarg(hours).tqarg(minutes, 2).tqarg(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").arg(i)),
+					      TQString("User %1").tqarg(i)),
 		   node.toElement().text());
       }
     }
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index bc1f4c06f..a7e748229 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -59,7 +59,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
 	}
 
 /* TODO: get selection(), not only clipboard!
-	TQClipboard *cb = TQApplication::clipboard();
+	TQClipboard *cb = TQApplication::tqclipboard();
 	TQString text = cb->text();
 	if( text.isNull() || text.length() > 50 ) {
 		// long texts are probably not supposed to be searched for
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 4489aa4f5..db6e3fa11 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -81,7 +81,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
         KConfig * config = instance()->config();
         TQCString gn( "KSpell " );
         gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...)
-        TQString groupName = TQString::fromLatin1( gn );
+        TQString groupName = TQString::tqfromLatin1( gn );
         //kdDebug() << "Group: " << groupName << endl;
         if ( config->hasGroup( groupName ) )
         {
@@ -114,7 +114,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
 #endif
 #if 0 //fixme
     // Call the spell checker
-    KSpell::spellStatus status=(KSpell::spellStatus)KSpell::modalCheck( buffer, &ksconfig );
+    KSpell::spelltqStatus status=(KSpell::spelltqStatus)KSpell::modalCheck( buffer, &ksconfig );
 
     if (status == KSpell::Error)
     {
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index 32271af8d..573b907c5 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -97,11 +97,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     row1->addWidget(m_edit, 1);
     row1->addWidget(m_search, 0);
     m_back = new TQToolButton(m_page);
-    m_back->setIconSet(BarIconSet(TQString::fromLatin1("back")));
+    m_back->setIconSet(BarIconSet(TQString::tqfromLatin1("back")));
     TQToolTip::add(m_back, i18n("Back"));
     row1->addWidget(m_back, 0);
     m_forward = new TQToolButton(m_page);
-    m_forward->setIconSet(BarIconSet(TQString::fromLatin1("forward")));
+    m_forward->setIconSet(BarIconSet(TQString::tqfromLatin1("forward")));
     TQToolTip::add(m_forward, i18n("Forward"));
     row1->addWidget(m_forward, 0);
     m_lang = new KPushButton(i18n("Change Language..."), m_page);
@@ -302,7 +302,7 @@ void Thesaurus::setCaption()
 {
     KURL url = KURL();
     url.setPath(m_data_file);
-    m_dialog->setCaption(i18n("Related Words - %1").arg(url.fileName()));
+    m_dialog->setCaption(i18n("Related Words - %1").tqarg(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").arg(m_thesproc_stderr));
+          "Output:<br>%1").tqarg(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").arg(m_edit->currentText()));
-    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").arg(m_edit->currentText()));
+    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()));
     // 5:
-    m_combobox->insertItem(i18n("Holonyms - ... has a %1").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Holonyms - ... has a %1").tqarg(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)"));
@@ -604,7 +604,7 @@ void Thesaurus::findTermWordnet(const TQString &term)
     m_combobox->insertItem(i18n("Overview of Senses"));
 
     /** NOT todo:
-      * -Hypernym tree: layout is difficult, you can get the same information
+      * -Hypernym tree: tqlayout is difficult, you can get the same information
       *  by following links
       * -Coordinate terms (sisters): just go to synset and then use hyponyms
       * -Has Part Meronyms, Has Substance Meronyms, Has Member Meronyms,
@@ -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").arg(m_wnproc_stderr));
+          "Output:<br>%1").tqarg(m_wnproc_stderr));
         TQApplication::restoreOverrideCursor();
         return;
     }
 
     if( m_wnproc_stdout.isEmpty() ) {
-        m_resultbox->setText(i18n("No match for '%1'.").arg(m_edit->currentText()));
+        m_resultbox->setText(i18n("No match for '%1'.").tqarg(m_edit->currentText()));
     } else {
         // render in a table, each line one row:
         TQStringList lines = lines.split(TQChar('\n'), m_wnproc_stdout, false);
@@ -677,7 +677,7 @@ void Thesaurus::wnExited(KProcess *)
             // TODO?: 
             // move "=>" in own column?
             l = formatLine(l);
-            // Table layout:
+            // Table tqlayout:
             result += "<tr>";
             if( l.startsWith(" ") ) {
                 result += "\t<td width=\"15\"></td>";
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index da01b2f26..01c276210 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqobject.h>
 #include <tqregexp.h>
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 #include <tqtabdialog.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqtooltip.h>
 #include <tqwidget.h>
 #include <tqvbox.h>
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index 6f2f47ed2..17cefdf75 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-shaped;sounding;heavy;sonorous;
+;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-tqshaped;sounding;heavy;sonorous;
 ;rich;#;full;
-;orotund;rotund;round;pear-shaped;#;full;
+;orotund;rotund;round;pear-tqshaped;#;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-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;
+;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;
 ;square;#;quadrate;right-angled;squared;squarish;
-;annular;annulate;annulated;circinate;circular;ringed;ring-shaped;#;rounded;
+;annular;annulate;annulated;circinate;circular;ringed;ring-tqshaped;#;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-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;
+;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;
 ;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-shaped;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-tqshaped;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;
-;shape;form;#;attribute;
+;tqshape;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 shape;
-;protrusion;projection;jut;jutting;#;change of shape;
+;fold;folding;#;change of tqshape;
+;protrusion;projection;jut;jutting;#;change of tqshape;
 ;activity;#;act;human action;human activity;
 ;operation;#;activity;
 ;practice;pattern;#;activity;
@@ -4976,7 +4976,7 @@
 ;organization;organisation;arrangement;#;activity;
 ;order;ordering;#;organization;organisation;arrangement;
 ;succession;sequence;#;order;ordering;
-;layout;#;order;ordering;
+;tqlayout;#;order;ordering;
 ;listing;itemization;itemisation;#;organization;organisation;arrangement;
 ;grouping;#;activity;
 ;categorization;categorisation;classification;compartmentalization;compartmentalisation;#;grouping;
@@ -6268,7 +6268,7 @@
 ;horn;#;noisemaker;
 ;horror;#;thing;
 ;horse;#;gymnastic apparatus;exerciser;
-;horseshoe;shoe;U-shaped plate;#;plate;scale;shell;
+;horseshoe;shoe;U-tqshaped 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;#;shaper;shaping machine;
+;miller;milling machine;#;tqshaper;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;shape;cast;#;appearance;visual aspect;
+;form;tqshape;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;
-;shape;form;configuration;contour;#;spatial property;spatiality;
+;tqshape;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;#;shape;form;configuration;contour;
+;curvature;curve;#;tqshape;form;configuration;contour;
 ;position;spatial relation;#;relation;
 ;placement;arrangement;#;position;spatial relation;
 ;composition;composing;#;placement;arrangement;
 ;proportion;balance;#;placement;arrangement;
-;true;#;alignment;
+;true;#;tqalignment;
 ;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;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;
+;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;
 ;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-shaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
+;tube;tube-tqshaped 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-shaped structure;
+;vessel;vas;#;tube;tube-tqshaped 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;
@@ -8314,7 +8314,7 @@
 ;concept;conception;construct;#;idea;thought;
 ;perception;#;conceptualization;conceptualisation;conceptuality;
 ;notion;#;concept;conception;construct;
-;layout;#;design;plan;
+;tqlayout;#;design;plan;
 ;redundancy;#;configuration;constellation;
 ;trap;snare;#;design;plan;
 ;idea;#;opinion;sentiment;persuasion;view;thought;
@@ -8457,9 +8457,9 @@
 ;percept;perception;perceptual experience;#;representation;mental representation;internal representation;
 ;figure;#;percept;perception;perceptual experience;
 ;ground;#;percept;perception;perceptual experience;
-;form;shape;pattern;#;structure;
-;mosaic;#;form;shape;pattern;
-;strand;#;form;shape;pattern;
+;form;tqshape;pattern;#;structure;
+;mosaic;#;form;tqshape;pattern;
+;strand;#;form;tqshape;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;
-;shape;embodiment;#;concretism;concrete representation;
+;tqshape;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;alignment;alinement;
+;combination;#;alliance;coalition;tqalignment;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;alignment;alinement;
+;bloc;axis;#;alliance;coalition;tqalignment;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;alignment;alinement;#;organization;organisation;
+;alliance;coalition;tqalignment;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;shaper;
+;generator;source;author;#;maker;tqshaper;
 ;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;shaper;#;creator;
+;maker;tqshaper;#;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;shaper;
+;manufacturer;producer;#;maker;tqshaper;
 ;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;#;shape;form;
-;plane;sheet;#;shape;form;
-;figure;#;shape;form;
-;line;#;shape;form;
+;solid;#;tqshape;form;
+;plane;sheet;#;tqshape;form;
+;figure;#;tqshape;form;
+;line;#;tqshape;form;
 ;cylinder;#;solid;
 ;heart;#;plane figure;two-dimensional figure;
-;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;
+;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;
 ;diameter;#;straight line;
-;pit;fossa;#;concave shape;concavity;cavity;bodily cavity;cavum;
-;recess;recession;niche;corner;#;concave shape;concavity;
+;pit;fossa;#;concave tqshape;concavity;cavity;bodily cavity;cavum;
+;recess;recession;niche;corner;#;concave tqshape;concavity;
 ;circle;#;ellipse;oval;
-;circle;#;shape;form;
+;circle;#;tqshape;form;
 ;chord;#;straight line;
 ;sector;#;plane figure;two-dimensional figure;
-;disk;disc;saucer;#;round shape;
+;disk;disc;saucer;#;round tqshape;
 ;ring;halo;annulus;anulus;doughnut;anchor ring;#;toroid;
-;loop;#;round shape;
-;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round shape;
+;loop;#;round tqshape;
+;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round tqshape;
 ;element;#;straight line;
 ;kink;twist;twirl;#;fold;crease;plication;flexure;crimp;bend;
 ;square;foursquare;#;rectangle;
-;triangle;trigon;trilateral;#;polygon;polygonal shape;
+;triangle;trigon;trilateral;#;polygon;polygonal tqshape;
 ;star;#;plane figure;two-dimensional figure;
 ;box;#;rectangle;
-;knot;gnarl;#;distorted shape;distortion;
-;arch;#;curve;curved shape;
-;bell;bell shape;campana;#;curve;curved shape;
+;knot;gnarl;#;distorted tqshape;distortion;
+;arch;#;curve;curved tqshape;
+;bell;bell tqshape;campana;#;curve;curved tqshape;
 ;angle;#;space;
 ;hour angle;HA;#;angular distance;
 ;dip;angle of dip;magnetic dip;magnetic inclination;inclination;#;angle;
 ;lead;#;angle;
-;bowl;trough;#;concave shape;concavity;
+;bowl;trough;#;concave tqshape;concavity;
 ;groove;channel;#;depression;impression;imprint;
-;scoop;pocket;#;concave shape;concavity;
-;node;knob;thickening;#;convex shape;convexity;
-;bow;arc;#;curve;curved shape;
-;depression;impression;imprint;#;concave shape;concavity;
+;scoop;pocket;#;concave tqshape;concavity;
+;node;knob;thickening;#;convex tqshape;convexity;
+;bow;arc;#;curve;curved tqshape;
+;depression;impression;imprint;#;concave tqshape;concavity;
 ;base;#;flank;
 ;balance;equilibrium;equipoise;counterbalance;#;structure;construction;
 ;symmetry;proportion;#;balance;equilibrium;equipoise;counterbalance;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;hemisphere;#;subfigure;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;ball;globe;orb;#;sphere;
-;cylinder;#;round shape;
-;column;tower;pillar;#;shape;form;
+;cylinder;#;round tqshape;
+;column;tower;pillar;#;tqshape;form;
 ;barrel;drum;#;cylinder;
 ;pipe;tube;#;cylinder;
-;drop;bead;pearl;#;round shape;
-;ridge;#;convex shape;convexity;
-;point;tip;peak;#;convex shape;convexity;
+;drop;bead;pearl;#;round tqshape;
+;ridge;#;convex tqshape;convexity;
+;point;tip;peak;#;convex tqshape;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 shape;concavity;
+;cup;#;concave tqshape;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 shape;angularity;
-;space;#;amorphous shape;
+;fold;crease;plication;flexure;crimp;bend;#;angular tqshape;angularity;
+;space;#;amorphous tqshape;
 ;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 shape;convexity;
+;projection;#;convex tqshape;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;shape;#;good health;healthiness;
-;fitness;physical fitness;good shape;good condition;#;condition;shape;
+;condition;tqshape;#;good health;healthiness;
+;fitness;physical fitness;good tqshape;good condition;#;condition;tqshape;
 ;repair;#;condition;status;
 ;seaworthiness;fitness;#;soundness;
-;disability;disablement;handicap;impairment;#;unfitness;poor shape;bad condition;
+;disability;disablement;handicap;impairment;#;unfitness;poor tqshape;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 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;
+;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;
 ;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;shape up;#;develop;
-;climb;#;progress;come on;come along;advance;get on;get along;shape up;
+;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;
 ;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;#;shape;form;
+;dish;#;tqshape;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;#;shape;form;
+;fit;#;tqshape;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 shape;change form;deform;
+;sharpen;taper;point;#;change tqshape;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;#;shape;form;
-;draw;#;change shape;change form;deform;
-;blow;#;shape;form;
-;block;#;shape;form;
-;block;#;shape;form;
-;cup;#;shape;form;
+;deform;distort;strain;#;tqshape;form;
+;draw;#;change tqshape;change form;deform;
+;blow;#;tqshape;form;
+;block;#;tqshape;form;
+;block;#;tqshape;form;
+;cup;#;tqshape;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;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;
+;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;
 ;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;invalidate;#;score;mark;
+;cancel;tqinvalidate;#;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 shape;change form;deform;
+;twist;twine;distort;#;change tqshape;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;shape;form;work;mold;mould;forge;
-;swage;upset;#;shape;form;work;mold;mould;forge;
+;carve;#;cut;tqshape;form;work;mold;mould;forge;
+;swage;upset;#;tqshape;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;#;shape;form;work;mold;mould;forge;
+;chip;#;tqshape;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 shape;change form;deform;
+;bend;deform;twist;turn;#;change tqshape;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;#;shape;form;
+;encircle;circle;#;tqshape;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;#;shape;form;work;mold;mould;forge;
-;stamp;#;shape;form;work;mold;mould;forge;
-;beat;#;shape;form;work;mold;mould;forge;
+;machine;#;tqshape;form;work;mold;mould;forge;
+;stamp;#;tqshape;form;work;mold;mould;forge;
+;beat;#;tqshape;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;
-;shape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
-;hill;#;shape;form;work;mold;mould;forge;
+;tqshape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
+;hill;#;tqshape;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;#;shape;form;work;mold;mould;forge;
-;throw;#;shape;form;work;mold;mould;forge;
+;cast;mold;mould;#;tqshape;form;work;mold;mould;forge;
+;throw;#;tqshape;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;#;shape;form;work;mold;mould;forge;
+;sculpt;sculpture;#;tqshape;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;#;shape;form;work;mold;mould;forge;
+;model;mold;mould;#;tqshape;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 shape;change form;deform;
+;bend;flex;#;change tqshape;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 shape;change form;deform;
+;unfold;stretch;stretch out;extend;#;change tqshape;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 shape;change form;deform;
+;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change tqshape;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;
-;invalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
-;break;#;invalidate;annul;quash;void;avoid;nullify;
+;tqinvalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
+;break;#;tqinvalidate;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 shape;spring;#;become;
+;form;take form;take tqshape;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;